diff options
Diffstat (limited to 'development/gsoap')
| -rw-r--r-- | development/gsoap/gsoap-libtool.patch | 136 | ||||
| -rw-r--r-- | development/gsoap/gsoap.SlackBuild | 18 | ||||
| -rw-r--r-- | development/gsoap/gsoap.info | 6 | ||||
| -rw-r--r-- | development/gsoap/patches/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch | 12 | ||||
| -rw-r--r-- | development/gsoap/patches/gsoap-2.8.91-shared_libs.patch | 142 |
5 files changed, 168 insertions, 146 deletions
diff --git a/development/gsoap/gsoap-libtool.patch b/development/gsoap/gsoap-libtool.patch deleted file mode 100644 index 87a9fcefdf..0000000000 --- a/development/gsoap/gsoap-libtool.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff -ur gsoap-2.8.orig/configure.ac gsoap-2.8/configure.ac ---- gsoap-2.8.orig/configure.ac 2015-11-10 18:52:20.000000000 +0100 -+++ gsoap-2.8/configure.ac 2015-11-22 09:28:38.711054796 +0100 -@@ -16,8 +16,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 -@@ -236,16 +235,16 @@ - WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz" - SAMPLE_INCLUDES= - SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" -- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" -+ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" - else - AC_MSG_RESULT(no) - WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" - # an ugly hack to get httpda and smdevp plugins to conditionally - # compile with wsdl2h when OPENSSL is available -- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lssl -lcrypto -lz" -+ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lcrypto" - SAMPLE_INCLUDES= - SAMPLE_SSL_LIBS="-lssl -lcrypto -lz" -- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" -+ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" - fi - if test -n "$OPENSSL"; then - WSDL2H_EXTRA_FLAGS="-I${OPENSSL}/include ${WSDL2H_EXTRA_FLAGS}" -@@ -258,7 +257,7 @@ - WSDL2H_EXTRA_FLAGS= - SAMPLE_SSL_LIBS= - SAMPLE_INCLUDES= -- WSDL2H_SOAP_CPP_LIB="libgsoap++.a" -+ WSDL2H_SOAP_CPP_LIB="libgsoap++.la" - fi - AC_SUBST(WSDL2H_EXTRA_FLAGS) - AC_SUBST(WSDL2H_EXTRA_LIBS) -diff -ur gsoap-2.8.orig/gsoap/Makefile.am gsoap-2.8/gsoap/Makefile.am ---- gsoap-2.8.orig/gsoap/Makefile.am 2015-11-10 18:52:22.000000000 +0100 -+++ gsoap-2.8/gsoap/Makefile.am 2015-11-22 09:24:43.198046409 +0100 -@@ -34,20 +34,30 @@ - dom_cpp.cpp: dom.cpp - $(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp - --lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a -+lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la - --libgsoap_a_SOURCES = stdsoap2.c dom.c --libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) --libgsoap___a_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp --libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) --libgsoapck_a_SOURCES = stdsoap2_ck.c dom.c --libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES --libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp --libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES --libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c --libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES --libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp --libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES -+SOVERSION = 0 -+ -+libgsoap_la_SOURCES = stdsoap2.c dom.c -+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -+libgsoap_la_LDFLAGS = -version-info $(SOVERSION) -+libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp -+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -+libgsoap___la_LDFLAGS = -version-info $(SOVERSION) -+libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c -+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES -+libgsoapck_la_LDFLAGS = -version-info $(SOVERSION) -+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp -+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES -+libgsoapck___la_LDFLAGS = -version-info $(SOVERSION) -+libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c -+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES -+libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION) -+libgsoapssl_la_LIBADD = -lssl -lcrypto -lz -+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp -+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES -+libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION) -+libgsoapssl___la_LIBADD = -lssl -lcrypto -lz - - BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES) - -diff -ur gsoap-2.8.orig/gsoap/samples/Makefile.defines gsoap-2.8/gsoap/samples/Makefile.defines ---- gsoap-2.8.orig/gsoap/samples/Makefile.defines 2015-11-10 18:52:26.000000000 +0100 -+++ gsoap-2.8/gsoap/samples/Makefile.defines 2015-11-22 09:22:54.369042534 +0100 -@@ -13,13 +13,13 @@ - SOAP_C_CORE=soapC.c - SOAP_C_CLIENT=soapClient.c $(SOAP_C_CORE) - SOAP_C_SERVER=soapServer.c $(SOAP_C_CORE) --SOAP_C_LIB=$(top_builddir)/gsoap/libgsoap.a --SOAP_C_LIB_CK=$(top_builddir)/gsoap/libgsoapck.a --SOAP_C_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl.a -+SOAP_C_LIB=$(top_builddir)/gsoap/libgsoap.la -+SOAP_C_LIB_CK=$(top_builddir)/gsoap/libgsoapck.la -+SOAP_C_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl.la - - SOAP_CPP_CORE=soapC.cpp - SOAP_CPP_CLIENT=soapClient.cpp $(SOAP_CPP_CORE) - SOAP_CPP_SERVER=soapServer.cpp $(SOAP_CPP_CORE) --SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a --SOAP_CPP_LIB_CK=$(top_builddir)/gsoap/libgsoapck++.a --SOAP_CPP_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl++.a -+SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la -+SOAP_CPP_LIB_CK=$(top_builddir)/gsoap/libgsoapck++.la -+SOAP_CPP_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl++.la -diff -ur gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am gsoap-2.8/gsoap/samples/autotest/Makefile.am ---- gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am 2015-11-10 18:52:26.000000000 +0100 -+++ gsoap-2.8/gsoap/samples/autotest/Makefile.am 2015-11-22 09:22:54.368042534 +0100 -@@ -14,7 +14,7 @@ - WSDLINPUT=$(srcdir)/examples.wsdl - SOAPHEADER=$(srcdir)/examples.h - SOAP_CPP_SRC=soapC.cpp soapServer.cpp --SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a -+SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la - - $(SOAP_CPP_SRC) : $(WSDLINPUT) - $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) -diff -ur gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am gsoap-2.8/gsoap/samples/databinding/Makefile.am ---- gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am 2015-11-10 18:52:26.000000000 +0100 -+++ gsoap-2.8/gsoap/samples/databinding/Makefile.am 2015-11-22 09:22:54.368042534 +0100 -@@ -14,7 +14,7 @@ - WSDLINPUT=$(srcdir)/address.xsd - SOAPHEADER=$(srcdir)/address.h - SOAP_CPP_SRC=addressC.cpp --SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a -+SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la - - $(SOAP_CPP_SRC) : $(WSDLINPUT) - $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) diff --git a/development/gsoap/gsoap.SlackBuild b/development/gsoap/gsoap.SlackBuild index a92cd16d6a..badaad965d 100644 --- a/development/gsoap/gsoap.SlackBuild +++ b/development/gsoap/gsoap.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gsoap -# Copyright 2009-2017 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2009-2018 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gsoap -VERSION=${VERSION:-2.8.46} +VERSION=${VERSION:-2.8.111} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -69,8 +69,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Patches from Gentoo +# Fix Pre-ISO headers +patch -p1 -i $CWD/patches/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch # Build shared libraries -patch -p1 -i $CWD/gsoap-libtool.patch +patch -p1 -i $CWD/patches/gsoap-2.8.91-shared_libs.patch autoreconf -vif @@ -82,9 +85,10 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --disable-static \ + --disable-xlocale \ --build=$ARCH-slackware-linux -make -j1 +make make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/development/gsoap/gsoap.info b/development/gsoap/gsoap.info index 1f3e52d4cd..edaf16692e 100644 --- a/development/gsoap/gsoap.info +++ b/development/gsoap/gsoap.info @@ -1,8 +1,8 @@ PRGNAM="gsoap" -VERSION="2.8.46" +VERSION="2.8.111" HOMEPAGE="http://gsoap2.sourceforge.net/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/gsoap_2.8.46.zip" -MD5SUM="e7ff6c940730371dcb90079ca56a8551" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/gsoap_2.8.111.zip" +MD5SUM="dc579d96d8a331a42a845e2541aae763" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/gsoap/patches/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch b/development/gsoap/patches/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch new file mode 100644 index 0000000000..673deb17c3 --- /dev/null +++ b/development/gsoap/patches/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch @@ -0,0 +1,12 @@ +--- gsoap-2.7/gsoap/Makefile.am 2008-01-27 15:02:36.000000000 -0600 ++++ gsoap-2.7mf/gsoap/Makefile.am 2008-01-28 10:24:26.000000000 -0600 +@@ -12,6 +12,9 @@ CLEANFILES=soapcpp2 stdsoap2_cpp.cpp std + AM_CXXFLAGS=$(SOAPCPP2_DEBUG) -D$(platform) + AM_CFLAGS=$(SOAPCPP2_DEBUG) -D$(platform) + ++# Install all soapcpp2 and wsdl2h files into /usr/share/gsoap ++nobase_pkgdata_DATA = import/* plugin/* WS/* custom/* extras/* ++ + ## we cannot build stdsoap2.o from 2 different sources (stdsoap2.cpp and stdsoap2.c), so we need an intermediate target: + stdsoap2_ck.c: stdsoap2.cpp + $(LN_S) $(srcdir)/stdsoap2.cpp stdsoap2_ck.c diff --git a/development/gsoap/patches/gsoap-2.8.91-shared_libs.patch b/development/gsoap/patches/gsoap-2.8.91-shared_libs.patch new file mode 100644 index 0000000000..1fcdeeb698 --- /dev/null +++ b/development/gsoap/patches/gsoap-2.8.91-shared_libs.patch @@ -0,0 +1,142 @@ +--- gsoap-2.8/configure.ac ++++ gsoap-2.8/configure.ac +@@ -17,7 +17,7 @@ + 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 +@@ -307,15 +307,17 @@ + WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz" + SAMPLE_INCLUDES= + SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" +- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" + else + AC_MSG_RESULT(no) + WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" + # compile with wsdl2h when OPENSSL is available +- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz" ++ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lcrypto" + SAMPLE_INCLUDES= + SAMPLE_SSL_LIBS="-lssl -lcrypto -lz" +- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" + fi + if test -n "$ZLIB"; then + WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}" +@@ -334,7 +336,8 @@ + WSDL2H_EXTRA_FLAGS= + SAMPLE_SSL_LIBS= + SAMPLE_INCLUDES= +- WSDL2H_SOAP_CPP_LIB="libgsoap++.a" ++ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoap++.a" ++ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" + fi + AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes") + AC_SUBST(WITH_OPENSSL) +@@ -342,7 +345,8 @@ + AC_SUBST(WSDL2H_EXTRA_LIBS) + AC_SUBST(SAMPLE_INCLUDES) + AC_SUBST(SAMPLE_SSL_LIBS) +-AC_SUBST(WSDL2H_SOAP_CPP_LIB) ++AC_SUBST(WSDL2H_SOAP_CPP_SHARED_LIB) ++AC_SUBST(WSDL2H_SOAP_CPP_STATIC_LIB) + + # enable the compile of the samples + AC_ARG_ENABLE(samples, +--- gsoap-2.8/gsoap/Makefile.am ++++ gsoap-2.8/gsoap/Makefile.am +@@ -49,6 +49,29 @@ + libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp + libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES + ++lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la ++SOVERSION = 0 ++libgsoap_la_SOURCES = stdsoap2.c dom.c ++libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) ++libgsoap_la_LDFLAGS = -version-info $(SOVERSION) ++libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp ++libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) ++libgsoap___la_LDFLAGS = -version-info $(SOVERSION) ++libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c ++libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES ++libgsoapck_la_LDFLAGS = -version-info $(SOVERSION) ++libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp ++libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES ++libgsoapck___la_LDFLAGS = -version-info $(SOVERSION) ++libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c ++libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES ++libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION) ++libgsoapssl_la_LIBADD = -lssl -lcrypto -lz ++libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp ++libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES ++libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION) ++libgsoapssl___la_LIBADD = -lssl -lcrypto -lz ++ + BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp + + include_HEADERS = stdsoap2.h +--- gsoap-2.8/gsoap/samples/autotest/Makefile.am ++++ gsoap-2.8/gsoap/samples/autotest/Makefile.am +@@ -14,7 +14,7 @@ + WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl + SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h + SOAP_CPP_SRC=soapC.cpp soapServer.cpp +-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a ++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a + + $(SOAP_CPP_SRC) : $(WSDLINPUT) + $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) +@@ -40,6 +40,6 @@ + autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform) + autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS) + autotest_SOURCES=$(SOAP_CPP_SRC) soapTester.cpp duration.cpp long_time.cpp struct_tm.cpp struct_tm_date.cpp +-autotest_LDADD=$(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS) ++autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS) + + CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap +--- gsoap-2.8/gsoap/samples/databinding/Makefile.am ++++ gsoap-2.8/gsoap/samples/databinding/Makefile.am +@@ -14,7 +14,7 @@ + WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd + SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h + SOAP_CPP_SRC=addressC.cpp +-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a ++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a + + $(SOAP_CPP_SRC) : $(WSDLINPUT) + $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) +@@ -28,6 +28,6 @@ + address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform) + address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS) + address_SOURCES=$(SOAP_CPP_SRC) address.cpp +-address_LDADD=$(SOAP_CPP_LIB) ++address_LDADD=$(SOAP_CPP_SHARED_LIB) + + CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap +--- gsoap-2.8/gsoap/wsdl/Makefile.am ++++ gsoap-2.8/gsoap/wsdl/Makefile.am +@@ -10,7 +10,7 @@ + AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin + AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin + SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT) +-SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB) ++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_SHARED_LIB) + SOAP_CPP_SRC=wsdlC.cpp + SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h + SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import +@@ -29,7 +29,7 @@ + wsdl2h_CXXFLAGS=$(C_DEBUG_FLAGS) $(SOAPCPP2_INCLUDE_XLOCALE) $(SOAPCPP2_NO_C_LOCALE) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH) + wsdl2h_CPPFLAGS=$(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform) + wsdl2h_SOURCES=wsdl2h.cpp wsdl.cpp wadl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp bpel.cpp $(SOAP_CPP_SRC) +-wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS) ++wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS) + if WITH_OPENSSL + wsdl2h_SOURCES+=$(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c + wsdl2h_LDADD+=-lpthread |