Remove last shred of libtool

WARNING: don't do "autoreconf", as it adds libtool back!
Instead, do "autoconf".

diff --git a/aclocal.m4 b/aclocal.m4
index caa92b7..a803eaf 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -96,20 +96,12 @@ AC_REQUIRE([LTOPTIONS_VERSION])dnl
 AC_REQUIRE([LTSUGAR_VERSION])dnl
 AC_REQUIRE([LTVERSION_VERSION])dnl
 AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
 
 _LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
 
 dnl Parse OPTIONS
 _LT_SET_OPTIONS([$0], [$1])
 
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
 _LT_SETUP
 
 # Only expand once:
@@ -278,19 +270,6 @@ delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
 no_glob_subst='s/\*/\\\*/g'
 ])
 
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
 
 # So that we can recreate a full libtool script including additional
 # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS

diff --git a/configure b/configure
index 9e85bcd..f1cf69b 100755 (executable)
--- a/configure
+++ b/configure
@@ -742,7 +742,6 @@ enable_fast_install
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
-with_gnu_ld
 enable_strict_dependencies
 with_docdir
 with_logdir
@@ -773,9 +772,6 @@ LIBS
 CPPFLAGS
 CXX
 CXXFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
 CCC
 CPP
 CXXCPP'
@@ -4679,9 +4675,22 @@ fi
 # Check whether --with-system-libltdl was given.
 if test "${with_system_libltdl+set}" = set; then :
   withval=$with_system_libltdl;
-LIBLTDL="-lltdl"
+else
+  with_system_libltdl=no
+fi
+
+
+if test "x$with_system_libltdl" = "xyes" ; then :
+   LIBLTDL="-lltdl"
 INCLTDL=-DWITH_SYSTEM_LTDL
+fi
 
+
+# Check whether --with-system-libtool was given.
+if test "${with_system_libtool+set}" = set; then :
+  withval=$with_system_libtool;
+else
+  with_system_libtool=no
 fi
 
 
@@ -4736,9 +4745,6 @@ macro_revision='1.3293'
 
 
 
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -7914,10 +7920,8 @@ func_stripname_cnf ()
   esac
 } # func_stripname_cnf
 
-
-# Check whether --with-system-libtool was given.
-if test "${with_system_libtool+set}" = set; then :
-  withval=$with_system_libtool;  # Extract the first word of "libtool", so it can be a program name with args.
+if test "x$with_system_libtool" = "xyes" ; then :
+   # Extract the first word of "libtool", so it can be a program name with args.
 set dummy libtool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -8085,12 +8089,6 @@ fi
 
 
 
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
 
 
 
@@ -15137,13 +15135,10 @@ else
 
 
 
-
-
 fi
 
 
 
-
 # Check whether --enable-strict-dependencies was given.
 if test "${enable_strict_dependencies+set}" = set; then :
   enableval=$enable_strict_dependencies;
@@ -16876,6 +16871,7 @@ for ac_header in \
        sys/types.h \
        sys/socket.h \
        winsock.h \
+       utime.h \
        sys/time.h \
        sys/wait.h \
        sys/security.h \
@@ -19458,7 +19454,6 @@ postlink_cmds_CXX; do
     esac
 done
 
-ac_aux_dir='$ac_aux_dir'
 xsi_shell='$xsi_shell'
 lt_shell_append='$lt_shell_append'
 
@@ -20529,8 +20524,6 @@ _LT_EOF
   esac
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
-
 
   # We use sed instead of cat because bash on DJGPP gets confused if
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in