X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=autogen.sh;h=a0593e3c1dc4352a929e8799d44d8463bb1c1721;hb=36266bca23c8ef1a4b036572b7c5fa07df7a1afd;hp=acdf7e7dc52118ccc22a6271e7a63d31527b7d4a;hpb=6c3a5307b87bc3fff19e819281cf2b87a2b5010b;p=supertux.git

diff --git a/autogen.sh b/autogen.sh
index acdf7e7dc..a0593e3c1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,23 +6,17 @@ if test ! -f configure.ac ; then
   exit 1
 fi
 
-autoheader
-libtoolize --force
 aclocal -I mk/autoconf
+autoheader
 
 # 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
+sed -e 's/.*BACKSLASH.*//' -i~ Jamconfig.in
+rm 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