summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2003-01-20 14:15:41 +0000
committerBruno Haible <bruno@clisp.org>2003-01-20 14:15:41 +0000
commit6bc6a5c4e024759bdf7cbeb0f32c0300942e7c16 (patch)
tree307141cdc458401632348d98692c36c9ad4f9a03
parent6eb5640c0d4cf56efa588ff43ff193979b98be39 (diff)
downloadgperf-6bc6a5c4e024759bdf7cbeb0f32c0300942e7c16.tar.gz
Use autoconf-2.52.
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.devel10
-rw-r--r--configure.in7
3 files changed, 18 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index aeb2468..ae6c7e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-10 Bruno Haible <bruno@clisp.org>
+
+ Upgrade to autoconf-2.52.
+ * configure.in: Use AC_CONFIG_SUBDIRS instead of AC_OUTPUT_SUBDIRS.
+ * Makefile.devel (configure, lib/configure, src/configure,
+ tests/configure, doc/configure): Use autoconf-2.52.
+
2002-11-09 Bruno Haible <bruno@clisp.org>
* doc/gperf.texi: Talk about "bytes" instead of "characters". Talk
diff --git a/Makefile.devel b/Makefile.devel
index cd6b628..7e920ee 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -11,19 +11,19 @@ CONFIGURES = configure lib/configure src/configure tests/configure doc/configure
configures : $(CONFIGURES)
configure : configure.in aclocal.m4
- autoconf -l .
+ autoconf-2.52 -l .
lib/configure : lib/configure.in aclocal.m4
- cd lib && autoconf -l ..
+ cd lib && autoconf-2.52 -l ..
src/configure : src/configure.in aclocal.m4
- cd src && autoconf -l ..
+ cd src && autoconf-2.52 -l ..
tests/configure : tests/configure.in aclocal.m4
- cd tests && autoconf -l ..
+ cd tests && autoconf-2.52 -l ..
doc/configure : doc/configure.in aclocal.m4
- cd doc && autoconf -l ..
+ cd doc && autoconf-2.52 -l ..
check-configures : $(CONFIGURES)
set -e; for f in $(CONFIGURES); do bash -x -n $$f; done
diff --git a/configure.in b/configure.in
index 2bb2f5b..a6dbc05 100644
--- a/configure.in
+++ b/configure.in
@@ -23,6 +23,12 @@ dnl 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
AC_INIT(doc/gperf.1)
AC_PROG_MAKE_SET
+
+dnl An autoconf-2.52 bug: AC_CONFIG_SUBDIRS requires AC_CONFIG_AUX_DIR_DEFAULT.
+ac_aux_dir=$srcdir
+AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT])
+AC_CONFIG_SUBDIRS(lib src tests doc)
+
dnl This piece of sed script replaces every line containing '@subdir@'
dnl by several consecutive lines, each referencing one subdir.
extrasub="$extrasub"'
@@ -44,4 +50,3 @@ d
}
'
AC_OUTPUT(Makefile)
-AC_OUTPUT_SUBDIRS(lib src tests doc)