[kaffe] CVS kaffe (robilad): removed libltdl

Kaffe CVS cvs-commits at kaffe.org
Sat Jan 19 14:47:19 PST 2008


PatchSet 7698 
Date: 2008/01/19 22:45:20
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed libltdl

2008-01-19  Dalibor Topic  <robilad at kaffe.org>

* developers/autogen.sh: Don't libtoolize with --ltdl. Removed workarounds
and patches for libltdl.

* libltdl/COPYING.LIB, libltdl/Makefile.am, libltdl/Makefile.in,
libltdl/README, libltdl/acinclude.m4, libltdl/aclocal.m4, libltdl/config-h.in,
libltdl/config.guess, libltdl/config.sub, libltdl/configure,
libltdl/configure.ac, libltdl/install-sh, libltdl/ltdl.c, libltdl/ltdl.h,
libltdl/ltmain.sh libltdl/missing: Removed.

* configure.ac: (AC_LIBLTDL_CONVENIENCE, LIBTOOL_DEPS, LIBLTDL)
Removed. Check for ltdl.h and libltdl and if not found error out.
Don't attempt to configure libltdl.

* test/internal/Makefile.am (jitBasic_LDADD),
test/jni/Makefile.am (jniBase_LDADD, jniExecClass_LDADD)
(jniReflect_LDADD, libjniweaklib_la_LDADD),
kaffe/xprof/Makefile.am (libkaffexprof_la_LIBADD),
kaffe/jvmpi/Makefile.am (libkaffejvmpi_la_DEPENDENCIES),
kaffe/kaffevm/Makefile.am (libkaffe_la_DEPENDENCIES): Removed
LIBLTDL.

* test/internal/jit_stub.c: Include system ltdl.h.

* Makefile.am (SUBDIRS, DIST_SUBDIRS): Removed libltdl.
(noinst_SCRIPTS): Removed libtool. (libtool) Removed.
(install-exec-local) Make sure the target directory exists
prior to symlinking.

Members: 
	ChangeLog:1.5199->1.5200 
	Makefile.am:1.148->1.149 
	Makefile.in:1.307->1.308 
	configure:1.632->1.633 
	configure.ac:1.301->1.302 
	config/Makefile.in:1.252->1.253 
	developers/autogen.sh:1.79->1.80 
	include/Makefile.in:1.316->1.317 
	kaffe/Makefile.in:1.201->1.202 
	kaffe/jvmpi/Makefile.am:1.12->1.13 
	kaffe/jvmpi/Makefile.in:1.126->1.127 
	kaffe/kaffe/Makefile.in:1.225->1.226 
	kaffe/kaffeh/Makefile.in:1.207->1.208 
	kaffe/kaffevm/Makefile.am:1.109->1.110 
	kaffe/kaffevm/Makefile.in:1.280->1.281 
	kaffe/kaffevm/boehm-gc/Makefile.in:1.92->1.93 
	kaffe/kaffevm/gcj/Makefile.in:1.181->1.182 
	kaffe/kaffevm/intrp/Makefile.in:1.190->1.191 
	kaffe/kaffevm/jit/Makefile.in:1.200->1.201 
	kaffe/kaffevm/jit3/Makefile.in:1.170->1.171 
	kaffe/kaffevm/kaffe-gc/Makefile.in:1.90->1.91 
	kaffe/kaffevm/systems/Makefile.in:1.190->1.191 
	kaffe/kaffevm/systems/beos-native/Makefile.in:1.181->1.182 
	kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.45->1.46 
	kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.187->1.188 
	kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.191->1.192 
	kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.167->1.168 
	kaffe/man/Makefile.in:1.188->1.189 
	kaffe/scripts/Makefile.in:1.234->1.235 
	kaffe/scripts/bat/Makefile.in:1.181->1.182 
	kaffe/scripts/compat/Makefile.in:1.209->1.210 
	kaffe/xprof/Makefile.am:1.15->1.16 
	kaffe/xprof/Makefile.in:1.156->1.157 
	libltdl/COPYING.LIB:1.7->1.8(DEAD) 
	libltdl/Makefile.am:1.25->1.26(DEAD) 
	libltdl/Makefile.in:1.64->1.65(DEAD) 
	libltdl/README:1.3->1.4(DEAD) 
	libltdl/acinclude.m4:1.53->1.54(DEAD) 
	libltdl/aclocal.m4:1.62->1.63(DEAD) 
	libltdl/config-h.in:1.21->1.22(DEAD) 
	libltdl/config.guess:1.29->1.30(DEAD) 
	libltdl/config.sub:1.34->1.35(DEAD) 
	libltdl/configure:1.115->1.116(DEAD) 
	libltdl/configure.ac:1.4->1.5(DEAD) 
	libltdl/install-sh:1.16->1.17(DEAD) 
	libltdl/ltdl.c:1.64->1.65(DEAD) 
	libltdl/ltdl.h:1.21->1.22(DEAD) 
	libltdl/ltmain.sh:1.32->1.33(DEAD) 
	libltdl/missing:1.6->1.7(DEAD) 
	libraries/Makefile.in:1.184->1.185 
	libraries/clib/Makefile.in:1.206->1.207 
	libraries/clib/awt/Makefile.in:1.199->1.200 
	libraries/clib/awt/X/Makefile.in:1.195->1.196 
	libraries/clib/awt/nano-X/Makefile.in:1.66->1.67 
	libraries/clib/awt/qt/Makefile.in:1.147->1.148 
	libraries/clib/awt/xynth/Makefile.in:1.22->1.23 
	libraries/clib/math/Makefile.in:1.197->1.198 
	libraries/clib/zip/Makefile.in:1.202->1.203 
	libraries/javalib/Makefile.in:1.597->1.598 
	libraries/javalib/awt-implementations/Makefile.in:1.78->1.79 
	libraries/javalib/awt-implementations/kaffe/Makefile.in:1.101->1.102 
	libraries/javalib/gmp-math/Makefile.in:1.87->1.88 
	libraries/javalib/vmspecific/Makefile.in:1.30->1.31 
	libraries/javalib/zlib-zip/Makefile.in:1.24->1.25 
	replace/Makefile.in:1.144->1.145 
	test/Makefile.in:1.193->1.194 
	test/internal/Makefile.am:1.37->1.38 
	test/internal/Makefile.in:1.169->1.170 
	test/internal/jit_stub.c:1.14->1.15 
	test/jni/Makefile.am:1.21->1.22 
	test/jni/Makefile.in:1.100->1.101 
	test/regression/Makefile.in:1.272->1.273 
	test/regression/compile_time/Makefile.in:1.121->1.122 
	test/regression/compiler/Makefile.in:1.105->1.106 
	test/regression/run_time/Makefile.in:1.120->1.121 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5199 kaffe/ChangeLog:1.5200
--- kaffe/ChangeLog:1.5199	Sat Jan 19 19:35:38 2008
+++ kaffe/ChangeLog	Sat Jan 19 22:45:20 2008
@@ -1,5 +1,35 @@
 2008-01-19  Dalibor Topic  <robilad at kaffe.org>
 
+	* developers/autogen.sh: Don't libtoolize with --ltdl. Removed workarounds
+	and patches for libltdl.
+
+	* libltdl/COPYING.LIB, libltdl/Makefile.am, libltdl/Makefile.in,
+	libltdl/README, libltdl/acinclude.m4, libltdl/aclocal.m4, libltdl/config-h.in,
+	libltdl/config.guess, libltdl/config.sub, libltdl/configure, 
+	libltdl/configure.ac, libltdl/install-sh, libltdl/ltdl.c, libltdl/ltdl.h,
+	libltdl/ltmain.sh libltdl/missing: Removed.
+
+	* configure.ac: (AC_LIBLTDL_CONVENIENCE, LIBTOOL_DEPS, LIBLTDL) 
+	Removed. Check for ltdl.h and libltdl and if not found error out.
+	Don't attempt to configure libltdl.
+
+	* test/internal/Makefile.am (jitBasic_LDADD),
+	test/jni/Makefile.am (jniBase_LDADD, jniExecClass_LDADD)
+	(jniReflect_LDADD, libjniweaklib_la_LDADD),
+	kaffe/xprof/Makefile.am (libkaffexprof_la_LIBADD),
+	kaffe/jvmpi/Makefile.am (libkaffejvmpi_la_DEPENDENCIES),
+	kaffe/kaffevm/Makefile.am (libkaffe_la_DEPENDENCIES): Removed
+	LIBLTDL.
+
+	* test/internal/jit_stub.c: Include system ltdl.h.
+
+	* Makefile.am (SUBDIRS, DIST_SUBDIRS): Removed libltdl.
+	(noinst_SCRIPTS): Removed libtool. (libtool) Removed.
+	(install-exec-local) Make sure the target directory exists
+	prior to symlinking.
+
+2008-01-19  Dalibor Topic  <robilad at kaffe.org>
+
 	* kaffe/scripts/Makefile.am (install-exec-local),
 	Makefile.am (install-exec-local),
 	libraries/javalib/Makefile.am (install-data-local):
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.148 kaffe/Makefile.am:1.149
--- kaffe/Makefile.am:1.148	Sat Jan 19 19:35:38 2008
+++ kaffe/Makefile.am	Sat Jan 19 22:45:20 2008
@@ -18,7 +18,6 @@
 	replace \
 	libraries/javalib \
 	config \
-	libltdl \
 	kaffe/kaffeh \
 	include  \
 	kaffe/kaffevm \
@@ -30,7 +29,6 @@
 	config \
 	include \
 	replace \
-	libltdl \
 	kaffe \
 	libraries \
 	test \
@@ -145,10 +143,7 @@
 depend:
 	@echo \`make depend\' is no longer needed
 
-noinst_SCRIPTS = libtool BUILD_ENVIRONMENT
-
-libtool: $(LIBTOOL_DEPS)
-	$(SHELL) ./config.status --recheck
+noinst_SCRIPTS = BUILD_ENVIRONMENT
 
 BUILD_ENVIRONMENT: Makefile
 	$(MAKE) top_srcdir=`cd $(top_srcdir) >/dev/null; pwd` \
@@ -175,6 +170,7 @@
 	cd test && $(MAKE) check
 
 install-exec-local:
+	$(MKDIR_P) $(DESTDIR)${toolslibdir}
 	$(LN_S) -f $(CLASSPATH_PREFIX)/share/classpath/tools.zip $(DESTDIR)${toolslibdir}/tools.jar
 
 uninstall-local:
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.307 kaffe/Makefile.in:1.308
--- kaffe/Makefile.in:1.307	Sat Jan 19 19:35:38 2008
+++ kaffe/Makefile.in	Sat Jan 19 22:45:20 2008
@@ -179,11 +179,9 @@
 LIBADD_GMP = @LIBADD_GMP@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
-LIBLTDL = @LIBLTDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
@@ -299,7 +297,6 @@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
@@ -312,7 +309,6 @@
 	replace \
 	libraries/javalib \
 	config \
-	libltdl \
 	kaffe/kaffeh \
 	include  \
 	kaffe/kaffevm \
@@ -324,7 +320,6 @@
 	config \
 	include \
 	replace \
-	libltdl \
 	kaffe \
 	libraries \
 	test \
@@ -435,7 +430,7 @@
 	scripts/WarningDescription.pm
 
 CLEANFILES = BUILD_ENVIRONMENT
-noinst_SCRIPTS = libtool BUILD_ENVIRONMENT
+noinst_SCRIPTS = BUILD_ENVIRONMENT
 all: all-recursive
 
 .SUFFIXES:
@@ -873,9 +868,6 @@
 depend:
 	@echo \`make depend\' is no longer needed
 
-libtool: $(LIBTOOL_DEPS)
-	$(SHELL) ./config.status --recheck
-
 BUILD_ENVIRONMENT: Makefile
 	$(MAKE) top_srcdir=`cd $(top_srcdir) >/dev/null; pwd` \
 		top_builddir=`cd $(top_builddir) >/dev/null; pwd` \
@@ -901,6 +893,7 @@
 	cd test && $(MAKE) check
 
 install-exec-local:
+	$(MKDIR_P) $(DESTDIR)${toolslibdir}
 	$(LN_S) -f $(CLASSPATH_PREFIX)/share/classpath/tools.zip $(DESTDIR)${toolslibdir}/tools.jar
 
 uninstall-local:
Index: kaffe/configure
diff -u kaffe/configure:1.632 kaffe/configure:1.633
--- kaffe/configure:1.632	Sat Jan 19 18:23:34 2008
+++ kaffe/configure	Sat Jan 19 22:45:20 2008
@@ -911,8 +911,6 @@
 FFLAGS
 ac_ct_F77
 LIBTOOL
-LIBTOOL_DEPS
-LIBLTDL
 CCLD
 MKINSTALLDIRS
 USE_NLS
@@ -1035,7 +1033,6 @@
 CFLAGS_WITHOUT_PG
 KAFFE_CFLAGS
 KAFFE_CCASFLAGS
-subdirs
 LTLIBOBJS'
 ac_subst_files='cpu_os_frag
 cpu_frag
@@ -1060,7 +1057,7 @@
 F77
 FFLAGS
 XMKMF'
-ac_subdirs_all='libltdl'
+
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -6310,18 +6307,6 @@
 
 
 
-  case $enable_ltdl_convenience in
-  no) { { echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
-echo "$as_me: error: this package needs a convenience libltdl" >&2;}
-   { (exit 1); exit 1; }; } ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/''libltdl'
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-
 
 
 # Check whether --enable-shared was given.
@@ -7047,7 +7032,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7050 "configure"' > conftest.$ac_ext
+  echo '#line 7035 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9611,11 +9596,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9614: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9599: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9618: \$? = $ac_status" >&5
+   echo "$as_me:9603: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9901,11 +9886,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9904: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9889: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9908: \$? = $ac_status" >&5
+   echo "$as_me:9893: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10005,11 +9990,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10008: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9993: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10012: \$? = $ac_status" >&5
+   echo "$as_me:9997: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12354,7 +12339,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12357 "configure"
+#line 12342 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12454,7 +12439,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12457 "configure"
+#line 12442 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14878,11 +14863,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14881: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14866: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14885: \$? = $ac_status" >&5
+   echo "$as_me:14870: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14982,11 +14967,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14985: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14970: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14989: \$? = $ac_status" >&5
+   echo "$as_me:14974: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16544,11 +16529,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16547: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16532: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16551: \$? = $ac_status" >&5
+   echo "$as_me:16536: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16648,11 +16633,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16651: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16636: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16655: \$? = $ac_status" >&5
+   echo "$as_me:16640: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18839,11 +18824,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18842: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18827: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18846: \$? = $ac_status" >&5
+   echo "$as_me:18831: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19129,11 +19114,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19132: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19117: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19136: \$? = $ac_status" >&5
+   echo "$as_me:19121: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19233,11 +19218,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19236: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19221: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19240: \$? = $ac_status" >&5
+   echo "$as_me:19225: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -21886,6 +21871,231 @@
 
 
 
+if test "${ac_cv_header_ltdl_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for ltdl.h" >&5
+echo $ECHO_N "checking for ltdl.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_ltdl_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5
+echo "${ECHO_T}$ac_cv_header_ltdl_h" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking ltdl.h usability" >&5
+echo $ECHO_N "checking ltdl.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <ltdl.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking ltdl.h presence" >&5
+echo $ECHO_N "checking ltdl.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ltdl.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: ltdl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ltdl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ltdl.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ltdl.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: ltdl.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ltdl.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ltdl.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ltdl.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ltdl.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ltdl.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ltdl.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ltdl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ltdl.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ltdl.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ltdl.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ltdl.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ------------------------------ ##
+## Report this to kaffe at kaffe.org ##
+## ------------------------------ ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for ltdl.h" >&5
+echo $ECHO_N "checking for ltdl.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_ltdl_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_ltdl_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5
+echo "${ECHO_T}$ac_cv_header_ltdl_h" >&6; }
+
+fi
+if test $ac_cv_header_ltdl_h = yes; then
+  { echo "$as_me:$LINENO: checking for library containing lt_dlcaller_register" >&5
+echo $ECHO_N "checking for library containing lt_dlcaller_register... $ECHO_C" >&6; }
+if test "${ac_cv_search_lt_dlcaller_register+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char lt_dlcaller_register ();
+int
+main ()
+{
+return lt_dlcaller_register ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ltdl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_search_lt_dlcaller_register=$ac_res
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_lt_dlcaller_register+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_lt_dlcaller_register+set}" = set; then
+  :
+else
+  ac_cv_search_lt_dlcaller_register=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_search_lt_dlcaller_register" >&5
+echo "${ECHO_T}$ac_cv_search_lt_dlcaller_register" >&6; }
+ac_res=$ac_cv_search_lt_dlcaller_register
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+  { { echo "$as_me:$LINENO: error: Can't find the libltdl library." >&5
+echo "$as_me: error: Can't find the libltdl library." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+else
+  { { echo "$as_me:$LINENO: error: Can't find the ltdl.h header file from the libltdl library" >&5
+echo "$as_me: error: Can't find the ltdl.h header file from the libltdl library" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
 
 ## Let users override the linker used by libtool, but default to $CC.
 CCLD=${CCLD:-'$(CC)'}
@@ -25550,7 +25760,7 @@
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 25553 "configure" */
+/* #line 25763 "configure" */
 public class Test {
 }
 EOF
@@ -42140,8 +42350,6 @@
 
 
 
-subdirs="$subdirs libltdl"
-
 ac_config_headers="$ac_config_headers config/config.h"
 
 ac_config_files="$ac_config_files Makefile"
@@ -43389,8 +43597,6 @@
 FFLAGS!$FFLAGS$ac_delim
 ac_ct_F77!$ac_ct_F77$ac_delim
 LIBTOOL!$LIBTOOL$ac_delim
-LIBTOOL_DEPS!$LIBTOOL_DEPS$ac_delim
-LIBLTDL!$LIBLTDL$ac_delim
 CCLD!$CCLD$ac_delim
 MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
 USE_NLS!$USE_NLS$ac_delim
@@ -43452,6 +43658,8 @@
 HAVE_JASMIN_FALSE!$HAVE_JASMIN_FALSE$ac_delim
 KAFFE_LIBS!$KAFFE_LIBS$ac_delim
 M_LIBS!$M_LIBS$ac_delim
+ZIP_LIBS!$ZIP_LIBS$ac_delim
+LIBADD_GMP!$LIBADD_GMP$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -43493,8 +43701,6 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-ZIP_LIBS!$ZIP_LIBS$ac_delim
-LIBADD_GMP!$LIBADD_GMP$ac_delim
 USE_GMP!$USE_GMP$ac_delim
 GC_NAME!$GC_NAME$ac_delim
 HAVE_GCJ_SUPPORT_TRUE!$HAVE_GCJ_SUPPORT_TRUE$ac_delim
@@ -43554,11 +43760,10 @@
 CFLAGS_WITHOUT_PG!$CFLAGS_WITHOUT_PG$ac_delim
 KAFFE_CFLAGS!$KAFFE_CFLAGS$ac_delim
 KAFFE_CCASFLAGS!$KAFFE_CCASFLAGS$ac_delim
-subdirs!$subdirs$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -44806,185 +45011,5 @@
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  eval "set x $ac_configure_args"
-  shift
-  for ac_arg
-  do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case $ac_arg in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
-    | --c=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ac_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-    *)
-      case $ac_arg in
-      *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-      esac
-      ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
-    esac
-  done
-
-  # Always prepend --prefix to ensure using the same prefix
-  # in subdir configurations.
-  ac_arg="--prefix=$prefix"
-  case $ac_arg in
-  *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-
-  # Pass --silent
-  if test "$silent" = yes; then
-    ac_sub_configure_args="--silent $ac_sub_configure_args"
-  fi
-
-  ac_popdir=`pwd`
-  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    test -d "$srcdir/$ac_dir" || continue
-
-    ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    echo "$as_me:$LINENO: $ac_msg" >&5
-    echo "$ac_msg" >&6
-    { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-    cd "$ac_dir"
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      ac_sub_configure=$ac_srcdir/configure.gnu
-    elif test -f "$ac_srcdir/configure"; then
-      ac_sub_configure=$ac_srcdir/configure
-    elif test -f "$ac_srcdir/configure.in"; then
-      # This should be Cygnus configure.
-      ac_sub_configure=$ac_aux_dir/configure
-    else
-      { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
-echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-      # Make the cache file name correct relative to the subdirectory.
-      case $cache_file in
-      [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
-      *) # Relative name.
-	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
-      esac
-
-      { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-      # The eval makes quoting arguments work.
-      eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
-	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
-	{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
-echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    cd "$ac_popdir"
-  done
 fi
 
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.301 kaffe/configure.ac:1.302
--- kaffe/configure.ac:1.301	Sat Jan 19 18:23:34 2008
+++ kaffe/configure.ac	Sat Jan 19 22:45:21 2008
@@ -297,11 +297,13 @@
 esac
 
 AC_LIBTOOL_DLOPEN
-AC_LIBLTDL_CONVENIENCE
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
-AC_SUBST(LIBTOOL_DEPS)
-AC_SUBST(LIBLTDL)
+
+AC_CHECK_HEADER([ltdl.h],
+  [AC_SEARCH_LIBS([lt_dlcaller_register], [ltdl], [], [AC_MSG_ERROR([Can't find the libltdl library.])])],
+  [AC_MSG_ERROR([Can't find the ltdl.h header file from the libltdl library])])
+
 ## Let users override the linker used by libtool, but default to $CC.
 CCLD=${CCLD:-'$(CC)'}
 AC_SUBST(CCLD)
@@ -1822,7 +1824,6 @@
 dnl Replace KAFFE_CCASFLAGS by the generated one
 AC_SUBST(KAFFE_CCASFLAGS)
 
-AC_CONFIG_SUBDIRS([libltdl])
 AC_CONFIG_HEADERS([config/config.h])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([project.xml project.properties])
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.252 kaffe/config/Makefile.in:1.253
--- kaffe/config/Makefile.in:1.252	Sat Jan 19 18:23:36 2008
+++ kaffe/config/Makefile.in	Sat Jan 19 22:45:22 2008
@@ -153,11 +153,9 @@
 LIBADD_GMP = @LIBADD_GMP@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
-LIBLTDL = @LIBLTDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
@@ -273,7 +271,6 @@

*** Patch too long, truncated ***




More information about the kaffe mailing list