*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index a7cc991..f932721 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-10-04  Marius Vollmer  <mvo@zagadka.ping.de>
+
+       * configure.in: Use AC_LIBLTDL_CONVENIENCE instead of
+       AC_LIBLTDL_INSTALLABLE.
+
+2002-10-03  Marius Vollmer  <mvo@zagadka.ping.de>
+
+       * autogen.sh: Do not instruct libtoolize to copy libltdl into our
+       sources.  Do not patch it.  We have our own version now that is
+       only being used as a convenience library.
+
 2002-08-24  Marius Vollmer  <mvo@zagadka.ping.de>
 
        * configure.in: Check for __libc_stack_end.

diff --git a/autogen.sh b/autogen.sh
index f06a127..c4924e6 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -44,44 +44,7 @@ $mscripts/render-bugs > BUGS
 ### Libtool setup.
 
 # Get a clean version.
-rm -rf libltdl
-libtoolize --force --copy --automake --ltdl
-
-# Fix older versions of libtool.
-# Make sure we use a ./configure.in compatible autoconf in ./libltdl/
-if [ -f libltdl/configure.in ]; then
-       mv libltdl/configure.in libltdl/configure.tmp
-       echo 'AC_PREREQ(2.50)' > libltdl/configure.in
-       cat libltdl/configure.tmp >> libltdl/configure.in
-       rm libltdl/configure.tmp
-fi
-
-# Maybe patch ltdl.c.  This is only needed for 1.4.2 and earlier.
-if patch libltdl/ltdl.c <<EOP
---- ltdl.c~    Fri Apr 12 18:52:48 2002
-+++ ltdl.c     Tue Jul  9 14:12:47 2002
-@@ -2246,15 +2246,15 @@
- static int
- find_handle_callback (filename, data, ignored)
-      char *filename;
-      lt_ptr data;
-      lt_ptr ignored;
- {
-   lt_dlhandle  *handle        = (lt_dlhandle *) data;
--  int         found   = access (filename, R_OK);
-+  int         found   = !access (filename, F_OK);
- 
-   /* Bail out if file cannot be read...  */
-   if (!found)
-     return 0;
- 
-   /* Try to dlopen the file, but do not continue searching in any
-      case.  */
-EOP
-then true
-else
-   echo "WARNING: could not patch libltdl, but this is probably OK."
-fi
+libtoolize --force --copy --automake
 
 ######################################################################