diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2002-01-12 18:48:53 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2002-01-12 18:48:53 +0000 |
| commit | 7689032c17edd4dfcc486e19b0f976bb810746ec (patch) | |
| tree | 085dc8a24f87af0d10aa92e963084fbf1a1b5bd0 | |
| parent | e375e1f2529d02f5585c55436d236613ef999094 (diff) | |
| download | automake-7689032c17edd4dfcc486e19b0f976bb810746ec.tar.gz | |
* m4/init.m4 (AM_INIT_AUTOMAKE): Set PACKAGE and VERSION from
AM_INIT_AUTOMAKE arguments when using the old-style call.
Use AC_PACKAGE_TARNAME and AC_PACKAGE_VERSION in the new form only.
Suggested by Pavel Roskin.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | aclocal.m4 | 15 | ||||
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | m4/init.m4 | 15 |
4 files changed, 25 insertions, 19 deletions
@@ -1,5 +1,12 @@ 2002-01-12 Alexandre Duret-Lutz <duret_g@epita.fr> + * m4/init.m4 (AM_INIT_AUTOMAKE): Set PACKAGE and VERSION from + AM_INIT_AUTOMAKE arguments when using the old-style call. + Use AC_PACKAGE_TARNAME and AC_PACKAGE_VERSION in the new form only. + Suggested by Pavel Roskin. + +2002-01-12 Alexandre Duret-Lutz <duret_g@epita.fr> + * test/nodefine.test, test/nodefine2.test: Check that no-define works, not the contrary... * m4/options.m4 (_AM_IF_OPTIONS): Use m4_ifset. diff --git a/aclocal.m4 b/aclocal.m4 index d19358ead..a32dde047 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -69,16 +69,15 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi +# Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], - [m4_ifval([$3], [_AM_SET_OPTION([no-define])])], - [_AM_SET_OPTIONS([$1])])dnl - -# Define the identity of the package. -AC_SUBST([PACKAGE], -[m4_ifset([AC_PACKAGE_TARNAME], [AC_PACKAGE_TARNAME], [$1])])dnl -AC_SUBST([VERSION], -[m4_ifset([AC_PACKAGE_VERSION], [AC_PACKAGE_VERSION], [$2])])dnl + [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], + [_AM_SET_OPTIONS([$1]) + AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME]) + AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl _AM_IF_OPTION([no-define],, [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) @@ -1419,10 +1419,11 @@ echo "$as_me: error: source directory already configured; run \"make distclean\" { (exit 1); exit 1; }; } fi - # Define the identity of the package. -PACKAGE=automake -VERSION=1.5c + + PACKAGE=automake + + VERSION=1.5c cat >>confdefs.h <<_ACEOF diff --git a/m4/init.m4 b/m4/init.m4 index 32fbf7d67..2fe1a5b9f 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -56,16 +56,15 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi +# Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], - [m4_ifval([$3], [_AM_SET_OPTION([no-define])])], - [_AM_SET_OPTIONS([$1])])dnl - -# Define the identity of the package. -AC_SUBST([PACKAGE], -[m4_ifset([AC_PACKAGE_TARNAME], [AC_PACKAGE_TARNAME], [$1])])dnl -AC_SUBST([VERSION], -[m4_ifset([AC_PACKAGE_VERSION], [AC_PACKAGE_VERSION], [$2])])dnl +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl + AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl _AM_IF_OPTION([no-define],, [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) |