From f1d2bf84089b1e5b5988a5e5d6d571a507a52337 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 Aug 2008 18:54:13 +0200
Subject: add i18n support

---
 bootstrap.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'bootstrap.sh')

diff --git a/bootstrap.sh b/bootstrap.sh
index ceea55b7..6f060c85 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -23,12 +23,12 @@ run_versioned() {
     local V
 
     V=$(echo "$2" | sed -e 's,\.,,g')
-    
+
     if [ -e "`which $1$V 2> /dev/null`" ] ; then
-    	P="$1$V" 
+        P="$1$V"
     else
 	if [ -e "`which $1-$2 2> /dev/null`" ] ; then
-	    P="$1-$2" 
+	    P="$1-$2"
 	else
 	    P="$1"
 	fi
@@ -43,21 +43,28 @@ set -ex
 if [ "x$1" = "xam" ] ; then
     run_versioned automake "$VERSION" -a -c --foreign
     ./config.status
-else 
+else
     rm -rf autom4te.cache
     rm -f config.cache
 
+    rm -f Makefile.am~ configure.ac~
+    # Evil, evil, evil, evil hack
+    sed 's/read dummy/\#/' `which gettextize` | sh -s -- --copy --force
+    test -f Makefile.am~ && mv Makefile.am~ Makefile.am
+    test -f configure.ac~ && mv configure.ac~ configure.ac
+
     touch config.rpath
     test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
 
+    intltoolize --copy --force --automake
     "$LIBTOOLIZE" -c --force --ltdl
-    run_versioned aclocal "$VERSION"
+    run_versioned aclocal "$VERSION" -I common
     run_versioned autoconf 2.59 -Wall
     run_versioned autoheader 2.59
     run_versioned automake "$VERSION" --copy --foreign --add-missing
 
     if test "x$NOCONFIGURE" = "x"; then
-        CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@" 
+        CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@"
         make clean
     fi
 fi
-- 
cgit 


From f46ae106a54f1f84651b45561f6fa01a825e8b30 Mon Sep 17 00:00:00 2001
From: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Fri, 8 Aug 2008 12:18:53 +0200
Subject: Create an m4 directory for common macros and use it.

Split acinclude.m4 in multiple macro files.

Let it be known to autoconf and aclocal to use the m4 directory.
Ignore macro files copied or linked by libtool and intltool.
---
 bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bootstrap.sh')

diff --git a/bootstrap.sh b/bootstrap.sh
index 6f060c85..e5f1ac59 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -58,7 +58,7 @@ else
 
     intltoolize --copy --force --automake
     "$LIBTOOLIZE" -c --force --ltdl
-    run_versioned aclocal "$VERSION" -I common
+    run_versioned aclocal "$VERSION" -I m4
     run_versioned autoconf 2.59 -Wall
     run_versioned autoheader 2.59
     run_versioned automake "$VERSION" --copy --foreign --add-missing
-- 
cgit 


From 70f4a8516ad4f98ab175b592e17bb548742bb219 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 19 Aug 2008 00:02:01 +0200
Subject: require ac 2.62 in bootstrap.sh

---
 bootstrap.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bootstrap.sh')

diff --git a/bootstrap.sh b/bootstrap.sh
index e5f1ac59..5dfcdf20 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -59,8 +59,8 @@ else
     intltoolize --copy --force --automake
     "$LIBTOOLIZE" -c --force --ltdl
     run_versioned aclocal "$VERSION" -I m4
-    run_versioned autoconf 2.59 -Wall
-    run_versioned autoheader 2.59
+    run_versioned autoconf 2.62 -Wall
+    run_versioned autoheader 2.62
     run_versioned automake "$VERSION" --copy --foreign --add-missing
 
     if test "x$NOCONFIGURE" = "x"; then
-- 
cgit