From 241cf3c8f22adf5ed6f3a020dda4ef337efdc209 Mon Sep 17 00:00:00 2001
From: Konrad Rosenbaum <konrad@silmor.de>
Date: Fri, 2 Aug 2013 21:59:00 +0200
Subject: [PATCH] fix build of gpg for newer autotools

---
 aurora/autogen.diff |   13 +++++++++++++
 aurora/build-gpg.sh |   14 ++++++++++++++
 2 files changed, 27 insertions(+), 0 deletions(-)
 create mode 100644 aurora/autogen.diff

diff --git a/aurora/autogen.diff b/aurora/autogen.diff
new file mode 100644
index 0000000..b77d384
--- /dev/null
+++ b/aurora/autogen.diff
@@ -0,0 +1,13 @@
+diff --git a/autogen.sh b/autogen.sh
+index 8256fd2..7cd9383 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -276,7 +276,7 @@ $ACLOCAL -I m4 $ACLOCAL_FLAGS
+ echo "Running autoheader..."
+ $AUTOHEADER
+ echo "Running automake --gnu ..."
+-$AUTOMAKE --gnu;
++$AUTOMAKE --add-missing --gnu;
+ echo "Running autoconf${FORCE} ..."
+ $AUTOCONF${FORCE}
+ 
diff --git a/aurora/build-gpg.sh b/aurora/build-gpg.sh
index 961af6b..4ff1698 100755
--- a/aurora/build-gpg.sh
+++ b/aurora/build-gpg.sh
@@ -5,6 +5,17 @@ fmake(){
         echo -e 'all:\n\techo ok\n\n%:\n\techo ok $@\n\n' >./$1/Makefile
 }
 
+Autocorrect(){
+        echo Patching autogen.sh ...
+        patch -N -f -p1 <../autogen.diff || true
+}
+
+test -f /proc/cpuinfo__ && {
+  CPUS=$(expr $(grep ^processor </proc/cpuinfo |tail -1 |cut -d : -f 2) + 2)
+  export MAKEFLAGS="-j $CPUS"
+  echo Using $CPUS CPUs for Make.
+}
+
 echo Cleaning up old binaries
 rm -rf gpg
 
@@ -26,6 +37,7 @@ echo
 echo Building libgpg-error
 git clean -dfx
 git reset --hard
+Autocorrect
 ./autogen.sh
 ./configure --disable-static --enable-shared --disable-nls --disable-rpath --disable-languages --without-libiconv-prefix --without-libintl-prefix --prefix=`pwd`/../gpg
 fmake doc
@@ -38,6 +50,7 @@ echo
 echo Building libassuan
 git clean -dfx
 git reset --hard
+Autocorrect
 ./autogen.sh
 ./configure --disable-static --enable-shared --with-libgpg-error-prefix=`pwd`/../gpg --prefix=`pwd`/../gpg
 fmake doc
@@ -49,6 +62,7 @@ echo
 echo Building GPGME
 git clean -dfx
 git reset --hard
+Autocorrect
 ./autogen.sh
 ./configure --disable-static --enable-shared --disable-glibtest --disable-gpgsm-test --disable-gpgconf-test --disable-g13-test --with-gpg=`pwd`/../gpg/bin/gpg --prefix=`pwd`/../gpg --with-libassuan-prefix=`pwd`/../gpg --with-libgpg-error-prefix=`pwd`/../gpg
 fmake doc
-- 
1.7.2.5