From e63ec01089a53facfe55e33e8dd90ff7f853eb38 Mon Sep 17 00:00:00 2001
From: hasufell <julian.ospald@googlemail.com>
Date: Fri, 12 Jul 2013 14:10:51 +0200
Subject: [PATCH] MAKE: backwards compat for old libtool

---
 Makefile.am  | 2 ++
 autogen.sh   | 4 ++--
 configure.ac | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 073fd4b2..41e95375 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = po intl src plugins man share
 
 EXTRA_DIST = autogen.sh
diff --git a/autogen.sh b/autogen.sh
index 7a640a56..607aa949 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -78,7 +78,7 @@ if test "$?" != "0"; then
 	exit 2
 fi
 echo running libtoolize...
-libtoolize --force
+libtoolize --copy --force --install
 if test "$?" != "0"; then
 	echo libtoolize failed, stopping.
 	exit 3
@@ -90,7 +90,7 @@ if test "$?" != "0"; then
 	exit 4
 fi
 echo running $AUTOMAKE...
-$AUTOMAKE -a
+$AUTOMAKE -a -c
 if test "$?" != "0"; then
 	echo automake failed, stopping.
 	exit 5
diff --git a/configure.ac b/configure.ac
index d4acd0aa..6af91d77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,8 +8,9 @@ AC_COPYRIGHT([Copyright (C) 1998-2010 Peter Zelezny])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
 
-AM_INIT_AUTOMAKE([1.11 dist-bzip2 subdir-objects no-define foreign])
+AC_CONFIG_MACRO_DIR([m4])
 
+AM_INIT_AUTOMAKE([1.11 dist-bzip2 subdir-objects no-define foreign])
 AM_SILENT_RULES([yes])
 
 AC_USE_SYSTEM_EXTENSIONS