* aclocal.m4: Regenerated, using the libtool 0.9h m4 macros.

diff --git a/aclocal.m4 b/aclocal.m4
index ab36bae..0d20a65 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -197,11 +197,12 @@ done<<>>dnl>>)
 changequote([,]))])
 
 
-# serial 4 AM_PROG_LIBTOOL
+# serial 7 AM_PROG_LIBTOOL
 AC_DEFUN(AM_PROG_LIBTOOL,
 [AC_REQUIRE([AC_CANONICAL_HOST])
 AC_REQUIRE([AC_PROG_CC])
 AC_REQUIRE([AC_PROG_RANLIB])
+AC_REQUIRE([AM_PATH_PROG_LD])
 
 # Always use our own libtool.
 LIBTOOL='$(top_builddir)/libtool'
@@ -213,16 +214,25 @@ AC_ARG_ENABLE(shared,
 test "$enableval" = no && libtool_shared=" --disable-shared",
 libtool_shared=)
 
-libtool_flags="$libtool_shared"
+dnl Allow the --disable-static flag to stop us from building static libs.
+AC_ARG_ENABLE(static,
+[  --enable-static         build static libraries [default=yes]],
+test "$enableval" = no && libtool_static=" --disable-static",
+libtool_static=)
+
+libtool_flags="$libtool_shared$libtool_static"
 test "$silent" = yes && libtool_flags="$libtool_flags --silent"
 test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
 
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
 [case "$host" in
 *-*-irix6*)
-  # For IRIX 6, ld needs -n32 if cc uses it.
-  if echo " $CC $CFLAGS " | egrep -e '[        ]-n32[   ]' > /dev/null; then
-    LD="${LD-ld} -n32"
-  fi
+  for f in '-32' '-64' '-cckr' '-n32' '-mips1' '-mips2' '-mips3' '-mips4'; do
+    if echo " $CC $CFLAGS " | egrep -e "[      ]$f[     ]" > /dev/null; then
+      LD="${LD-ld} $f"
+    fi
+  done
   ;;
 
 *-*-sco3.2v5*)
@@ -238,6 +248,46 @@ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || AC_MSG_ERROR([libtool configure failed])
 ])
 
+# AM_PATH_PROG_LD - find out which linker is being used by the C compiler
+AC_DEFUN(AM_PATH_PROG_LD,
+[AC_REQUIRE([AC_PROG_CC])
+AC_MSG_CHECKING([for ld used by the C compiler ($CC $CFLAGS $LDFLAGS)])
+AC_CACHE_VAL(am_cv_path_LD,
+[case "$LD" in
+  /*)
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/ld"; then
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      if "$ac_dir/ld" -v 2>&1 < /dev/null | egrep '(GNU ld|with BFD)' > /dev/null; then
+        # If it was GNU ld, only accept it if we're using GCC.
+        am_cv_path_LD="$ac_dir/ld"
+       test "$ac_cv_prog_gcc" = yes && break
+      else
+        # If it was not GNU ld, and we are not using GCC, then accept it.
+        am_cv_path_LD="$ac_dir/ld"
+        break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac])
+LD="$am_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_SUBST(LD)
+])
+
 dnl
 dnl CY_AC_WITH_THREADS determines which thread library the user intends
 dnl to put underneath guile.  Pass it the path to find the guile top-level