From: Luca Padovani Date: Thu, 5 Dec 2002 13:11:11 +0000 (+0000) Subject: * patches for ocaml compilation X-Git-Tag: v0_3_99~179 X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=3a92e3423f1dcf50a23d42a1d9e40a703cb45db2;p=helm.git * patches for ocaml compilation --- diff --git a/helm/DEVEL/gdome_xslt/C++/gdome_xslt/Makefile.am b/helm/DEVEL/gdome_xslt/C++/gdome_xslt/Makefile.am index bb2e2664e..0e4b76e4e 100644 --- a/helm/DEVEL/gdome_xslt/C++/gdome_xslt/Makefile.am +++ b/helm/DEVEL/gdome_xslt/C++/gdome_xslt/Makefile.am @@ -1,11 +1,12 @@ lib_LTLIBRARIES = libgdome_xslt_cpp_smart.la +libgdome_xslt_cpp_smart_la_LIBADD = $(top_builddir)/C/gdome_xslt/libgdome_xslt.la + libgdome_xslt_cpp_smart_la_LDFLAGS = -version-info @VERSION_INFO@ libgdome_xslt_cpp_smart_la_SOURCES = \ - GdomeSmartDOMXSLTStylesheet.cc \ - gdome_xslt.c + GdomeSmartDOMXSLTStylesheet.cc pkginclude_HEADERS = \ GdomeSmartDOMXSLTStylesheet.hh \ @@ -15,8 +16,4 @@ INCLUDES = \ $(GMETADOM_CFLAGS) \ $(LIBXSLT_CFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/../C/gdome_xslt - -gdome_xslt.c: $(top_srcdir)/../C/gdome_xslt/gdome_xslt.c - ln -s $< $@ - + -I$(top_srcdir)/C/gdome_xslt diff --git a/helm/DEVEL/gdome_xslt/C++/test/Makefile.am b/helm/DEVEL/gdome_xslt/C++/test/Makefile.am index d65ab428e..12a08d07a 100644 --- a/helm/DEVEL/gdome_xslt/C++/test/Makefile.am +++ b/helm/DEVEL/gdome_xslt/C++/test/Makefile.am @@ -6,13 +6,13 @@ test_SOURCES = main.cc LDADDS = \ $(GMETADOM_LIBS) \ $(LIBXSLT_LIBS) \ - $(top_builddir)/gdome_xslt/.libs/libgdome_xslt_cpp_smart.a + $(top_builddir)/C++/gdome_xslt/libgdome_xslt_cpp_smart.la test_LDADD = $(LDADDS) INCLUDES = \ $(GMETADOM_CFLAGS) \ $(LIBXSLT_CFLAGS) \ - -I$(top_srcdir)/gdome_xslt \ - -I$(top_srcdir)/../C/gdome_xslt + -I$(top_srcdir)/C/gdome_xslt \ + -I$(top_srcdir)/C++/gdome_xslt diff --git a/helm/DEVEL/gdome_xslt/C/gdome_xslt/Makefile b/helm/DEVEL/gdome_xslt/C/gdome_xslt/Makefile index 8c99901c6..264f248e1 100644 --- a/helm/DEVEL/gdome_xslt/C/gdome_xslt/Makefile +++ b/helm/DEVEL/gdome_xslt/C/gdome_xslt/Makefile @@ -38,10 +38,10 @@ pkglibdir = $(libdir)/gdome2-xslt pkgincludedir = $(includedir)/gdome2-xslt top_builddir = ../.. -ACLOCAL = ${SHELL} /home/luca/Projects/helm/DEVEL/gdome_xslt/missing --run aclocal -AUTOCONF = ${SHELL} /home/luca/Projects/helm/DEVEL/gdome_xslt/missing --run autoconf -AUTOMAKE = ${SHELL} /home/luca/Projects/helm/DEVEL/gdome_xslt/missing --run automake -AUTOHEADER = ${SHELL} /home/luca/Projects/helm/DEVEL/gdome_xslt/missing --run autoheader +ACLOCAL = ${SHELL} /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/missing --run aclocal +AUTOCONF = ${SHELL} /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/missing --run autoconf +AUTOMAKE = ${SHELL} /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/missing --run automake +AUTOHEADER = ${SHELL} /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/missing --run autoheader INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} @@ -57,7 +57,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = host_triplet = i686-pc-linux-gnu -AMTAR = ${SHELL} /home/luca/Projects/helm/DEVEL/gdome_xslt/missing --run tar +AMTAR = ${SHELL} /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/missing --run tar AS = @AS@ AWK = mawk CC = gcc @@ -66,15 +66,15 @@ DEPDIR = .deps DLLTOOL = @DLLTOOL@ ECHO = echo EXEEXT = -GDOME_CFLAGS = -I/home/luca/Local/include -I/home/luca/Local/include/libgdome -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/home/luca/Local/include/libxml2 -GDOME_LIBS = -L/home/luca/Local/lib -L/usr/lib -lgdome -lglib -lxml2 -lz -lm -GMETADOM_CFLAGS = -I/home/luca/Local/include/gmetadom/gdome_cpp_smart -I/home/luca/Local/include -I/home/luca/Local/include/libgdome -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/home/luca/Local/include/libxml2 -GMETADOM_LIBS = -L/home/luca/Local/lib -lgmetadom_gdome_cpp_smart -L/home/luca/Local/lib -L/usr/lib -lgdome -lglib -lxml2 -lz -lm +GDOME_CFLAGS = -I/usr/include -I/usr/include/libgdome -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/libxml2/libxml -I/usr/include/libxml2 +GDOME_LIBS = -L/usr/lib -lgdome -lglib -lxml2 +GMETADOM_CFLAGS = -I/home/lpadovan/local/include/gmetadom/gdome_cpp_smart -I/usr/include -I/usr/include/libgdome -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/libxml2/libxml -I/usr/include/libxml2 +GMETADOM_LIBS = -L/home/lpadovan/local/lib -lgmetadom_gdome_cpp_smart -L/usr/lib -lgdome -lglib -lxml2 HAVE_OCAMLC = yes HAVE_OCAMLFIND = yes INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s LIBTOOL = $(SHELL) $(top_builddir)/libtool -LIBXSLT_CFLAGS = -I/home/luca/Local/include/libxml2 +LIBXSLT_CFLAGS = -I/usr/include/libxml2/libxml -I/usr/include/libxml2 LIBXSLT_LIBS = -L/usr/lib -lxslt -lxml2 -lm LN_S = ln -s OBJDUMP = @OBJDUMP@ @@ -87,7 +87,7 @@ VERSION = 0.0.3 VERSION_INFO = 0:3:0 am__include = include am__quote = -install_sh = /home/luca/Projects/helm/DEVEL/gdome_xslt/install-sh +install_sh = /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/install-sh lib_LTLIBRARIES = libgdome_xslt.la diff --git a/helm/DEVEL/gdome_xslt/C/test/Makefile b/helm/DEVEL/gdome_xslt/C/test/Makefile index ce7e204f0..ce2fe39ed 100644 --- a/helm/DEVEL/gdome_xslt/C/test/Makefile +++ b/helm/DEVEL/gdome_xslt/C/test/Makefile @@ -38,10 +38,10 @@ pkglibdir = $(libdir)/gdome2-xslt pkgincludedir = $(includedir)/gdome2-xslt top_builddir = ../.. -ACLOCAL = ${SHELL} /home/luca/Projects/helm/DEVEL/gdome_xslt/missing --run aclocal -AUTOCONF = ${SHELL} /home/luca/Projects/helm/DEVEL/gdome_xslt/missing --run autoconf -AUTOMAKE = ${SHELL} /home/luca/Projects/helm/DEVEL/gdome_xslt/missing --run automake -AUTOHEADER = ${SHELL} /home/luca/Projects/helm/DEVEL/gdome_xslt/missing --run autoheader +ACLOCAL = ${SHELL} /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/missing --run aclocal +AUTOCONF = ${SHELL} /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/missing --run autoconf +AUTOMAKE = ${SHELL} /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/missing --run automake +AUTOHEADER = ${SHELL} /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/missing --run autoheader INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} @@ -57,7 +57,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = host_triplet = i686-pc-linux-gnu -AMTAR = ${SHELL} /home/luca/Projects/helm/DEVEL/gdome_xslt/missing --run tar +AMTAR = ${SHELL} /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/missing --run tar AS = @AS@ AWK = mawk CC = gcc @@ -66,15 +66,15 @@ DEPDIR = .deps DLLTOOL = @DLLTOOL@ ECHO = echo EXEEXT = -GDOME_CFLAGS = -I/home/luca/Local/include -I/home/luca/Local/include/libgdome -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/home/luca/Local/include/libxml2 -GDOME_LIBS = -L/home/luca/Local/lib -L/usr/lib -lgdome -lglib -lxml2 -lz -lm -GMETADOM_CFLAGS = -I/home/luca/Local/include/gmetadom/gdome_cpp_smart -I/home/luca/Local/include -I/home/luca/Local/include/libgdome -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/home/luca/Local/include/libxml2 -GMETADOM_LIBS = -L/home/luca/Local/lib -lgmetadom_gdome_cpp_smart -L/home/luca/Local/lib -L/usr/lib -lgdome -lglib -lxml2 -lz -lm +GDOME_CFLAGS = -I/usr/include -I/usr/include/libgdome -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/libxml2/libxml -I/usr/include/libxml2 +GDOME_LIBS = -L/usr/lib -lgdome -lglib -lxml2 +GMETADOM_CFLAGS = -I/home/lpadovan/local/include/gmetadom/gdome_cpp_smart -I/usr/include -I/usr/include/libgdome -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/libxml2/libxml -I/usr/include/libxml2 +GMETADOM_LIBS = -L/home/lpadovan/local/lib -lgmetadom_gdome_cpp_smart -L/usr/lib -lgdome -lglib -lxml2 HAVE_OCAMLC = yes HAVE_OCAMLFIND = yes INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s LIBTOOL = $(SHELL) $(top_builddir)/libtool -LIBXSLT_CFLAGS = -I/home/luca/Local/include/libxml2 +LIBXSLT_CFLAGS = -I/usr/include/libxml2/libxml -I/usr/include/libxml2 LIBXSLT_LIBS = -L/usr/lib -lxslt -lxml2 -lm LN_S = ln -s OBJDUMP = @OBJDUMP@ @@ -87,20 +87,24 @@ VERSION = 0.0.3 VERSION_INFO = 0:3:0 am__include = include am__quote = -install_sh = /home/luca/Projects/helm/DEVEL/gdome_xslt/install-sh +install_sh = /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/install-sh noinst_PROGRAMS = test test_SOURCES = test.c -LDADDS = $(GDOME_LIBS) $(LIBXSLT_LIBS) +LDADDS = \ + $(GDOME_LIBS) \ + $(LIBXSLT_LIBS) \ + $(top_builddir)/C/gdome_xslt/libgdome_xslt.la + test_LDADD = $(LDADDS) INCLUDES = \ $(GDOME_CFLAGS) \ $(LIBXSLT_CFLAGS) \ - -I$(top_srcdir)/gdome_xslt + -I$(top_srcdir)/C/gdome_xslt subdir = C/test mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -111,7 +115,7 @@ PROGRAMS = $(noinst_PROGRAMS) am_test_OBJECTS = test.$(OBJEXT) test_OBJECTS = $(am_test_OBJECTS) -test_DEPENDENCIES = +test_DEPENDENCIES = $(top_builddir)/C/gdome_xslt/libgdome_xslt.la test_LDFLAGS = DEFS = -DHAVE_CONFIG_H diff --git a/helm/DEVEL/gdome_xslt/C/test/Makefile.am b/helm/DEVEL/gdome_xslt/C/test/Makefile.am index 4afeaad30..e17047c15 100644 --- a/helm/DEVEL/gdome_xslt/C/test/Makefile.am +++ b/helm/DEVEL/gdome_xslt/C/test/Makefile.am @@ -3,12 +3,15 @@ noinst_PROGRAMS = test test_SOURCES = test.c -LDADDS = $(GDOME_LIBS) $(LIBXSLT_LIBS) +LDADDS = \ + $(GDOME_LIBS) \ + $(LIBXSLT_LIBS) \ + $(top_builddir)/C/gdome_xslt/libgdome_xslt.la test_LDADD = $(LDADDS) INCLUDES = \ $(GDOME_CFLAGS) \ $(LIBXSLT_CFLAGS) \ - -I$(top_srcdir)/gdome_xslt + -I$(top_srcdir)/C/gdome_xslt diff --git a/helm/DEVEL/gdome_xslt/Makefile b/helm/DEVEL/gdome_xslt/Makefile index 9b2a1dcc5..eca489994 100644 --- a/helm/DEVEL/gdome_xslt/Makefile +++ b/helm/DEVEL/gdome_xslt/Makefile @@ -38,10 +38,10 @@ pkglibdir = $(libdir)/gdome2-xslt pkgincludedir = $(includedir)/gdome2-xslt top_builddir = . -ACLOCAL = ${SHELL} /home/luca/Projects/helm/DEVEL/gdome_xslt/missing --run aclocal -AUTOCONF = ${SHELL} /home/luca/Projects/helm/DEVEL/gdome_xslt/missing --run autoconf -AUTOMAKE = ${SHELL} /home/luca/Projects/helm/DEVEL/gdome_xslt/missing --run automake -AUTOHEADER = ${SHELL} /home/luca/Projects/helm/DEVEL/gdome_xslt/missing --run autoheader +ACLOCAL = ${SHELL} /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/missing --run aclocal +AUTOCONF = ${SHELL} /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/missing --run autoconf +AUTOMAKE = ${SHELL} /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/missing --run automake +AUTOHEADER = ${SHELL} /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/missing --run autoheader INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} @@ -57,7 +57,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = host_triplet = i686-pc-linux-gnu -AMTAR = ${SHELL} /home/luca/Projects/helm/DEVEL/gdome_xslt/missing --run tar +AMTAR = ${SHELL} /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/missing --run tar AS = @AS@ AWK = mawk CC = gcc @@ -66,15 +66,15 @@ DEPDIR = .deps DLLTOOL = @DLLTOOL@ ECHO = echo EXEEXT = -GDOME_CFLAGS = -I/home/luca/Local/include -I/home/luca/Local/include/libgdome -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/home/luca/Local/include/libxml2 -GDOME_LIBS = -L/home/luca/Local/lib -L/usr/lib -lgdome -lglib -lxml2 -lz -lm -GMETADOM_CFLAGS = -I/home/luca/Local/include/gmetadom/gdome_cpp_smart -I/home/luca/Local/include -I/home/luca/Local/include/libgdome -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/home/luca/Local/include/libxml2 -GMETADOM_LIBS = -L/home/luca/Local/lib -lgmetadom_gdome_cpp_smart -L/home/luca/Local/lib -L/usr/lib -lgdome -lglib -lxml2 -lz -lm +GDOME_CFLAGS = -I/usr/include -I/usr/include/libgdome -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/libxml2/libxml -I/usr/include/libxml2 +GDOME_LIBS = -L/usr/lib -lgdome -lglib -lxml2 +GMETADOM_CFLAGS = -I/home/lpadovan/local/include/gmetadom/gdome_cpp_smart -I/usr/include -I/usr/include/libgdome -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/libxml2/libxml -I/usr/include/libxml2 +GMETADOM_LIBS = -L/home/lpadovan/local/lib -lgmetadom_gdome_cpp_smart -L/usr/lib -lgdome -lglib -lxml2 HAVE_OCAMLC = yes HAVE_OCAMLFIND = yes INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s LIBTOOL = $(SHELL) $(top_builddir)/libtool -LIBXSLT_CFLAGS = -I/home/luca/Local/include/libxml2 +LIBXSLT_CFLAGS = -I/usr/include/libxml2/libxml -I/usr/include/libxml2 LIBXSLT_LIBS = -L/usr/lib -lxslt -lxml2 -lm LN_S = ln -s OBJDUMP = @OBJDUMP@ @@ -87,17 +87,17 @@ VERSION = 0.0.3 VERSION_INFO = 0:3:0 am__include = include am__quote = -install_sh = /home/luca/Projects/helm/DEVEL/gdome_xslt/install-sh +install_sh = /home/lpadovan/Projects/helm/DEVEL/gdome_xslt/install-sh -EXTRA_DIST = BUGS LICENSE aclocal.m4 +EXTRA_DIST = BUGS LICENSE aclocal.m4 debian/ -SUBDIRS = C C++ ocaml test_files debian +SUBDIRS = C C++ ocaml test_files subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = ocaml/Makefile ocaml/gdome_xslt/Makefile \ - ocaml/test/Makefile test_files/Makefile debian/Makefile +CONFIG_CLEAN_FILES = ocaml/gdome_xslt/META ocaml/gdome_xslt/Makefile \ + ocaml/test/Makefile gdome_xslt_cpp_smart-config DIST_SOURCES = RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ @@ -107,7 +107,8 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ Makefile.am Makefile.in NEWS aclocal.m4 config.guess \ config.h.in config.sub configure configure.ac depcomp \ - install-sh ltmain.sh missing mkinstalldirs + gdome_xslt_cpp_smart-config.in install-sh ltmain.sh missing \ + mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -162,15 +163,13 @@ $(srcdir)/./stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) distclean-hdr: -rm -f config.h -ocaml/Makefile: $(top_builddir)/config.status $(top_srcdir)/ocaml/Makefile.in +ocaml/gdome_xslt/META: $(top_builddir)/config.status $(top_srcdir)/ocaml/gdome_xslt/META.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status ocaml/gdome_xslt/Makefile: $(top_builddir)/config.status $(top_srcdir)/ocaml/gdome_xslt/Makefile.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status ocaml/test/Makefile: $(top_builddir)/config.status $(top_srcdir)/ocaml/test/Makefile.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status -test_files/Makefile: $(top_builddir)/config.status $(top_srcdir)/test_files/Makefile.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status -debian/Makefile: $(top_builddir)/config.status $(top_srcdir)/debian/Makefile.in +gdome_xslt_cpp_smart-config: $(top_builddir)/config.status gdome_xslt_cpp_smart-config.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status uninstall-info-am: @@ -277,7 +276,7 @@ GZIP_ENV = --best distdir: $(DISTFILES) -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/C++ $(distdir)/debian $(distdir)/ocaml $(distdir)/ocaml/gdome_xslt $(distdir)/ocaml/test $(distdir)/test_files + $(mkinstalldirs) $(distdir)/. $(distdir)/ocaml/gdome_xslt $(distdir)/ocaml/test @for file in $(DISTFILES); do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ diff --git a/helm/DEVEL/gdome_xslt/Makefile.am b/helm/DEVEL/gdome_xslt/Makefile.am index 951320ff6..a4bc4c3cc 100644 --- a/helm/DEVEL/gdome_xslt/Makefile.am +++ b/helm/DEVEL/gdome_xslt/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = BUGS LICENSE aclocal.m4 +EXTRA_DIST = BUGS LICENSE aclocal.m4 debian/ -SUBDIRS = C C++ ocaml test_files debian +SUBDIRS = C C++ ocaml test_files diff --git a/helm/DEVEL/gdome_xslt/configure.ac b/helm/DEVEL/gdome_xslt/configure.ac index bc8ab38b2..3b247dab7 100644 --- a/helm/DEVEL/gdome_xslt/configure.ac +++ b/helm/DEVEL/gdome_xslt/configure.ac @@ -7,6 +7,30 @@ VERSION=0.0.3 VERSION_INFO=`echo $VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'` AC_SUBST(VERSION_INFO) +AC_ARG_WITH( + gmetadom-prefix, + [ --with-gmetadom-prefix=PFX prefix dir where gmetadom is installed], + [ + with_gmetadom_prefix=yes + GMETADOM_PREFIX=$withval + ], + [ + with_gmetadom_prefix=no + ] +) + +AC_ARG_WITH( + gdome-prefix, + [ --with-gdome-prefix=PFX prefix dir where gdome is installed], + [ + with_gdome_prefix=yes + GDOME_PREFIX=$withval + ], + [ + with_gdome_prefix=no + ] +) + AC_PROG_CC AC_PROG_CXX AC_PROG_INSTALL @@ -23,8 +47,8 @@ then if ${GDOME_PREFIX}/bin/$GDOME_CONFIG --version > /dev/null 2>&1 then GDOME_CONFIG=${GDOME_PREFIX}/bin/$GDOME_CONFIG - elif ! $GDOME_CONFIG --version > /dev/null 2>&1 - then + elif ! $GDOME_CONFIG --version > /dev/null 2>&1 + then AC_MSG_ERROR(Could not find Gdome2 anywhere (see config.log for details).) fi fi @@ -134,11 +158,11 @@ AC_CONFIG_FILES([ C++/gdome_xslt/Makefile C++/test/Makefile C++/Makefile - C++/gdome_xslt_cpp_smart-config ocaml/Makefile + ocaml/gdome_xslt/META ocaml/gdome_xslt/Makefile ocaml/test/Makefile - test_files/Makefile - debian/Makefile]) -AC_CONFIG_COMMANDS([default],[[chmod +x C++/gdome_xslt_cpp_smart-config]],[[]]) + gdome_xslt_cpp_smart-config + test_files/Makefile]) +AC_CONFIG_COMMANDS([default],[[chmod +x gdome_xslt_cpp_smart-config]],[[]]) AC_OUTPUT diff --git a/helm/DEVEL/gdome_xslt/ocaml/test/Makefile b/helm/DEVEL/gdome_xslt/ocaml/test/Makefile index 777614abf..b17c5f05e 100644 --- a/helm/DEVEL/gdome_xslt/ocaml/test/Makefile +++ b/helm/DEVEL/gdome_xslt/ocaml/test/Makefile @@ -8,10 +8,10 @@ all: test opt: test.opt test: test.ml - $(OCAMLC) -linkpkg -o $@ $< + ( export OCAMLPATH=.; $(OCAMLC) -linkpkg -o $@ $< ) test.opt: test.ml - $(OCAMLOPT) -linkpkg -o $@ $< + ( export OCAMLPATH=.; $(OCAMLOPT) -linkpkg -o $@ $< ) clean: rm -f test test.opt test.cmi test.cmo text.cmx