X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=autogen.sh;h=8241d5aeaa60e0e12b2beb623b4aa2ad6eeb9903;hb=8b9d7f0cc609407654e1c71283da3b3aaf255027;hp=2adc1a99afe211a55d064c9dbb892665e84cce5f;hpb=5d2aa42fd02878ec217f2a2eff90d36da7368611;p=supertux.git

diff --git a/autogen.sh b/autogen.sh
index 2adc1a99a..8241d5aea 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,12 +1,21 @@
 #!/bin/sh
 
-# we need a minimum of automake 1.6 and automake 1.8 seems to be buggy
-# this doesn't seem to work, commented out
-# see AUTOMAKE_OPTIONS in Makefile.am
-# export WANT_AUTOMAKE=1.6
+# Correct working directory?
+if test ! -f configure.ac ; then
+  echo "*** Please invoke this script from directory containing configure.ac."
+  exit 1
+fi
+
+aclocal -I mk/autoconf
+autoheader
+
+# generate Jamconfig.in
+autoconf --trace=AC_SUBST \
+  | sed -e 's/configure.ac:[0-9]*:AC_SUBST:\([^:]*\).*/\1 ?= "@\1@" ;/g' \
+  | sed -e 's/.*BACKSLASH.*//' \
+  > Jamconfig.in
+echo 'INSTALL ?= "@INSTALL@" ;' >> Jamconfig.in
+echo 'JAMCONFIG_READ = yes ;' >> Jamconfig.in
 
-aclocal -I m4
-automake --copy --add-missing
 autoconf
 
-# EOF #