mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-04-12 18:40:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

More autoconf modernizations; upgrade AC_PREREQ to 2.69

Browse Source 
Make further autoconf rule improvements and update the required
version of autoconf to 2.69.  That version is now 5+ years old and
although there might be older versions which have the prerequisite
macros they are known to have lots of bugs, and we can't really test
them.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
H. Peter Anvin 2017-11-08 10:22:10 -08:00
parent ceeaf11e66
commit cae5d06184
4 changed files with 21 additions and 22 deletions

1
.gitignore vendored

@ -51,6 +51,7 @@ TAGS
/config.log
/config.status
/configure
/autom4te.cache
/doc/*.dip
/doc/*.hpj
/doc/*.pdf

35
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 aclocal.m4
autoreconf
configure: configure.ac config/config.h.in
autoconf
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
@ -483,7 +485,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
@ -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 --#

3
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

4
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)