phase 2

autogen.sh

@@ -35,50 +35,11 @@ if expr "$confver" \> "$gettext_version" >/dev/null; then
   exit 1
 fi
 
-# Force intl regenration to get last update from installed gettext templates
-rm -rf intl/*
-#if [ ! -d intl ]; then
-    echo "Setting up internationalization files."
-    autopoint --force
-    if grep -q datarootdir po/Makefile.in.in; then
-        echo autopoint honors dataroot variable, not patching.
-    else
-	echo autopoint does not honor dataroot variable, patching.
-        sed -e '/^datadir *=/a\
-datarootdir = @datarootdir@' po/Makefile.in.in > po/Makefile.in.in.tmp && mv -f po/Makefile.in.in.tmp po/Makefile.in.in
-        sed -e '/^datadir *=/a\
-datarootdir = @datarootdir@' intl/Makefile.in > intl/Makefile.in.tmp && mv -f intl/Makefile.in.tmp intl/Makefile.in
-    fi
-UNAME=`uname`
-if [ x$UNAME = x"Darwin" ]; then
-    echo Not patching po/Makefile.in.in - sed is too old.
-else
-    sed -e '/^clean:/a\
-	rm -f *.gmo' po/Makefile.in.in > po/Makefile.in.in.tmp && mv -f po/Makefile.in.in.tmp po/Makefile.in.in
-fi
-#    if [ -f Makefile -a -x config.status ]; then
-#        CONFIG_FILES=intl/Makefile CONFIG_HEADERS= /bin/sh ./config.status
-#    fi
-#   gettextize --intl -f --no-changelog
-#   echo "restoring Makefile.am and configure.ac"
-#   cp -f Makefile.am~ Makefile.am
-#   cp -f configure.ac~ configure.ac
-#fi
-
-echo "Running aclocal -I m4"
-aclocal -I m4
-
-echo "Running autoheader"
-autoheader
-
-echo "Running autoconf"
-autoconf
-
 echo "Creating pixmaps Makefile.am"
 OLDPWD="`pwd`"
 cd src/pixmaps/flags_xpm
 ./makeflags.sh
 cd "$OLDPWD"
 
-echo "Running automake --foreign -a -c -f"
-automake --foreign -a -c -f
+echo "Running autoreconf --install"
+autoreconf --install

configure.ac

@@ -25,14 +25,14 @@
 #
 
 AC_INIT([aMule],[SVN],[[email protected]])
-AM_INIT_AUTOMAKE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
-
 AC_PREREQ(2.59)
 
 AC_CONFIG_SRCDIR([src/amule.cpp])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([config])
+AM_INIT_AUTOMAKE([subdir-objects foreign])
 AM_MAINTAINER_MODE
 
 dnl Check host system.
@@ -329,8 +329,7 @@ dnl Use the C compiler for the gettext library checks
 AC_LANG_POP([C++])
 # Checking Native Language Support
 dnl Sets gettext version.
-dnl AM_GNU_GETTEXT_VERSION *must not* be moved away from configure.ac!
-AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT_VERSION(0.12.1)
 MULE_CHECK_NLS
 AC_LANG_PUSH([C++])