acinclude.m4: Restore the situation that we don't build modules on darwin.

2006-03-29  Andreas Tobler  <a.tobler@schweiz.ch>

	* acinclude.m4: Restore the situation that we don't build modules on
	darwin.
	* configure: Regenerated.

From-SVN: r112503

diff --git a/libjava/libltdl/ChangeLog b/libjava/libltdl/ChangeLog
index 9fad06b5966bc7e527a8aafc1e2935cdc61c3616..eb555d76896da6b239facaa856b8ed3c6a6a472a 100644 (file)
--- a/libjava/libltdl/ChangeLog
+++ b/libjava/libltdl/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-29  Andreas Tobler  <a.tobler@schweiz.ch>
+
+       * acinclude.m4: Restore the situation that we don't build modules on
+       darwin.
+       * configure: Regenerated.
+
 2006-03-28  Tom Tromey  <tromey@redhat.com>
 
        PR libgcj/26441:

diff --git a/libjava/libltdl/acinclude.m4 b/libjava/libltdl/acinclude.m4
index e3ae5aea4a780bef2e52d6974cf1df5759c6259c..9491c77d6709d253856e8123451c660c8918c411 100644 (file)
--- a/libjava/libltdl/acinclude.m4
+++ b/libjava/libltdl/acinclude.m4
@@ -6371,7 +6371,18 @@ AC_DEFUN([AC_LTDL_SHLIBEXT],
 AC_CACHE_CHECK([which extension is used for loadable modules],
   [libltdl_cv_shlibext],
 [
-module=yes
+# Here in libltdl for libgcj we don't build modules for darwin.
+# So we say no. Then the extension gets .dylib which is the right
+# thing for shared libraries on darwin. Please keep me next time you
+# import libltdl.
+case "$host_os" in
+darwin*)
+       module=no
+       ;;
+*)
+       module=yes
+       ;;
+esac
 eval libltdl_cv_shlibext=$shrext_cmds
   ])
 if test -n "$libltdl_cv_shlibext"; then

diff --git a/libjava/libltdl/configure b/libjava/libltdl/configure
index 3c89816b9b2b568a1147ffd1f540f6d2e3c552b9..6d98323f2b3f2d42b62df00340da318e8017abeb 100755 (executable)
--- a/libjava/libltdl/configure
+++ b/libjava/libltdl/configure
@@ -20450,7 +20450,18 @@ if test "${libltdl_cv_shlibext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-module=yes
+# Here in libltdl for libgcj we don't build modules for darwin.
+# So we say no. Then the extension gets .dylib which is the right
+# thing for shared libraries on darwin. Please keep me next time you
+# import libltdl.
+case "$host_os" in
+darwin*)
+       module=no
+       ;;
+*)
+       module=yes
+       ;;
+esac
 eval libltdl_cv_shlibext=$shrext_cmds
 
 fi
@@ -21300,7 +21311,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 21303 "configure"
+#line 21314 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H