configure.ac                              | 5 ++++-

 gsoap/samples/factorytest/factorytest.cpp | 2 ++

 gsoap/samples/lu/luclient.cpp             | 2 ++

 gsoap/stdsoap2.cpp                        | 6 +++++-

 gsoap/stdsoap2.h                          | 4 ++--

 gsoapssl++.pc.in                          | 2 +-

 gsoapssl.pc.in                            | 2 +-

 7 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac

index dd04367d..96ec1ce1 100644

--- a/configure.ac

+++ b/configure.ac

@@ -17,7 +17,7 @@ AM_PROG_LEX

 AC_PROG_YACC

 AC_PROG_CPP

 AC_PROG_RANLIB

-#AM_PROG_LIBTOOL

+AM_PROG_LIBTOOL

 AC_PROG_LN_S

 AC_PROG_AWK

 AC_PROG_INSTALL

@@ -305,12 +305,14 @@ if test "x$with_openssl" = "xyes"; then

     AC_MSG_RESULT(yes)

     WSDL2H_EXTRA_FLAGS="-DWITH_GNUTLS -DWITH_GZIP"

     WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"

+    GSOAPSSL_EXTRA_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"

     SAMPLE_INCLUDES=

     SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"

     WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"

   else

     AC_MSG_RESULT(no)

     WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"

+    GSOAPSSL_EXTRA_LIBS="-lssl -lcrypto -lz"

     # compile with wsdl2h when OPENSSL is available

     WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz"

     SAMPLE_INCLUDES=

@@ -339,6 +341,7 @@ fi

 AM_CONDITIONAL([WITH_OPENSSL], [test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes"])

 AC_SUBST(WSDL2H_EXTRA_FLAGS)

 AC_SUBST(WSDL2H_EXTRA_LIBS)

+AC_SUBST(GSOAPSSL_EXTRA_LIBS)

 AC_SUBST(SAMPLE_INCLUDES)

 AC_SUBST(SAMPLE_SSL_LIBS)

 AC_SUBST(WSDL2H_SOAP_CPP_LIB)

diff --git a/gsoap/samples/factorytest/factorytest.cpp b/gsoap/samples/factorytest/factorytest.cpp

index 83dfc6df..3adc74ad 100644

--- a/gsoap/samples/factorytest/factorytest.cpp

+++ b/gsoap/samples/factorytest/factorytest.cpp

@@ -51,6 +51,8 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com

 #include <iostream>

+using namespace std;

+

 // default factory service endpoint:

 const char *factory = "http://localhost:18085";

diff --git a/gsoap/samples/lu/luclient.cpp b/gsoap/samples/lu/luclient.cpp

index a41e39e8..9472cb85 100644

--- a/gsoap/samples/lu/luclient.cpp

+++ b/gsoap/samples/lu/luclient.cpp

@@ -34,6 +34,8 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com

 #include "soapH.h"

 #include <iostream>

+using namespace std;

+

 const char luserver[] = "http://websrv.cs.fsu.edu/~engelen/luserver.cgi";

 int main(int argc, char **argv)

diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp

index f1522e00..5bd87ecc 100644

--- a/gsoap/stdsoap2.cpp

+++ b/gsoap/stdsoap2.cpp

@@ -6041,7 +6041,11 @@ again:

             const char *ext_str = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));

             if (ext_str && !strcmp(ext_str, "subjectAltName"))

             {

-              X509V3_EXT_METHOD *meth = (X509V3_EXT_METHOD*)X509V3_EXT_get(ext);

+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)

+              const X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext);

+#else

+              X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext);

+#endif

               unsigned char *data;

               if (!meth)

                 break;

diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h

index 6dff6f75..2095c532 100644

--- a/gsoap/stdsoap2.h

+++ b/gsoap/stdsoap2.h

@@ -1905,10 +1905,10 @@ typedef unsigned short soap_ssl_flags;

 #else

 /* new form with parenthesis for (type) but not type[n], soap context may be NULL */

 # ifndef SOAP_NEW

-#  define SOAP_NEW(soap, type) new SOAP_NOTHROW (type)

+#  define SOAP_NEW(soap, type) new SOAP_NOTHROW type()

 # endif

 # ifndef SOAP_NEW_ARRAY

-#  define SOAP_NEW_ARRAY(soap, type, n) new SOAP_NOTHROW type[n]

+#  define SOAP_NEW_ARRAY(soap, type, n) new SOAP_NOTHROW type[n]()

 # endif

 # ifndef SOAP_PLACEMENT_NEW

 #  define SOAP_PLACEMENT_NEW(soap, buf, type) new (buf) (type)

diff --git a/gsoapssl++.pc.in b/gsoapssl++.pc.in

index 01c9b94d..7a1d4814 100644

--- a/gsoapssl++.pc.in

+++ b/gsoapssl++.pc.in

@@ -7,6 +7,6 @@ Name: GSoap

 Description: SOAP C++ Web Services with SSL, ZLIB, DOM

 Version: 2.8.102

 Requires:

-Libs: -L${libdir} -lgsoapssl++

+Libs: -L${libdir} -lgsoapssl++ -lz

 Libs.private: @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@

 Cflags: @SOAPCPP2_IPV6@ @WSDL2H_EXTRA_FLAGS@ -DWITH_DOM -I${includedir}

diff --git a/gsoapssl.pc.in b/gsoapssl.pc.in

index 38277754..0d95a312 100644

--- a/gsoapssl.pc.in

+++ b/gsoapssl.pc.in

@@ -7,6 +7,6 @@ Name: GSoap

 Description: SOAP C Web Services with SSL, ZLIB, DOM

 Version: 2.8.102

 Requires:

-Libs: -L${libdir} -lgsoapssl

+Libs: -L${libdir} -lgsoapssl -lz

 Libs.private: @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@

 Cflags: @SOAPCPP2_IPV6@ @WSDL2H_EXTRA_FLAGS@ -DWITH_DOM -I${includedir}