[libmicrohttpd] branch master updated (7b2c73d1 -> ee8a044e)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 7b2c73d1 Fixed bootstrap with different gettext version on the build 
host
     new 899950e3 bootstrap: ensure that fallback path succeed
     new ee8a044e Updated .gitignore

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore | 3 +++
 bootstrap  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index b69acd61..14a1a2b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,8 @@ config.rpath
 /build-aux/mdate-sh
 /build-aux/test-driver
 /build-aux/config.guess
+/build-aux/compile
+/build-aux/missing
 /exclude
 /autom4te.cache
 /scripts
@@ -31,6 +33,7 @@ config.rpath
 /.project
 /config.guess
 /.cproject
+/.tgitconfig
 /configure
 /libtool
 /install-sh
diff --git a/bootstrap b/bootstrap
index 6f9e6c26..668c48b3 100755
--- a/bootstrap
+++ b/bootstrap
@@ -37,6 +37,7 @@ if existence libtool || existence libtoolize || existence 
glibtoolize || existen
         echo "Autotools failed, retrying with autoreconf..."
         if ! autoreconf -i ${1+"$@"} ; then
             echo "Failed to autoreconf, retrying with force install..."
+            rm m4/po.m4 # Version of po.m4 should match installed po/* files
             if ! autoreconf -i -f ${1+"$@"} ; then
                 echo "*** Failed to create 'configure' and other autotools 
generated files. ***" >&2
                 exit 1

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.