X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=autogen.sh;h=c8fcac7337037cbea70af4e2a2afd17e3ad00da7;hb=112f01454123c94f5627200c6819b219026f0af0;hp=acdf7e7dc52118ccc22a6271e7a63d31527b7d4a;hpb=6c3a5307b87bc3fff19e819281cf2b87a2b5010b;p=supertux.git

diff --git a/autogen.sh b/autogen.sh
index acdf7e7dc..c8fcac733 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,23 +6,25 @@ if test ! -f configure.ac ; then
   exit 1
 fi
 
-autoheader
-libtoolize --force
 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
-
-automake --copy --add-missing
 autoconf