From 2b5fa736e6a2d1ccb7b64c89f1bde4f918e16272 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Tue, 12 Sep 2000 20:02:16 +0000 Subject: [PATCH] libtool.m4 (AC_PROG_LIBTOOL): Removed, as it was triggering a bug in Autoconf-2.13 AC_REQUIRE implementation which inserted some of the expanded tests too early in the generaated configure. (_AC_PROG_LIBTOOL): renamed to AC_PROG_LIBTOOL, and defines itself to an empty expansion to prevent multiple expansions. configure.in (AC_LIBTOOL_SETUP): Replaced by a call to AC_PROG_LIBTOOL now that the AC_REQUIRE bug has been worked around. --- ChangeLog | 11 +++++++++++ configure.in | 3 +-- libtool.m4 | 6 ++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91612ea39..53e24dc3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2000-09-12 Gary V. Vaughan + + libtool.m4 (AC_PROG_LIBTOOL): Removed, as it was triggering a + bug in Autoconf-2.13 AC_REQUIRE implementation which inserted + some of the expanded tests too early in the generaated configure. + (_AC_PROG_LIBTOOL): renamed to AC_PROG_LIBTOOL, and defines + itself to an empty expansion to prevent multiple expansions. + configure.in (AC_LIBTOOL_SETUP): Replaced by a call to + AC_PROG_LIBTOOL now that the AC_REQUIRE bug has been worked + around. + 2000-09-09 Gary V. Vaughan libtool.m4 (_LT_AC_LTCONFIG_HACK): Forgot to escape the diff --git a/configure.in b/configure.in index cbef7a6bc..3dc0beb01 100644 --- a/configure.in +++ b/configure.in @@ -44,8 +44,7 @@ AC_LIBTOOL_WIN32_DLL dnl Check for dlopen support AC_LIBTOOL_DLOPEN - -AC_LIBTOOL_SETUP +AC_PROG_LIBTOOL AC_ARG_ENABLE(ltdl-install, [ --disable-ltdl-install do not install libltdl]) diff --git a/libtool.m4 b/libtool.m4 index b6e2b6412..a72c7ef82 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -22,8 +22,7 @@ ## the same distribution terms that you use for the rest of that program. # serial 45 AC_PROG_LIBTOOL -AC_DEFUN(AC_PROG_LIBTOOL,[AC_REQUIRE([_AC_PROG_LIBTOOL])]) -AC_DEFUN(_AC_PROG_LIBTOOL, +AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl # This can be used to rebuild libtool when needed @@ -32,6 +31,9 @@ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' AC_SUBST(LIBTOOL)dnl + +# Prevent multiple expansion +define([AC_PROG_LIBTOOL], []) ]) AC_DEFUN(AC_LIBTOOL_SETUP, -- 2.47.3