build: fixed builddir != srcdir situations

Started to updating the build system in order to get rid of intltool

Makefile.am

@@ -1,5 +1,3 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
 SUBDIRS = src data po
 DIST_SUBDIRS = src data po
 

autogen.sh

@@ -2,8 +2,15 @@
 # Run this to generate all the initial makefiles, etc.
 set -e
 
-autoreconf -i -f
+srcdir=`dirname $0`
-intltoolize --force --copy --automake
+test -z "$srcdir" && srcdir=.
+
+olddir=`pwd`
+cd $srcdir
+
+mkdir -p m4
+autoreconf --verbose --force --install || exit $?
+intltoolize --force --copy --automake || exit $?
 
 if test -z "$NOCONFIGURE"; then
     run_configure=true
@@ -20,6 +27,5 @@ else
     run_configure=false
 fi
 
-if test $run_configure = true; then
+cd "$olddir"
-    ./configure "$@"
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
-fi

configure.ac

@@ -9,8 +9,8 @@ AC_CONFIG_AUX_DIR([build-aux])
 
 AM_SILENT_RULES([yes])
 
-# require automake 1.11.1
+# require automake 1.13
-AM_INIT_AUTOMAKE([1.11.1 dist-xz no-dist-gzip tar-ustar])
+AM_INIT_AUTOMAKE([1.13 dist-xz no-dist-gzip tar-ustar])
 AM_MAINTAINER_MODE([enable])
 
 dnl ***************************************************************************