From e97cc0ffcacaee75514b9e440bfd255c93ebdc38 Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Wed, 17 Mar 2004 23:32:37 +0000 Subject: [PATCH] * m4/libtool.m4: Removed AC_BEFORE references to AC_LIBTOOL_SETUP which is no more. * m4/lt~obsolete.m4: As AC_LIBTOOL_SETUP is no longer referenced, it can be removed from this file. Remove _AC_PROG_LIBTOOL also. --- ChangeLog | 7 +++++++ m4/libtool.m4 | 6 ++---- m4/lt~obsolete.m4 | 2 -- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f825d340..bf45f138d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-03-17 Scott James Remnant + + * m4/libtool.m4: Removed AC_BEFORE references to AC_LIBTOOL_SETUP + which is no more. + * m4/lt~obsolete.m4: As AC_LIBTOOL_SETUP is no longer referenced, + it can be removed from this file. Remove _AC_PROG_LIBTOOL also. + 2004-03-14 Ralf Wildenhues * m4/libtool.m4: Remove newlines from lt_ld_extra, so diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 152929391..6b8eca630 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -2613,8 +2613,7 @@ esac # flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case $enable_ltdl_convenience in +[case $enable_ltdl_convenience in no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; "") enable_ltdl_convenience=yes ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; @@ -2639,8 +2638,7 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE], # define top_builddir and top_srcdir appropriately in the Makefiles. # In the future, this macro may have to be called after AC_PROG_LIBTOOL. AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - AC_CHECK_LIB(ltdl, lt_dlinit, +[AC_CHECK_LIB(ltdl, lt_dlinit, [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], [if test x"$enable_ltdl_install" = xno; then AC_MSG_WARN([libltdl not installed, but installation disabled]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 index ddb07afeb..d753ba7ae 100644 --- a/m4/lt~obsolete.m4 +++ b/m4/lt~obsolete.m4 @@ -46,9 +46,7 @@ m4_ifdef([AC_LIBTOOL_CONFIG],, [AU_DEFUN([AC_LIBTOOL_CONFIG])]) m4_ifdef([AC_LIBTOOL_LINKER_OPTION],, [AU_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifdef([AC_LIBTOOL_SETUP],, [AU_DEFUN([AC_LIBTOOL_SETUP])]) m4_ifdef([AC_PROG_EGREP],, [AU_DEFUN([AC_PROG_EGREP])]) -m4_ifdef([_AC_PROG_LIBTOOL],, [AU_DEFUN([_AC_PROG_LIBTOOL])]) m4_ifdef([_LT_AC_LANG_C_CONFIG],, [AU_DEFUN([_LT_AC_LANG_C_CONFIG])]) m4_ifdef([_LT_AC_LANG_GCJ_CONFIG],, [AU_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) m4_ifdef([_LT_AC_LANG_RC_CONFIG],, [AU_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -- 2.47.2