aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Makefile.in35
-rwxr-xr-xautogen.sh3
-rw-r--r--configure.ac4
4 files changed, 21 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore
index afdd62cd..de8fed98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ TAGS
/config.log
/config.status
/configure
+/autom4te.cache
/doc/*.dip
/doc/*.hpj
/doc/*.pdf
diff --git a/Makefile.in b/Makefile.in
index 1913277f..4b4b91f4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -449,20 +449,22 @@ golden: nasm$(X)
cd test && $(RUNPERL) performtest.pl --golden --nasm=../nasm *.asm
#
-# Rules to re-run autoconf if necessary
+# Rules to run autoreconf if necessary
#
-config/config.h.in: configure.ac
- autoheader
-
-configure: configure.ac config/config.h.in
- autoconf
+configure: configure.ac aclocal.m4
+ autoreconf
-config.status: configure Makefile.in doc/Makefile.in config/config.h.in
+config.status: configure
+ @if [ ! -f config.status ]; then \
+ echo "*** ERROR: Need to run configure!" 1>&2 ; \
+ exit 1; \
+ fi
sh config.status --recheck
-Makefile: config.status
+Makefile: config.status Makefile.in doc/Makefile.in
+ sh config.status
-doc/Makefile: config.status
+doc/Makefile: Makefile
config/config.h: config.status
@@ -484,7 +486,6 @@ Makefile.dep: $(PERLREQ) tools/mkdep.pl config.status
dep: Makefile.dep
#
-#
# This build dependencies in *ALL* makefiles, and forces all
# dependencies to be inserted inline. For that reason, it should only
# be invoked manually or via "make dist". It should be run before
@@ -497,10 +498,9 @@ alldeps: $(PERLREQ) tools/syncfiles.pl tools/mkdep.pl
$(RM_F) *.dep
if [ -f config.status ]; then \
if [ $(EXTERNAL_DEPENDENCIES) -eq 1 ]; then \
- ./config.status --recheck; \
- else \
- ./config.status; \
- fi \
+ sh config.status --recheck; \
+ fi; \
+ sh config.status; \
fi
# Strip internal dependency information from all Makefiles; this makes
@@ -512,10 +512,9 @@ cleandeps: $(PERLREQ) qtools/syncfiles.pl tools/mkdep.pl
$(RM_F) *.dep
if [ -f config.status ]; then \
if [ $(EXTERNAL_DEPENDENCIES) -eq 0 ]; then \
- ./config.status --recheck; \
- else \
- ./config.status; \
- fi \
+ sh config.status --recheck; \
+ fi; \
+ sh config.status; \
fi
#-- Magic hints to mkdep.pl --#
diff --git a/autogen.sh b/autogen.sh
index d38e0ef7..5dbcbb5e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,8 +2,7 @@
#
# Simple script to run the appropriate autotools from a repository.
#
-autoheader
-autoconf
+autoreconf
rm -rf autom4te.cache config.log config.status
rm -f Makefile rdoff/Makefile doc/Makefile
rm -f config.h.in config.h config/config.h
diff --git a/configure.ac b/configure.ac
index 7268eaaf..8fb98ef8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
-dnl Process this file with autoconf 2.63 or later to produce
+dnl Process this file with autoconf 2.69 or later to produce
dnl a configure script.
-AC_PREREQ(2.63)
+AC_PREREQ(2.69)
AC_INIT(config/config.h.in)
AC_CONFIG_HEADERS(config/config.h)