fix for @PACKAGE_NAME@, @VERSION@, and @PACKAGE@

diff --git a/ChangeLog b/ChangeLog
index f455be79147e88300fab98c859f972aa52b4e53f..519961be62403d1fac31d6b3417a718cbb454240 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-10  Lars J. Aas  <larsa@sim.no>
+
+       * Makefile.am: AC_SUBST fixes for PACKAGE_NAME, VERSION, PACKAGE...
+       * configure.in: Moved here.
+       Suggested by Akim Demaille and Raja R Harinath.  
+
 2001-04-10  Lars J. Aas  <larsa@sim.no>
 
        * acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS):  Re-enable logging to

diff --git a/Makefile.am b/Makefile.am
index 57a976c68167a380b0cee2b489a326df83f2ef95..60a3d20a4e33ca5fbef06c4a383d398f707c7be9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,12 +30,6 @@ WGET = wget
 bin_SCRIPTS = autoconf autoheader autoreconf ifnames @PERLSCRIPTS@
 EXTRA_SCRIPTS = autoscan autoupdate
 
-# FIXME: Current Automakes are blind and cannot see inner AC_SUBST,
-# so help it.  This is because, in this case, 'aclocal' is bypassed.
-PACKAGE_NAME = @PACKAGE_NAME@
-VERSION = @VERSION@
-PACKAGE = @PACKAGE@
-
 # FIXME:
 # s/distpackageDATA/dist_pkgdata_DATA/
 # s/nodistpackageDATA/nodist_pkgdata_DATA/

diff --git a/configure.in b/configure.in
index a0b8de087fa6cff2ba2958a594361ceca9078b61..206c34570f96ce420090191a7c4e8ad1c8be6fc3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -43,6 +43,12 @@ if test -f $srcdir/standards.texi; then
   AC_SUBST(standards_texi, standards.texi)dnl
 fi
 
+# Automake can't see inner AC_SUBSTS (`aclocal' is bypassed), so we tag the
+# AC_SUBSTS here too.
+AC_SUBST(PACKAGE_NAME)
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+
 AC_OUTPUT(Makefile m4/Makefile man/Makefile doc/Makefile
           tests/Makefile tests/atconfig)