X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=autogen.sh;h=c8fcac7337037cbea70af4e2a2afd17e3ad00da7;hb=05e402934d2951885f72d62955a3e3dcc017d056;hp=a728b163bce5f1535fb7869c2fa095d712ccc3a1;hpb=5c5ccceefc0c5ad42702db8bb6c63ec9fe723458;p=supertux.git

diff --git a/autogen.sh b/autogen.sh
index a728b163b..c8fcac733 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,13 +1,30 @@
 #!/bin/sh
 
-# we need a minimum of automake 1.6 and automake 1.8 seems to be buggy
-# this doesn't seem to work well
-# 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
-libtoolize --force
-aclocal -I m4
-automake --copy --add-missing
+
+# generate Jamconfig.in
+cat > Jamconfig.in << __EOF__
+# the following unsets some stuff from Jambase
+CC = ;
+CFLAGS = ;
+LINK = ;
+LINKFLAGS = ;
+AR = ;
+# Configuration part (you can customize this)
+__EOF__
+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
+
 autoconf