]> git.ipfire.org Git - thirdparty/libtool.git/commitdiff
projects / thirdparty / libtool.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d79ab06)
Run our configure.ac files through Autoconf 2.59's autoupdate, and
authorGary V. Vaughan <gary@gnu.org>
Fri, 14 Nov 2003 11:12:22 +0000 (11:12 +0000)
committerGary V. Vaughan <gary@gnu.org>
Fri, 14 Nov 2003 11:12:22 +0000 (11:12 +0000)
then tweak the results by hand:

* m4/libtool.m4 (AC_PROG_LD): In common with all the other
AC_PROG_ macros, AC_SUBST the discovered LD.
(AC_PROG_NM): Similarly for NM.
(LT_AC_PROG_SED): Similarly for SED.
* configure.ac: No need to SUBST NM and LD manually any more.
(AC_PREREQ): Conservatively downgrade from 2.59 to 2.54.
* tests/cdemo/configure.ac, tests/demo/configure.ac,
tests/depdemo/configure.ac, tests/f77demo/configure.ac,
tests/mdemo/configure.ac, tests/mdemo2/configure.ac,
tests/pdemo/configure.ac, tests/tagdemo/configure.ac: Ditto.
* m4/libtool.m4 (AM_PROG_LIBTOOL, AM_ENABLE_SHARED,
AM_ENABLE_STATIC, AM_DISABLE_SHARED, AM_DISABLE_STATIC,
AM_PROG_LD, AM_PROG_NM): AU_DEFUN these macros so autoupdate can
use the newer definitions.

ChangeLog patch | blob | blame | history
configure.ac patch | blob | blame | history
m4/libtool.m4 patch | blob | blame | history
tests/cdemo/configure.ac patch | blob | blame | history
tests/demo/configure.ac patch | blob | blame | history
tests/depdemo/configure.ac patch | blob | blame | history
tests/f77demo/configure.ac patch | blob | blame | history
tests/mdemo/configure.ac patch | blob | blame | history
tests/mdemo2/configure.ac patch | blob | blame | history
tests/pdemo/configure.ac patch | blob | blame | history
tests/tagdemo/configure.ac patch | blob | blame | history

diff --git a/ChangeLog b/ChangeLog
index 242fc2294cf0cb3832de03fc180614705a7a37db..81aebd3f90d42444c170335a549893fdcf9a58d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2003-11-14  Gary V. Vaughan  <gary@gnu.org>
+
+       Run our configure.ac files through Autoconf 2.59's autoupdate, and
+       then tweak the results by hand:
+
+       * m4/libtool.m4 (AC_PROG_LD): In common with all the other
+       AC_PROG_ macros, AC_SUBST the discovered LD.
+       (AC_PROG_NM): Similarly for NM.
+       (LT_AC_PROG_SED): Similarly for SED.
+       * configure.ac: No need to SUBST NM and LD manually any more.
+       (AC_PREREQ): Conservatively downgrade from 2.59 to 2.54.
+       * tests/cdemo/configure.ac, tests/demo/configure.ac,
+       tests/depdemo/configure.ac, tests/f77demo/configure.ac,
+       tests/mdemo/configure.ac, tests/mdemo2/configure.ac,
+       tests/pdemo/configure.ac, tests/tagdemo/configure.ac: Ditto.
+       * m4/libtool.m4 (AM_PROG_LIBTOOL, AM_ENABLE_SHARED,
+       AM_ENABLE_STATIC, AM_DISABLE_SHARED, AM_DISABLE_STATIC,
+       AM_PROG_LD, AM_PROG_NM): AU_DEFUN these macros so autoupdate can
+       use the newer definitions.
+
 2003-11-12  Gary V. Vaughan  <gary@gnu.org>
 
        The rules for uploading releases to gnu.org have been updated, and
diff --git a/configure.ac b/configure.ac
index af95ac33ad5d942916962bbb02289866e76d66f2..8e13a92d2f3127391d359ca1aff66ace70b40249 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
 
 
 ## FIXME: Is this really new enough? ##
-AC_PREREQ(2.50)
+AC_PREREQ(2.54)
 
 
 
@@ -73,7 +73,7 @@ aclocaldir='${datadir}/aclocal'
 AC_SUBST([aclocaldir])
 
 AC_ARG_ENABLE(ltdl-install,
-    [AC_HELP_STRING([--disable-ltdl-install], [do not install libltdl])])
+    [AS_HELP_STRING([--disable-ltdl-install], [do not install libltdl])])
 if test x"${enable_ltdl_install+set}" != xset; then
   enable_ltdl_install=yes
   ac_configure_args="$ac_configure_args --enable-ltdl-install"
@@ -100,10 +100,8 @@ AC_SUBST([DIST_MAKEFILE_LIST])
 # Use the specified CC and LD
 AC_PROG_CC
 AC_EXEEXT
-AM_PROG_LD
-AC_SUBST(LD)
-AM_PROG_NM
-AC_SUBST(NM)
+AC_PROG_LD
+AC_PROG_NM
 AC_PROG_LN_S
 
 pushdef([AC_MSG_ERROR], [CXX=no])
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 3af06f3c21b254df652dda952e809c79eb34ba73..2ca2207c6e34b836b34d1df57774f7448d992c09 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2066,6 +2066,7 @@ else
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_PROG_LD_GNU
+AC_SUBST([LD])
 ])# AC_PROG_LD
 
 
@@ -2336,6 +2337,7 @@ else
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi])
 NM="$lt_cv_path_NM"
+AC_SUBST([NM])
 ])# AC_PROG_NM
 
 
@@ -5921,13 +5923,13 @@ m4_define([_LT_AC_TAGVAR], [m4_if([$2], [], [$1], [$1_$2])])
 
 
 # old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+AU_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+AU_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+AU_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+AU_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
 
 # This is just to silence aclocal about the macro not being used
 m4_if([AC_DISABLE_FAST_INSTALL])
@@ -6001,6 +6003,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
   done
 done
 SED=$lt_cv_path_SED
+AC_SUBST([SED])
 ])
 AC_MSG_RESULT([$SED])
 ])
diff --git a/tests/cdemo/configure.ac b/tests/cdemo/configure.ac
index 98017a6198a9a1ca1464fa15a6ffb0e30b2e745c..5aa490137881aac2238951f99a66929e5a7cf147 100644 (file)
--- a/tests/cdemo/configure.ac
+++ b/tests/cdemo/configure.ac
@@ -16,12 +16,12 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 
-AC_PREREQ(2.50)
+AC_PREREQ(2.54)
 
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([cdemo], [0.1], [bug-libtool@gnu.org])
+AC_INIT([cdemo], [1.0], [bug-libtool@gnu.org])
 AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_AUX_DIR([../../config])
 
diff --git a/tests/demo/configure.ac b/tests/demo/configure.ac
index 7982cd9e4c7ca04a97661ff194741a25647dee28..30ded38f6bc680ae5750da407ef969e703fcfcb6 100644 (file)
--- a/tests/demo/configure.ac
+++ b/tests/demo/configure.ac
@@ -16,7 +16,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 
-AC_PREREQ(2.50)
+AC_PREREQ(2.54)
 
 
 ## ------------------------ ##
diff --git a/tests/depdemo/configure.ac b/tests/depdemo/configure.ac
index 090ba3bc0e87aff8bb5b085d2aa6bf2cfa83414c..4d6dfc08eb23a065546ecdb5b19702c28324b222 100644 (file)
--- a/tests/depdemo/configure.ac
+++ b/tests/depdemo/configure.ac
@@ -16,13 +16,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 
-AC_PREREQ(2.50)
+AC_PREREQ(2.54)
 
 
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([depdemo], [0.1], [bug-libtool@gnu.org])
+AC_INIT([depdemo], [1.0], [bug-libtool@gnu.org])
 AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_AUX_DIR([../../config])
 
diff --git a/tests/f77demo/configure.ac b/tests/f77demo/configure.ac
index e0f91b0ff2d967148ac0ac6a5f6fe2eacedad498..d809823d2cb267d5d2c20ef030618cad9e1726cc 100644 (file)
--- a/tests/f77demo/configure.ac
+++ b/tests/f77demo/configure.ac
@@ -16,12 +16,12 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 
-AC_PREREQ(2.50)
+AC_PREREQ(2.54)
 
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([f77demo], [0.1], [bug-libtool@gnu.org])
+AC_INIT([f77demo], [1.0], [bug-libtool@gnu.org])
 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([foof.f])
 AC_CONFIG_AUX_DIR([../../config])
diff --git a/tests/mdemo/configure.ac b/tests/mdemo/configure.ac
index 8aa882e68a4b114ee789b843ef20b3ee84cebdd0..672fad6796cd2c68b845a70c5f2fd37d5d806489 100644 (file)
--- a/tests/mdemo/configure.ac
+++ b/tests/mdemo/configure.ac
@@ -16,13 +16,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 
-AC_PREREQ(2.50)
+AC_PREREQ(2.54)
 
 
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([mdemo], [0.1], [bug-libtool@gnu.org])
+AC_INIT([mdemo], [1.0], [bug-libtool@gnu.org])
 AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_AUX_DIR([../../config])
 
diff --git a/tests/mdemo2/configure.ac b/tests/mdemo2/configure.ac
index 1125f3b048c665e8b6f0659e06216392eec41362..8d14259c9ed9139ae5e2f637e329018e92168315 100644 (file)
--- a/tests/mdemo2/configure.ac
+++ b/tests/mdemo2/configure.ac
@@ -16,13 +16,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 
-AC_PREREQ(2.50)
+AC_PREREQ(2.54)
 
 
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([mdemo2], [0.1], [bug-libtool@gnu.org])
+AC_INIT([mdemo2], [1.0], [bug-libtool@gnu.org])
 AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_AUX_DIR([../../config])
 
diff --git a/tests/pdemo/configure.ac b/tests/pdemo/configure.ac
index 966f1cf8a3f975333c2833db77aa80b253d1aff0..8eed8971f68388a6284bc4651ebf3e093d81dceb 100644 (file)
--- a/tests/pdemo/configure.ac
+++ b/tests/pdemo/configure.ac
@@ -16,13 +16,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 
-AC_PREREQ(2.50)
+AC_PREREQ(2.54)
 
 
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([pdemo], [0.1], [bug-libtool@gnu.org])
+AC_INIT([pdemo], [1.0], [bug-libtool@gnu.org])
 AC_CONFIG_SRCDIR([longer_file_name_hello.c])
 AC_CONFIG_AUX_DIR([../../config])
 
diff --git a/tests/tagdemo/configure.ac b/tests/tagdemo/configure.ac
index 52bd7e14dd8c881e056d49fe842bf4ceea49aeda..7ee0cf3bf561f949a5c6d0d8978407cc5f28de27 100644 (file)
--- a/tests/tagdemo/configure.ac
+++ b/tests/tagdemo/configure.ac
@@ -16,13 +16,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 
-AC_PREREQ(2.50)
+AC_PREREQ(2.54)
 
 
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([tagdemo], [0.1], [bug-libtool@gnu.org])
+AC_INIT([tagdemo], [1.0], [bug-libtool@gnu.org])
 AC_CONFIG_SRCDIR([foo.cpp])
 AC_CONFIG_AUX_DIR([../../config])
 
Mirror of https://github.com/autotools-mirror/libtool.git