-forgotten commit for 0.9.31 release

5 files changed, 114 insertions, 83 deletions

diff --git a/ChangeLog b/ChangeLog
index b0451903..21259faa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Sat Oct 19 16:40:32 CEST 2013
+        Releasing libmicrohttpd 0.9.31. -CG
+
 Mon Sep 23 20:24:48 CEST 2013
         Fixing build issues on OS X with CLOCK_MONOTONIC not being
         implemented on OS X. -CG
diff --git a/config.guess b/config.guess
index d622a44e..b79252d6 100644
--- a/config.guess
+++ b/config.guess
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2013-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@ timestamp='2012-02-10'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -54,9 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+        # If the system lacks a compiler, then just pick glibc.
+        # We could probably try harder.
+        LIBC=gnu
+
+        eval $set_cc_for_build
+        cat <<-EOF > $dummy.c
+        #include <features.h>
+        #if defined(__UCLIBC__)
+        LIBC=uclibc
+        #elif defined(__dietlibc__)
+        LIBC=dietlibc
+        #else
+        LIBC=gnu
+        #endif
+        EOF
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+        ;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
         echo "${machine}-${os}${release}"
         exit ;;
+    *:Bitrig:*:*)
+        UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+        echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+        exit ;;
     *:OpenBSD:*:*)
         UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
         echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
         echo arm-acorn-riscix${UNAME_RELEASE}
         exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
         echo arm-unknown-riscos
         exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -801,6 +820,9 @@ EOF
     i*:CYGWIN*:*)
         echo ${UNAME_MACHINE}-pc-cygwin
         exit ;;
+    *:MINGW64*:*)
+        echo ${UNAME_MACHINE}-pc-mingw64
+        exit ;;
     *:MINGW*:*)
         echo ${UNAME_MACHINE}-pc-mingw32
         exit ;;
@@ -852,21 +874,21 @@ EOF
         exit ;;
     *:GNU:*:*)
         # the GNU system
-        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
         exit ;;
     *:GNU/*:*:*)
         # other systems with GNU libc and userland
-        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
         exit ;;
     i*86:Minix:*:*)
         echo ${UNAME_MACHINE}-pc-minix
         exit ;;
     aarch64:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     aarch64_be:Linux:*:*)
         UNAME_MACHINE=aarch64_be
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     alpha:Linux:*:*)
         case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -879,59 +901,54 @@ EOF
           EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
         objdump --private-headers /bin/sh | grep -q ld.so.1
-        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+        if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     arm*:Linux:*:*)
         eval $set_cc_for_build
         if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
             | grep -q __ARM_EABI__
         then
-            echo ${UNAME_MACHINE}-unknown-linux-gnu
+            echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         else
             if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
                 | grep -q __ARM_PCS_VFP
             then
-                echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+                echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
             else
-                echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+                echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
             fi
         fi
         exit ;;
     avr32*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     cris:Linux:*:*)
-        echo ${UNAME_MACHINE}-axis-linux-gnu
+        echo ${UNAME_MACHINE}-axis-linux-${LIBC}
         exit ;;
     crisv32:Linux:*:*)
-        echo ${UNAME_MACHINE}-axis-linux-gnu
+        echo ${UNAME_MACHINE}-axis-linux-${LIBC}
         exit ;;
     frv:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     hexagon:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     i*86:Linux:*:*)
-        LIBC=gnu
-        eval $set_cc_for_build
-        sed 's/^        //' << EOF >$dummy.c
-        #ifdef __dietlibc__
-        LIBC=dietlibc
-        #endif
-EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-        echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+        echo ${UNAME_MACHINE}-pc-linux-${LIBC}
         exit ;;
     ia64:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     m32r*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     m68*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
         eval $set_cc_for_build
@@ -950,54 +967,63 @@ EOF
         #endif
 EOF
         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
         ;;
+    or1k:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
     or32:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     padre:Linux:*:*)
-        echo sparc-unknown-linux-gnu
+        echo sparc-unknown-linux-${LIBC}
         exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-        echo hppa64-unknown-linux-gnu
+        echo hppa64-unknown-linux-${LIBC}
         exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
         # Look for CPU level
         case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-          PA7*) echo hppa1.1-unknown-linux-gnu ;;
-          PA8*) echo hppa2.0-unknown-linux-gnu ;;
-          *)    echo hppa-unknown-linux-gnu ;;
+          PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+          PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+          *)    echo hppa-unknown-linux-${LIBC} ;;
         esac
         exit ;;
     ppc64:Linux:*:*)
-        echo powerpc64-unknown-linux-gnu
+        echo powerpc64-unknown-linux-${LIBC}
         exit ;;
     ppc:Linux:*:*)
-        echo powerpc-unknown-linux-gnu
+        echo powerpc-unknown-linux-${LIBC}
+        exit ;;
+    ppc64le:Linux:*:*)
+        echo powerpc64le-unknown-linux-${LIBC}
+        exit ;;
+    ppcle:Linux:*:*)
+        echo powerpcle-unknown-linux-${LIBC}
         exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-        echo ${UNAME_MACHINE}-ibm-linux
+        echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
         exit ;;
     sh64*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     sh*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     tile*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     vax:Linux:*:*)
-        echo ${UNAME_MACHINE}-dec-linux-gnu
+        echo ${UNAME_MACHINE}-dec-linux-${LIBC}
         exit ;;
     x86_64:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     xtensa*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     i*86:DYNIX/ptx:4*:*)
         # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1201,6 +1227,9 @@ EOF
     BePC:Haiku:*:*)     # Haiku running on Intel PC compatible.
         echo i586-pc-haiku
         exit ;;
+    x86_64:Haiku:*:*)
+        echo x86_64-unknown-haiku
+        exit ;;
     SX-4:SUPER-UX:*:*)
         echo sx4-nec-superux${UNAME_RELEASE}
         exit ;;
@@ -1227,19 +1256,21 @@ EOF
         exit ;;
     *:Darwin:*:*)
         UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-        case $UNAME_PROCESSOR in
-            i386)
-                eval $set_cc_for_build
-                if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-                  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-                      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-                      grep IS_64BIT_ARCH >/dev/null
-                  then
-                      UNAME_PROCESSOR="x86_64"
-                  fi
-                fi ;;
-            unknown) UNAME_PROCESSOR=powerpc ;;
-        esac
+        eval $set_cc_for_build
+        if test "$UNAME_PROCESSOR" = unknown ; then
+            UNAME_PROCESSOR=powerpc
+        fi
+        if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+            if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+                (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+                grep IS_64BIT_ARCH >/dev/null
+            then
+                case $UNAME_PROCESSOR in
+                    i386) UNAME_PROCESSOR=x86_64 ;;
+                    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+                esac
+            fi
+        fi
         echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
         exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1256,7 +1287,7 @@ EOF
     NEO-?:NONSTOP_KERNEL:*:*)
         echo neo-tandem-nsk${UNAME_RELEASE}
         exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
         echo nse-tandem-nsk${UNAME_RELEASE}
         exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1330,9 +1361,6 @@ EOF
         exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
diff --git a/configure.ac b/configure.ac
index 71bbabf8..f387b9e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,15 +21,15 @@
 #
 #
 AC_PREREQ(2.57)
-AC_INIT([libmicrohttpd], [0.9.30],[libmicrohttpd@gnu.org])
+AC_INIT([libmicrohttpd], [0.9.31],[libmicrohttpd@gnu.org])
 AM_INIT_AUTOMAKE([silent-rules])
 AC_CONFIG_HEADERS([MHD_config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AH_TOP([#define _GNU_SOURCE  1])
 
-LIB_VERSION_CURRENT=29
+LIB_VERSION_CURRENT=30
 LIB_VERSION_REVISION=0
-LIB_VERSION_AGE=19
+LIB_VERSION_AGE=20
 AC_SUBST(LIB_VERSION_CURRENT)
 AC_SUBST(LIB_VERSION_REVISION)
 AC_SUBST(LIB_VERSION_AGE)
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 3d3de5f8..c6828aa9 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -121,7 +121,7 @@ extern "C"
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00093002
+#define MHD_VERSION 0x00093100
 
 /**
  * MHD-internal return code for "YES".
diff --git a/src/testzzuf/Makefile.am b/src/testzzuf/Makefile.am
index 2b72f404..c2fc9dee 100644
--- a/src/testzzuf/Makefile.am
+++ b/src/testzzuf/Makefile.am
@@ -8,7 +8,7 @@ if USE_PRIVATE_PLIBC_H
  PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
 endif
 
-INCLUDES = $(PLIBC_INCLUDE) -I$(top_srcdir)/src/include
+AM_CPPFLAGS = $(PLIBC_INCLUDE) -I$(top_srcdir)/src/include
 
 EXTRA_DIST = README socat.c