X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=autogen.sh;h=c8fcac7337037cbea70af4e2a2afd17e3ad00da7;hb=755614aa400200e18bb646e8a56452eeeb6d0d33;hp=c433b4205c1a60d785772f7fb44d274d53abc1d4;hpb=6fe1f3519eecbbb75eca97c45a6697eee36b2442;p=supertux.git

diff --git a/autogen.sh b/autogen.sh
index c433b4205..c8fcac733 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,22 +6,25 @@ if test ! -f configure.ac ; then
   exit 1
 fi
 
+aclocal -I mk/autoconf
+autoheader
+
 # 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' \
-  > Jamconfig.in
-sed -e 's/.*BACKSLASH.*//' -i Jamconfig.in
+  | sed -e 's/.*BACKSLASH.*//' \
+  >> 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 well
-# see AUTOMAKE_OPTIONS in Makefile.am
-export WANT_AUTOMAKE=1.6
-
-autoheader
-libtoolize --force
-aclocal -I mk/autoconf
-automake --copy --add-missing
 autoconf