1 files changed, 122 insertions, 86 deletions

diff --git a/configure.ac b/configure.ac
index 33473834..344a95f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,17 +27,24 @@ AM_CONFIG_HEADER([MHD_config.h])
 
 AH_TOP([#define _GNU_SOURCE  1])
 
+if test `uname -s` == "OS/S390"
+then
+# configure binaries for z/OS
+  CC=`pwd`"/contrib/xcc"
+  chmod +x $CC || true
+  CPP="c89 -E"
+  CXXCPP="c++ -E -+"
+#  _CCC_CCMODE=1
+#  _C89_CCMODE=1
+fi
+
 # Checks for programs.
 AC_PROG_AWK
-
-
-AM_PROG_CC_C_O
-
-
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_CANONICAL_HOST
+AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
 
 # set GCC options
@@ -47,6 +54,7 @@ then
  CFLAGS="-fno-strict-aliasing $CFLAGS"
 fi
 
+
 # Check system type
 case "$host_os" in
 *darwin* | *rhapsody* | *macosx*)
@@ -97,6 +105,10 @@ netbsd*)
      LDFLAGS="$LDFLAGS -no-undefined -Wl,--export-all-symbols -lws2_32 -lplibc"
      AM_CONDITIONAL(HAVE_GNU_LD, true)    
      ;;
+*openedition*)
+     AC_DEFINE_UNQUOTED(OS390,1,[This is a OS/390 system])
+     AM_CONDITIONAL(HAVE_GNU_LD, false)    
+    ;;
 *)
      AC_MSG_RESULT(Unrecognised OS $host_os)
      AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS])
@@ -104,6 +116,9 @@ netbsd*)
 ;;
 esac
 
+
+
+
 CHECK_PTHREAD
 LIBS="$PTHREAD_LIBS $LIBS"
 AC_SUBST(PTHREAD_LIBS)
@@ -119,7 +134,7 @@ AC_CHECK_HEADERS([sys/select.h sys/types.h sys/time.h sys/msg.h netdb.h netinet/
 # libcurl (required for testing)
 SAVE_LIBS=$LIBS
 LIBCURL_CHECK_CONFIG(,,curl=1,curl=0)
-AM_CONDITIONAL(HAVE_CURL, test x$curl = x1)
+AM_CONDITIONAL(HAVE_CURL, test x$curl == x1)
 LIBS=$SAVE_LIBS
 
 # Lib cURL & cURL - OpenSSL versions
@@ -142,51 +157,107 @@ AC_ARG_ENABLE(messages,
    [enable_messages=$enableval],
    [enable_messages="no"])
 AC_MSG_RESULT($enable_messages)
-if test "$enable_messages" = "yes"
+if test "$enable_messages" == "yes"
 then
  AC_DEFINE([HAVE_MESSAGES],[1],[Include error messages])
 fi
 
-# optional: compile TLS client side code [only for test running] ?
-AC_MSG_CHECKING(--enable-client-side argument)
-AC_ARG_ENABLE(client-side,
-   [AS_HELP_STRING([--enable-client-side],
-               [Compile client side code])],
-   [enable_client_side=$enableval],
-   [enable_client_side="no"])
-AC_MSG_RESULT($enable_client_side)
-if test "$enable_client_side" = "no"
-then
- AC_DEFINE([MHD_DEBUG_TLS],[0],[Compile client side code. This will enable running some test cases.])
- MSG_CLIENT_SIDE="disabled. running some test cases won't be possible"
-else
- AC_DEFINE([MHD_DEBUG_TLS],[1],[Compile client side code. This will enable running some test cases.])
- MSG_CLIENT_SIDE="enabled" 
-fi
-AM_CONDITIONAL(MHD_DEBUG_TLS, test "$enable_client_side" != "no")
 
 # optional: have zzuf, socat?
 AC_CHECK_PROG([HAVE_ZZUF],[zzuf], 1, 0)
 AC_CHECK_PROG([HAVE_SOCAT],[socat], 1, 0)
-
 AM_CONDITIONAL(HAVE_ZZUF, test 0 != $HAVE_ZZUF)
 AM_CONDITIONAL(HAVE_SOCAT, test 0 != $HAVE_SOCAT)
 
-# optional: HTTPS support. Included by default
+
+# libgcrypt linkage: required for HTTPS support 
+AC_MSG_CHECKING(--with-libgcrypt argument)
+AC_ARG_WITH(libgcrypt,
+  [AS_HELP_STRING([--with-libgcrypt=PFX],
+               [Base of libgcrypt installation])],
+  [AC_MSG_RESULT("$with_libgcrypt")
+   case $with_libgcrypt in
+   no)
+     gcrypt=false
+     ;;
+   yes)
+     AC_CHECK_HEADERS([gcrypt.h],
+       AC_CHECK_LIB(gcrypt,gcry_prime_generate,
+        gcrypt=true,
+        gcrypt=false))
+     ;;
+   *)
+    LDFLAGS="-L${with_libgcrypt}lib $LDFLAGS"
+    CPPFLAGS="-I${with_libgcrypt}/include $CPPFLAGS"
+    AC_CHECK_HEADERS(gcrypt.h,
+     # check for 'gcry_prime_generate' in gcrypt.la
+     AC_CHECK_LIB(gcrypt,gcry_prime_generate,
+       GCRYPT_LIB_PATH="${with_libgcrypt}/lib"
+       GCRYPT_LDFLAGS="-L${with_libgcrypt}/lib"
+       GCRYPT_CPPFLAGS="-I${with_libgcrypt}/include"
+       gcrypt=true,
+       gcrypt=false))
+    LDFLAGS=$SAVE_LDFLAGS
+    CPPFLAGS=$SAVE_CPPFLAGS
+    ;;
+   esac
+  ],
+  [AC_MSG_RESULT([not specified])
+   AC_CHECK_HEADERS([gcrypt.h],
+     AC_CHECK_LIB(gcrypt,gcry_prime_generate,
+      gcrypt=true,
+      gcrypt=false))
+  ])
+
+# define the minimal version of libgcrypt required   
+MHD_GCRYPT_VERSION=1:1.2.4
+AC_DEFINE_UNQUOTED([MHD_GCRYPT_VERSION], "$MHD_GCRYPT_VERSION", [gcrypt lib version])
+AC_SUBST(GCRYPT_LIB_PATH)
+AC_SUBST(GCRYPT_LDFLAGS)
+AC_SUBST(GCRYPT_CPPFLAGS)
+
+
+# optional: HTTPS support.  Enabled by default
 AC_MSG_CHECKING(--enable-HTTPS argument)
 AC_ARG_ENABLE([HTTPS],
    [AS_HELP_STRING([--enable-HTTPS],
                [enable HTTPS support (default is yes)])],
    [enable_HTTPS=$enableval],
    [enable_HTTPS="yes"])
-AC_MSG_RESULT($enable_HTTPS)
-if test "$enable_HTTPS" = "yes"
+if test "$enable_HTTPS" == "yes"
 then
- AC_DEFINE([HTTPS_SUPPORT],[1],[include HTTPS support])
+ if test "$gcrypt" == "true"
+ then
+   AC_DEFINE([HTTPS_SUPPORT],[1],[include HTTPS support])
+ else
+   AC_DEFINE([HTTPS_SUPPORT],[0],[no libgcrypt])
+   enable_HTTPS="no (lacking libgcrypt)"
+ fi
 else
  AC_DEFINE([HTTPS_SUPPORT],[0],[disable HTTPS support])
 fi
-AM_CONDITIONAL(ENABLE_HTTPS, test "$enable_HTTPS" = "yes")
+AC_MSG_RESULT($enable_HTTPS)
+
+AM_CONDITIONAL(ENABLE_HTTPS, test "$enable_HTTPS" == "yes")
+
+# optional: compile TLS client side code [only for test running] ?
+AC_MSG_CHECKING(--enable-client-side argument)
+AC_ARG_ENABLE(client-side,
+   [AS_HELP_STRING([--enable-client-side],
+               [Compile client side code])],
+   [enable_client_side=$enableval],
+   [enable_client_side="no"])
+AC_MSG_RESULT($enable_client_side)
+if test "$enable_client_side" == "no"
+then
+ AC_DEFINE([MHD_DEBUG_TLS],[0],[Compile client side code. This will enable running some test cases.])
+ MSG_CLIENT_SIDE="disabled. running some test cases won't be possible"
+else
+ AC_DEFINE([MHD_DEBUG_TLS],[1],[Compile client side code. This will enable running some test cases.])
+ MSG_CLIENT_SIDE="enabled" 
+fi
+AM_CONDITIONAL(MHD_DEBUG_TLS, test "$enable_client_side" != "no")
+
 
 # optional: TLS support. Included by default
 AC_MSG_CHECKING(--enable-TLS argument)
@@ -218,51 +289,12 @@ AC_ARG_ENABLE([x509],
 AC_MSG_RESULT($enable_x509)
 
 
-# Libgcrypt linkage : required for HTTPS support 
-AC_CHECK_HEADERS(gcrypt.h,gcrypt=true,gcrypt=false)
-AC_ARG_WITH(libgcrypt,
-  [AS_HELP_STRING([--with-libgcrypt=PFX],
-               [Base of libgcrypt installation])],
-  [AC_MSG_RESULT("$with_libgcrypt")
-   case $with_libgcrypt in
-   no)
-     gcrypt=false
-     ;;
-   yes)
-     ;;
-   *)
-    LDFLAGS="-L$with_libgcrypt/lib $LDFLAGS"
-    CPPFLAGS="-I$with_libgcrypt/include $CPPFLAGS"
-    AC_CHECK_HEADERS(gcrypt.h,
-     # check for 'gcry_prime_generate' in gcrypt.la
-     AC_CHECK_LIB(gcrypt,gcry_prime_generate,
-       GCRYPT_LIB_PATH="$with_libgcrypt/lib"
-       GCRYPT_LDFLAGS="-L$with_libgcrypt/lib"
-       GCRYPT_CPPFLAGS="-I$with_libgcrypt/include"
-       gcrypt=true,
-       gcrypt=false))
-    LDFLAGS=$SAVE_LDFLAGS
-    CPPFLAGS=$SAVE_CPPFLAGS
-    ;;
-   esac
-  ],
-  [AC_MSG_RESULT([--with_libgcrypt not specified])])
-
-# define the minimal version of libgcrypt required   
-MHD_GCRYPT_VERSION=1:1.2.4
-AC_DEFINE_UNQUOTED([MHD_GCRYPT_VERSION], "$MHD_GCRYPT_VERSION", [gcrypt lib version])
-  
-AC_SUBST(GCRYPT_LIB_PATH)
-AC_SUBST(GCRYPT_LDFLAGS)
-AC_SUBST(GCRYPT_CPPFLAGS)
-
 # Symbols required by GNU_TLS 
 AC_DEFINE([ENABLE_MINITASN1],[1],[Include minitasn1 support])
 AC_DEFINE([GNULIB_GC_HMAC_SHA1],[1],[GNULIB_GC_HMAC_SHA1])
 AC_DEFINE([GNULIB_GC_RANDOM],[1],[GNULIB_GC_RANDOM])
 AC_DEFINE([ENABLE_ANON],[1],[Enable anonymous authentication])
 AC_DEFINE([ENABLE_PKI],[0],[Include PKI support])
-AC_DEFINE([ENABLE_INCLUDED_OPENCDK],[1],[Include ENABLE_INCLUDED_OPENCDK support])
 # gnutls debug support
 AC_DEFINE([DEBUG],[1],[Include gnutls debug message support])
 AC_DEFINE([C99_MACROS],[1],[Include gnutls debug message support])
@@ -280,6 +312,7 @@ AC_SUBST(EXT_LIBS)
 
 AC_CONFIG_FILES([ 
 Makefile
+contrib/Makefile
 doc/Makefile
 m4/Makefile
 src/Makefile
@@ -300,35 +333,38 @@ AM_CONDITIONAL(ENABLE_MINITASN1,  [test -n " " ] )
 AM_CONDITIONAL(ENABLE_OPENSSL,  [test -n "" ] )
 AM_CONDITIONAL(HAVE_LD_OUTPUT_DEF,  [test -n "" ] )
 AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT,  [test -n "" ] )
-AM_CONDITIONAL(ENABLE_INCLUDED_OPENCDK,  [test -n "" ] )
 
 # Finally: summary
 if test "$curl" != 1 ; then
- MSG_CURL="libcurl not found, building test won't be possible"
+ MSG_CURL="no, many unit tests will not run"
 else
- MSG_CURL="${_libcurl_with}/lib"
+ MSG_CURL="yes"
 fi
+
 if test "$gcrypt" != true
 then
- MSG_GCRYPT="libgcrypt not found, HTTPS supprot cannot be built"
+ MSG_GCRYPT="no, HTTPS will not be built"
 else
- MSG_GCRYPT="${with_libgcrypt}/lib"
+ MSG_GCRYPT="yes"
 fi
 
-AC_MSG_NOTICE([Configured to build curl/libcurl:
-  Configuration Summery:
-  
-  os:                ${host_os}
-  target dir:        ${prefix}
-  messages:          ${enable_messages}
-  HTTPS support:     ${enable_HTTPS}    
+AC_MSG_NOTICE([Configuration Summary:  
+  Operating System:  ${host_os}
+  Target directory:  ${prefix}
+  Messages:          ${enable_messages}
+  libgcrypt:         ${MSG_GCRYPT}
+  libcurl (testing): ${MSG_CURL}
+  HTTPS support:     ${enable_HTTPS}
+])
+
+if test "$enable_HTTPS" == "yes"
+then
+AC_MSG_NOTICE([HTTPS subsystem configuration:
   TLS support:       ${enable_TLS}
   SSLv3 support:     ${enable_SSL}
   x509 support:      ${enable_x509}
-  libgcrypt:         ${MSG_GCRYPT}
-  
-  # Testing
-  libcurl:           ${MSG_CURL}
-  client code dep.:  ${MSG_CLIENT_SIDE}                 
+  Client code dep.:  ${MSG_CLIENT_SIDE}                 
 ])
+fi  
+