X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=autogen.sh;h=acdf7e7dc52118ccc22a6271e7a63d31527b7d4a;hb=3f1a54cc4a2b8deb8ebb31061a00ffcec5fb3169;hp=2adc1a99afe211a55d064c9dbb892665e84cce5f;hpb=5d2aa42fd02878ec217f2a2eff90d36da7368611;p=supertux.git

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