--- aclocal.m4 2001/05/10 19:46:01 1.1
+++ aclocal.m4 2001/08/15 07:49:59 1.2
@@ -35,10 +35,8 @@
dnl ##
AC_DEFUN(AC_PLATFORM,[
-if test ".$host" != .NONE; then
+if test ".$host" != .NONE && test ".$host" != .; then
$1="$host"
-elif test ".$nonopt" != .NONE; then
- $1="$nonopt"
else
$1=`${CONFIG_SHELL-/bin/sh} $srcdir/config.guess`
fi
@@ -59,7 +57,7 @@
dnl ##
AC_DEFUN(AC_HEADLINE,[dnl
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+AC_DIVERT_PUSH(NOTICE)dnl
# configuration header
if test ".`echo dummy [$]@ | grep help`" = .; then
# bootstrapping shtool
@@ -151,7 +149,7 @@
esac
fi
msg="enabled"
-AC_DEFINE(STR_DEBUG)
+dnl AC_DEFINE(L2_DEBUG)
],[
if test ".$ac_cv_prog_gcc" = ".yes"; then
case "$CFLAGS" in
@@ -177,38 +175,14 @@
])
dnl ##
-dnl ## Minimalistic Libtool Glue Code
+dnl ## Libtool Glue Code
dnl ##
dnl ## configure.in:
-dnl ## AC_PROG_LIBTOOL(<platform-variable>)
+dnl ## AC_CONFIGURE_LIBTOOL
dnl ##
-AC_DEFUN(AC_PROG_LIBTOOL,[dnl
-AC_ARG_ENABLE(static,dnl
-[ --enable-static build static libraries (default=yes)],
-enable_static="$enableval",
-if test ".$enable_static" = .; then
- enable_static=yes
-fi
-)dnl
-AC_ARG_ENABLE(shared,dnl
-[ --enable-shared build shared libraries (default=yes)],
-enable_shared="$enableval",
-if test ".$enable_shared" = .; then
- enable_shared=yes
-fi
-)dnl
-libtool_flags=''
-dnl libtool_flags="$libtool_flags --cache-file=$cache_file"
-test ".$silent" = .yes && libtool_flags="$libtool_flags --silent"
-test ".$enable_static" = .no && libtool_flags="$libtool_flags --disable-static"
-test ".$enable_shared" = .no && libtool_flags="$libtool_flags --disable-shared"
-test ".$ac_cv_prog_gcc" = .yes && libtool_flags="$libtool_flags --with-gcc"
-test ".$ac_cv_prog_gnu_ld" = .yes && libtool_flags="$libtool_flags --with-gnu-ld"
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LD="$LD" \
-${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig --no-reexec \
-$libtool_flags --srcdir=$srcdir --no-verify $srcdir/ltmain.sh $1 ||\
-AC_MSG_ERROR([libtool configuration failed])
-dnl (AC_CACHE_LOAD) >/dev/null 2>&1
-])dnl
+AC_DEFUN(AC_CONFIGURE_LIBTOOL,[
+ sinclude(libtool.m4)
+ AC_PROG_LIBTOOL
+])
|
