aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2018-09-19 18:09:25 -0700
committerH. Peter Anvin <hpa@zytor.com>2018-09-19 18:09:25 -0700
commit51e90f82bbb41982d999fcbce8f5c334fdcf75a8 (patch)
tree758d511b31ac1d8e62955565010258c9280d2008
parent74566f900fd1e89fd8e0bdfcc42ff25c1033274d (diff)
downloadabc80sim-51e90f82bbb41982d999fcbce8f5c334fdcf75a8.tar.gz
abc80sim-51e90f82bbb41982d999fcbce8f5c334fdcf75a8.tar.xz
abc80sim-51e90f82bbb41982d999fcbce8f5c334fdcf75a8.zip
More changes to make the autoconf creation more automated
-rw-r--r--.gitignore5
-rwxr-xr-xautogen.sh7
-rw-r--r--configure.ac3
3 files changed, 8 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 3a21ae1..2cf8555 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,8 @@
abc*/
/roms/*.c
/autoconf/aclocal.m4
-/autoconf/compile
-/autoconf/config.*
-/autoconf/install-sh
+/autoconf/m4.old/
+/autoconf/aux/
/abc80
/config/config.h
/config/config.h.in
diff --git a/autogen.sh b/autogen.sh
index 2febb03..f629b46 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,10 +2,10 @@
#
# Run this script to regenerate autoconf files
#
-mkdir -p autoconf
+mkdir -p autoconf autoconf/aux
autolib="`automake --print-libdir`"
for prg in install-sh compile config.guess config.sub; do
- cp -u "$autolib"/"$prg" autoconf
+ cp -u "$autolib"/"$prg" autoconf/aux
done
rm -f autoconf/aclocal.m4
mkdir -p autoconf/m4.old autoconf/m4
@@ -15,5 +15,6 @@ export ACLOCAL_PATH
aclocal --install --output=autoconf/aclocal.m4 -I autoconf/m4
test -f autoconf/aclocal.m4
rm -rf autoconf/m4.old
-autoreconf -i -B autoconf
+autoheader -B autoconf
+autoconf -B autoconf
rm -rf autom4te.cache config.log config.status config/config.h Makefile
diff --git a/configure.ac b/configure.ac
index 8b0056b..8e6488f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,12 +2,13 @@ dnl Process this file with autoconf 2.69 or later to produce
dnl a configure script.
AC_PREREQ([2.69])
+AC_CONFIG_MACRO_DIR(autoconf)
AC_CONFIG_MACRO_DIRS(autoconf)
AC_INIT(abc80.c)
AC_CONFIG_HEADERS(config/config.h)
-AC_CONFIG_AUX_DIR(autoconf)
+AC_CONFIG_AUX_DIR(autoconf/aux)
dnl If we have wine installed, don't run it when checking for cross-compile
WINELOADER=/dev/null