[GNUnet-SVN] [libmicrohttpd] branch master updated (d0e81c8e -> 2276ff10)

[gnunet]

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

grothoff pushed a change to branch master
in repository libmicrohttpd.

    from d0e81c8e Updated README and COPYING Note: library code is licensed 
under LGPLv2.1+ or eCOS terms/ Come testsuite programs are licensed under GPLv3 
terms.
     new 8588d6da use AS_CASE/AS_IF
     new 6ef94cf4 use AS_CASE/AS_IF
     new 09e1f568 use AS_CASE/AS_IF
     new 2276ff10 use AS_CASE/AS_IF

The 4 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:
 configure.ac | 189 ++++++++++++++++++++++++++---------------------------------
 1 file changed, 83 insertions(+), 106 deletions(-)

diff --git a/configure.ac b/configure.ac
index c977f746..eabfb0c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -267,95 +267,82 @@ CFLAGS="$save_CFLAGS"
 # Check system type
 shutdown_trig_select='no'
 AC_MSG_CHECKING([[for target host OS]])
-case "$host_os" in
-*darwin* | *rhapsody* | *macosx*)
-     AC_DEFINE_UNQUOTED(OSX,1,[This is an OS X system])
+AS_CASE(["$host_os"],
+ [*darwin* | *rhapsody* | *macosx*],
+ [AC_DEFINE_UNQUOTED(OSX,1,[This is an OS X system])
      CFLAGS="-no-cpp-precomp -fno-common $CFLAGS"
      mhd_host_os='Darwin'
-     AC_MSG_RESULT([[$mhd_host_os]])
-     ;;
-freebsd*)
-     AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
+     AC_MSG_RESULT([[$mhd_host_os]])],
+ [freebsd*],
+ [AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
      AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system])
      mhd_host_os='FreeBSD'
-     AC_MSG_RESULT([[$mhd_host_os]])
-     ;;
-openbsd*)
-     AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
+     AC_MSG_RESULT([[$mhd_host_os]])],
+ [openbsd*],
+ [AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
      AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system])
      mhd_host_os='OpenBSD'
-     AC_MSG_RESULT([[$mhd_host_os]])
-     ;;
-netbsd*)
-     AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
+     AC_MSG_RESULT([[$mhd_host_os]])],
+ [netbsd*],
+ [AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
      AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system])
      mhd_host_os='NetBSD'
-     AC_MSG_RESULT([[$mhd_host_os]])
-     ;;
-*solaris*)
-     AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system])
+     AC_MSG_RESULT([[$mhd_host_os]])],
+ [*solaris*],
+ [AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system])
      AC_DEFINE_UNQUOTED(_REENTRANT,1,[Need with solaris or errno doesnt work])
      mhd_host_os='Solaris'
      AC_MSG_RESULT([[$mhd_host_os]])
      AC_SEARCH_LIBS(gethostbyname, nsl)
-     AC_SEARCH_LIBS(socket, socket)
-     ;;
-*arm-linux*)
-     AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux kernel])
+     AC_SEARCH_LIBS(socket, socket)],
+  [*arm-linux*],
+  [AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux kernel])
      mhd_host_os='ARM Linux'
      AC_MSG_RESULT([[$mhd_host_os]])
-     CFLAGS="-fPIC -pipe $CFLAGS"
-     ;;
-*linux*)
-     AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux kernel])
+     CFLAGS="-fPIC -pipe $CFLAGS"],
+  [*linux*],
+  [AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux kernel])
      mhd_host_os='Linux'
-     AC_MSG_RESULT([[$mhd_host_os]])
-     ;;
-*cygwin*)
-     AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
+     AC_MSG_RESULT([[$mhd_host_os]])],
+  [*cygwin*],
+  [AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
      mhd_host_os='Windows (Cygwin)'
      AC_MSG_RESULT([[$mhd_host_os]])
-     os_is_windows=yes
-     ;;
-*mingw*)
-     AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
+     os_is_windows=yes],
+  [*mingw*],
+  [AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
      AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
      mhd_host_os='Windows (MinGW)'
      AC_MSG_RESULT([[$mhd_host_os]])
      LIBS="$LIBS -lws2_32"
      AC_CHECK_HEADERS([winsock2.h ws2tcpip.h], [], [AC_MSG_ERROR([[Winsock2 
headers are required for W32]])], [AC_INCLUDES_DEFAULT])
      AC_CACHE_CHECK([for MS lib utility], [ac_cv_use_ms_lib_tool],
-       [[mslibcheck=`lib 2>&1`
-        if [[ $mslibcheck = "Microsoft (R) Library Manager"* ]]; then
-          ac_cv_use_ms_lib_tool=yes
-        else
-          ac_cv_use_ms_lib_tool=no
-        fi
-         ]])
-     if test "x$ac_cv_use_ms_lib_tool" = "xyes"; then
-       AC_SUBST([MS_LIB_TOOL], [[lib]])
-     fi
+       [mslibcheck=`lib 2>&1`
+        AS_IF([test $mslibcheck = "Microsoft (R) Library Manager"*],
+          [ac_cv_use_ms_lib_tool=yes],
+          [ac_cv_use_ms_lib_tool=no])
+         ])
+     AS_IF([test "x$ac_cv_use_ms_lib_tool" = "xyes"],
+       [AC_SUBST([MS_LIB_TOOL], [[lib]])])
      AC_SUBST([lt_cv_objdir])
      os_is_windows=yes
      os_is_native_w32=yes
-     ;;
-*openedition*)
-     AC_DEFINE_UNQUOTED(OS390,1,[This is a OS/390 system])
+   ],
+   [*openedition*],
+   [AC_DEFINE_UNQUOTED(OS390,1,[This is a OS/390 system])
      mhd_host_os='OS/390'
-     AC_MSG_RESULT([[$mhd_host_os]])
-    ;;
-gnu*)
-     AC_DEFINE([[GNU_HURD]], [[1]], [Define to `1' if host machine runs on GNU 
Hurd.])
+     AC_MSG_RESULT([[$mhd_host_os]])],
+   [gnu*],
+   [AC_DEFINE([[GNU_HURD]], [[1]], [Define to `1' if host machine runs on GNU 
Hurd.])
      mhd_host_os='GNU Hurd'
      AC_MSG_RESULT([[$mhd_host_os]])
-    ;;
-*)
+    ],
+    [
      mhd_host_os='unrecognised OS'
      AC_MSG_RESULT([[$mhd_host_os]])
      AC_MSG_WARN([Unrecognised OS $host_os])
      AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS])
-;;
-esac
+ ])
 
 AM_CONDITIONAL([CYGWIN_TARGET], [[test "x$os_is_windows" = "xyes" && \
                                   test "x${os_is_native_w32}" != "xyes"]])
@@ -1197,22 +1184,20 @@ have_inet6=no
 AC_MSG_RESULT($have_inet6)
 
 HIDDEN_VISIBILITY_CFLAGS=""
-case "$host" in
-  *-*-mingw*)
+AS_CASE(["$host"],
+  [*-*-mingw*],[
     dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport)
     AC_DEFINE([_MHD_EXTERN], [__attribute__((visibility("default"))) 
__declspec(dllexport) extern],
               [defines how to decorate public symbols while building])
     HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden"
-    ;;
-  *)
+  ],[
     dnl on other compilers, check if we can do -fvisibility=hidden
     AX_CHECK_LINK_FLAG([-fvisibility=hidden],
       [AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],
                            [AC_DEFINE([_MHD_EXTERN], 
[__attribute__((visibility("default"))) extern],
                                        [defines how to decorate public symbols 
while building])
                             HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden"])])
-    ;;
-esac
+   ])
 AC_SUBST(HIDDEN_VISIBILITY_CFLAGS)
 
 # libcurl (required for testing)
@@ -1220,24 +1205,22 @@ AC_ARG_ENABLE([curl],
   [AS_HELP_STRING([--disable-curl],[disable cURL based testcases])],
   [enable_curl=${enableval}])
 curl=0
-if test "$enable_curl" != "no"
-then
-  LIBCURL_CHECK_CONFIG([yes],[7.16.4],[enable_curl=yes],
+AS_IF([test "$enable_curl" != "no"],
+ [LIBCURL_CHECK_CONFIG([yes],[7.16.4],[enable_curl=yes],
     [
-      if test "x$enable_curl" = "xyes"; then
-        AC_MSG_WARN([[cURL-based tests cannot be enabled because libcurl is 
missing]])
-      fi
+      AS_IF([test "x$enable_curl" = "xyes"],
+       [AC_MSG_WARN([[cURL-based tests cannot be enabled because libcurl is 
missing]])])
       enable_curl=no
     ])
-fi
-if test "$enable_curl" != "no"
-then
+])
+AS_IF([test "$enable_curl" != "no"],
+ [
 # Lib cURL & cURL - OpenSSL versions
   AC_DEFINE([MHD_REQ_CURL_VERSION], ["7.16.4"], [required cURL version to run 
tests])
   AC_DEFINE([MHD_REQ_CURL_OPENSSL_VERSION], ["0.9.8"], [required cURL SSL 
version to run tests])
   AC_DEFINE([MHD_REQ_CURL_GNUTLS_VERSION], ["2.8.6"], [gnuTLS lib version - 
used in conjunction with cURL])
   AC_DEFINE([MHD_REQ_CURL_NSS_VERSION], ["3.12.0"], [NSS lib version - used in 
conjunction with cURL])
-fi
+ ])
 AM_CONDITIONAL([HAVE_CURL], [test "x$enable_curl" = "xyes"])
 
 mhd_have_libmagic="no"
@@ -1501,8 +1484,7 @@ AC_ARG_ENABLE([https],
    [AS_HELP_STRING([--enable-https],
                [enable HTTPS support (yes, no, auto)[auto]])],
    [enable_https=${enableval}])
-if test "x$enable_https" != "xno"
-then
+AS_IF([test "x$enable_https" != "xno"],[
 #
 # Next block is large unindented block
 #
@@ -1513,18 +1495,18 @@ AC_MSG_CHECKING([[how to find GnuTLS library]])
 AC_ARG_WITH([[gnutls]],
    [AS_HELP_STRING([[--with-gnutls[=PFX]]],[use GnuTLS for HTTPS support, 
optional PFX overrides pkg-config data for GnuTLS headers (PFX/include) and 
libs (PFX/lib)])],
    [
-    case $with_gnutls in
-      no)
+    AS_CASE([$with_gnutls],
+     [no],[
         AC_MSG_RESULT([[GnuTLS disabled]])
         AS_UNSET([GNUTLS_CPPFLAGS])
         AS_UNSET([GNUTLS_CFLAGS])
         AS_UNSET([GNUTLS_LDFLAGS])
         AS_UNSET([GNUTLS_LIBS])
-        ;;
-      yes)
+      ],
+      [yes],[
         AC_MSG_RESULT([[automatically, forced]])
-        ;;
-      *)
+      ],
+      [
         AC_MSG_RESULT([[-I$with_gnutls/include -L$with_gnutls/lib -lgnutls]])
         SAVE_LDFLAGS="$LDFLAGS"
         SAVE_CPPFLAGS="$CPPFLAGS"
@@ -1546,8 +1528,7 @@ AC_ARG_WITH([[gnutls]],
         CFLAGS="$SAVE_CFLAGS"
         LDFLAGS="$SAVE_LDFLAGS"
         LIBS="$SAVE_LIBS"
-        ;;
-    esac
+      ])
    ],
    [AC_MSG_RESULT([[automatically]])
    ])
@@ -1693,9 +1674,6 @@ AS_IF([test "x$with_gnutls" != "xno" && test 
"x$have_gnutls" != "xyes"],
 )
 AS_IF([test "x$have_gnutls" != "xyes" && test "x$with_gnutls" = "xyes"],
       [AC_MSG_ERROR([[can't find usable libgnutls]])])
-#
-# End of large unindented block
-#
 
   AS_IF([test "x$have_gnutls" = "xyes"],
     [
@@ -1797,7 +1775,7 @@ choke me now
           AS_IF([[test "x$mhd_cv_gcrypt_required" = "xyes"]],
             [
              MSG_HTTPS="yes (using libgnutls and libgcrypt)"
-            MHD_TLS_LIB_CPPFLAGS="$LIBGCRYPT_CFLAGS $GNUTLS_CPPFLAGS"
+                MHD_TLS_LIB_CPPFLAGS="$LIBGCRYPT_CFLAGS $GNUTLS_CPPFLAGS"
              MHD_TLS_LIB_CFLAGS="$LIBGCRYPT_CFLAGS $GNUTLS_CFLAGS"
              MHD_TLS_LIB_LDFLAGS="$GNUTLS_LDFLAGS"
              MHD_TLS_LIBDEPS="$GNUTLS_LIBS $LIBGCRYPT_LIBS"
@@ -1843,9 +1821,15 @@ choke me now
      AS_UNSET([GNUTLS_LIBS])
     ]
   )
-else
+],[
   MSG_HTTPS="no (disabled)"
-fi
+])
+
+#
+# End of large unindented block
+#
+
+
 AC_MSG_CHECKING(whether to support HTTPS)
 AC_MSG_RESULT([$MSG_HTTPS])
 
@@ -2078,11 +2062,9 @@ src/testzzuf/Makefile])
 AC_OUTPUT
 
 # Finally: summary
-if test "x$enable_curl" != "xyes"; then
- MSG_CURL="no, many unit tests will not run"
-else
- MSG_CURL="yes"
-fi
+AS_IF([test "x$enable_curl" != "xyes"],
+ [MSG_CURL="no, many unit tests will not run"],
+ [MSG_CURL="yes"])
 
 AC_MSG_NOTICE([GNU libmicrohttpd ${PACKAGE_VERSION} Configuration Summary:
   Target directory:  ${prefix}
@@ -2108,21 +2090,16 @@ AC_MSG_NOTICE([GNU libmicrohttpd ${PACKAGE_VERSION} 
Configuration Summary:
   Test with libcurl: ${MSG_CURL}
 ])
 
-if test "x$enable_https" = "xyes"
-then
- AC_MSG_NOTICE([HTTPS subsystem configuration:
+AS_IF([test "x$enable_https" = "xyes"],
+ [AC_MSG_NOTICE([HTTPS subsystem configuration:
   License         :  LGPL only
- ])
-else
- AC_MSG_NOTICE([
+ ])],
+ [AC_MSG_NOTICE([
   License         :  LGPL or eCos
-])
-fi
+ ])])
 
-if test "x$enable_bauth" != "xyes" || \
+AS_IF([test "x$enable_bauth" != "xyes" || \
    test "x$enable_dauth" != "xyes" || \
    test "x$enable_httpupgrade" != "xyes" || \
-   test "x$enable_postprocessor" != "xyes"
-then
- AC_MSG_NOTICE([WARNING: This will be a custom build with missing symbols. Do 
NOT use this build in a distribution. Building with these kinds of configure 
options is only for custom builds for embedded systems.])
-fi
+   test "x$enable_postprocessor" != "xyes"],
+   [AC_MSG_NOTICE([WARNING: This will be a custom build with missing symbols. 
Do NOT use this build in a distribution. Building with these kinds of configure 
options is only for custom builds for embedded systems.])])

-- 
To stop receiving notification emails like this one, please contact
address@hidden