* libtool.m4 (_AC_PROG_LIBTOOL): Renamed from...

(AC_PROG_LIBTOOL): Just AC_REQUIRE(_AC_PROG_LIBTOOL), to avoid
effects of multiple runs.
(_AC_PROG_LIBTOOL): Use AC_BEFORE to warn if called before
AC_LIBTOOL_CXX.

diff --git a/ChangeLog b/ChangeLog
index 3c0b741add30d622f617140a31a28ee25a579112..40ed392f651b4f740d862497b12af7c01640fbfa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-05-14  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
 
+       * libtool.m4 (_AC_PROG_LIBTOOL): Renamed from...
+       (AC_PROG_LIBTOOL): Just AC_REQUIRE(_AC_PROG_LIBTOOL), to avoid
+       effects of multiple runs.
+       (_AC_PROG_LIBTOOL): Use AC_BEFORE to warn if called before
+       AC_LIBTOOL_CXX.
+
        * tagdemo/Makefile.am (lib_LTLIBRARIES): Moved libbaz.la from
        noinst_LTLIBRARIES.
 

diff --git a/libtool.m4 b/libtool.m4
index 6e069451a5b2042b6a5d612417d2415eb1a5b0aa..34eb58506d6ba4706b569cb789336edbe15af6db 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -21,9 +21,11 @@
 ## configuration script generated by Autoconf, you may include it under
 ## the same distribution terms that you use for the rest of that program.
 
-# serial 42 AC_PROG_LIBTOOL
-AC_DEFUN(AC_PROG_LIBTOOL,
+# serial 43 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,[AC_REQUIRE([_AC_PROG_LIBTOOL])])
+AC_DEFUN(_AC_PROG_LIBTOOL,
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
 
 # Save cache, so that ltconfig can load it
 AC_CACHE_SAVE