fix iconv signature problems

[supertux.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index acdf7e7..a0593e3 100755 (executable)
--- 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