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

diff --git a/autogen.sh b/autogen.sh
index c433b4205..f2d07d81e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,22 +6,17 @@ if test ! -f configure.ac ; then
   exit 1
 fi
 
+autoheader
+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
+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
-
-autoheader
-libtoolize --force
-aclocal -I mk/autoconf
-automake --copy --add-missing
 autoconf