From 42ecfd7bdca7788e96e790eb86cbf755cbcf9a9f Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Fri, 26 Mar 2010 08:10:11 +0100
Subject: [PATCH] Fixes to the autogen.sh script

- Proper formatting and indenting
- Tell aclocal that we use m4/ as macro directory and the final dist
  tarball actually contains the m4/ directory.
- Run intltoolize before aclocal, so aclocal does not append intltool.m4
  to aclocal.m4

Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
---
 autogen.sh | 54 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index bb2423f..092cfa8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
+ACLOCAL_FLAGS="-I m4"
+
 touch ChangeLog
 
 srcdir=`dirname $0`
@@ -32,11 +34,11 @@ DIE=0
 }
 
 (gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have gtk-doc installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-	DIE=1
+  echo
+  echo "You must have gtk-doc installed to compile $PROJECT."
+  echo "Install the appropriate package for your distribution,"
+  echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
+  DIE=1
 }
 
 (automake --version) < /dev/null > /dev/null 2>&1 || {
@@ -73,26 +75,32 @@ xlc )
   am_opt=--include-deps;;
 esac
 
-      aclocalinclude="$ACLOCAL_FLAGS"
+aclocalinclude="$ACLOCAL_FLAGS"
 
-      if grep "^LT_INIT" configure.ac >/dev/null; then
-	if test -z "$NO_LIBTOOLIZE" ; then 
-	  echo "Running libtoolize..."
-	  libtoolize --force --copy
-	fi
-      fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
-      if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
-      echo "Running automake --add-missing --gnu -Wno-portability $am_opt ..."
-      automake --add-missing --gnu -Wno-portability $am_opt
-      echo "Running autoconf ..."
-      autoconf
+if grep "^LT_INIT" configure.ac >/dev/null; then
+  if test -z "$NO_LIBTOOLIZE" ; then
+    echo "Running libtoolize..."
+    libtoolize --force --copy
+  fi
+fi
+
+echo "Running intltoolize ..."
+intltoolize --copy --force --automake
+
+echo "Running aclocal $aclocalinclude ..."
+aclocal $aclocalinclude
+
+if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
+  echo "Running autoheader..."
+  autoheader
+fi
+
+echo "Running automake --add-missing --gnu -Wno-portability $am_opt ..."
+automake --add-missing --gnu -Wno-portability $am_opt
+
+echo "Running autoconf ..."
+autoconf
 
-intltoolize --copy --force --automake                  || exit 1
 
 conf_flags="--enable-maintainer-mode --enable-gtk-doc"