[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: FYI: 36-gary-revert-some-m4_defines.patch
From: |
Gary V. Vaughan |
Subject: |
Re: FYI: 36-gary-revert-some-m4_defines.patch |
Date: |
Fri, 14 Nov 2003 11:17:17 +0000 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.5) Gecko/20030925 Thunderbird/0.3 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Paolo Bonzini wrote:
|> # old names
|>-m4_define([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
|>-m4_define([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
|>-m4_define([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
|>-m4_define([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
|>-m4_define([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
|>+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($@)])
|
|
| I'd rather AU_DEFUN these.
Good point. I'm applying this to HEAD.
Cheers,
Gary.
- --
~ ())_. Gary V. Vaughan gary@(lilith.warpmail.net|gnu.org)
~ ( '/ Research Scientist http://www.oranda.demon.co.uk ,_())____
~ / )= GNU Hacker http://www.gnu.org/software/libtool \' `&
`(_~)_ Tech' Author http://sources.redhat.com/autobook =`---d__/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQE/tLm9FRMICSmD1gYRAr+/AJ0fHnoOW0BLI8rrrS1AJpwmGGDWPQCfTWcs
jj/EbUgdnkLw18pmhoj+w1Y=
=Puof
-----END PGP SIGNATURE-----
Index: ChangeLog
from Gary V. Vaughan <address@hidden>
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.
Index: configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/configure.ac,v
retrieving revision 1.21
diff -u -p -u -r1.21 configure.ac
--- configure.ac 21 Oct 2003 15:03:54 -0000 1.21
+++ configure.ac 14 Nov 2003 11:11:38 -0000
@@ -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])
Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.19
diff -u -p -u -r1.19 libtool.m4
--- m4/libtool.m4 11 Nov 2003 16:49:32 -0000 1.19
+++ m4/libtool.m4 14 Nov 2003 11:11:38 -0000
@@ -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],
# 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/xp
done
done
SED=$lt_cv_path_SED
+AC_SUBST([SED])
])
AC_MSG_RESULT([$SED])
])
Index: tests/cdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/cdemo/configure.ac,v
retrieving revision 1.3
diff -u -p -u -r1.3 configure.ac
--- tests/cdemo/configure.ac 7 Nov 2003 16:25:57 -0000 1.3
+++ tests/cdemo/configure.ac 14 Nov 2003 11:11:38 -0000
@@ -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], address@hidden)
+AC_INIT([cdemo], [1.0], address@hidden)
AC_CONFIG_SRCDIR([main.c])
AC_CONFIG_AUX_DIR([../../config])
Index: tests/demo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/demo/configure.ac,v
retrieving revision 1.4
diff -u -p -u -r1.4 configure.ac
--- tests/demo/configure.ac 7 Nov 2003 16:25:57 -0000 1.4
+++ tests/demo/configure.ac 14 Nov 2003 11:11:38 -0000
@@ -16,7 +16,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA
-AC_PREREQ(2.50)
+AC_PREREQ(2.54)
## ------------------------ ##
Index: tests/depdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/depdemo/configure.ac,v
retrieving revision 1.4
diff -u -p -u -r1.4 configure.ac
--- tests/depdemo/configure.ac 7 Nov 2003 16:25:57 -0000 1.4
+++ tests/depdemo/configure.ac 14 Nov 2003 11:11:38 -0000
@@ -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], address@hidden)
+AC_INIT([depdemo], [1.0], address@hidden)
AC_CONFIG_SRCDIR([main.c])
AC_CONFIG_AUX_DIR([../../config])
Index: tests/f77demo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/f77demo/configure.ac,v
retrieving revision 1.3
diff -u -p -u -r1.3 configure.ac
--- tests/f77demo/configure.ac 7 Nov 2003 16:25:57 -0000 1.3
+++ tests/f77demo/configure.ac 14 Nov 2003 11:11:38 -0000
@@ -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], address@hidden)
+AC_INIT([f77demo], [1.0], address@hidden)
AC_CONFIG_HEADERS([config.h:config-h.in])
AC_CONFIG_SRCDIR([foof.f])
AC_CONFIG_AUX_DIR([../../config])
Index: tests/mdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo/configure.ac,v
retrieving revision 1.4
diff -u -p -u -r1.4 configure.ac
--- tests/mdemo/configure.ac 7 Nov 2003 16:25:57 -0000 1.4
+++ tests/mdemo/configure.ac 14 Nov 2003 11:11:38 -0000
@@ -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], address@hidden)
+AC_INIT([mdemo], [1.0], address@hidden)
AC_CONFIG_SRCDIR([main.c])
AC_CONFIG_AUX_DIR([../../config])
Index: tests/mdemo2/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo2/configure.ac,v
retrieving revision 1.4
diff -u -p -u -r1.4 configure.ac
--- tests/mdemo2/configure.ac 7 Nov 2003 16:25:57 -0000 1.4
+++ tests/mdemo2/configure.ac 14 Nov 2003 11:11:38 -0000
@@ -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], address@hidden)
+AC_INIT([mdemo2], [1.0], address@hidden)
AC_CONFIG_SRCDIR([main.c])
AC_CONFIG_AUX_DIR([../../config])
Index: tests/pdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/pdemo/configure.ac,v
retrieving revision 1.4
diff -u -p -u -r1.4 configure.ac
--- tests/pdemo/configure.ac 7 Nov 2003 16:25:57 -0000 1.4
+++ tests/pdemo/configure.ac 14 Nov 2003 11:11:38 -0000
@@ -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], address@hidden)
+AC_INIT([pdemo], [1.0], address@hidden)
AC_CONFIG_SRCDIR([longer_file_name_hello.c])
AC_CONFIG_AUX_DIR([../../config])
Index: tests/tagdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/tagdemo/configure.ac,v
retrieving revision 1.3
diff -u -p -u -r1.3 configure.ac
--- tests/tagdemo/configure.ac 7 Nov 2003 16:25:57 -0000 1.3
+++ tests/tagdemo/configure.ac 14 Nov 2003 11:11:38 -0000
@@ -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], address@hidden)
+AC_INIT([tagdemo], [1.0], address@hidden)
AC_CONFIG_SRCDIR([foo.cpp])
AC_CONFIG_AUX_DIR([../../config])