From 6f77ed4e952aef96846321a015d95857c38a7f39 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sat, 21 Jun 2008 22:00:57 +0100
Subject: Partially revert fa7f53fb1656, which introduced some libtool-related
 problems. With libtool 1.5, AC_LIBTOOL_SETUP was being called too early.

---
 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 78e473b84..498f5d056 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,10 +154,11 @@ dnl ---------------------------------------------
 dnl Libtool
 dnl ---------------------------------------------
 
-AC_PROG_LIBTOOL
 AC_LIBTOOL_DLOPEN
 AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+AC_PROG_LIBTOOL_SANITYCHECK
 AC_SUBST(LIBTOOL_DEPS)
 if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then
   STATIC="-static"
-- 
cgit v1.2.3


From 20b58284bd5ebba2b3e36ef2bde9a2c53903efbc Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sat, 21 Jun 2008 22:16:25 +0100
Subject: Run autopoint before running aclocal (on a clean tree) else automake
 will fail.

---
 autogen.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/autogen.sh b/autogen.sh
index cb8c637d2..13e663510 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -227,6 +227,11 @@ run_aclocal () {
     echo
   fi
   
+  echo $_echo_n " + Running autopoint: $_echo_c"
+  
+  autopoint
+  echo "done." 
+
   echo $_echo_n " + Running aclocal: $_echo_c"
 
   aclocal -I m4
-- 
cgit v1.2.3