123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134 |
- diff -ur gsoap-2.8.orig/configure.in gsoap-2.8/configure.in
- --- gsoap-2.8.orig/configure.in 2011-10-22 23:12:11.000000000 +0200
- +++ gsoap-2.8/configure.in 2011-11-01 06:25:39.071999543 +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
- @@ -226,13 +225,13 @@
- WSDL2H_EXTRA_FLAGS="-DWITH_GNUTLS -DWITH_GZIP"
- WSDL2H_EXTRA_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
- 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"
- - WSDL2H_EXTRA_LIBS="-lssl -lcrypto -lz"
- + WSDL2H_EXTRA_LIBS=
- 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}"
- @@ -244,7 +243,7 @@
- WSDL2H_EXTRA_FLAGS=
- WSDL2H_EXTRA_LIBS=
- SAMPLE_SSL_LIBS=
- - 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 2011-10-22 23:12:12.000000000 +0200
- +++ gsoap-2.8/gsoap/Makefile.am 2011-11-01 06:25:39.071999543 +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
- -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
- +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
- +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
- +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/autotest/Makefile.am gsoap-2.8/gsoap/samples/autotest/Makefile.am
- --- gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am 2011-10-22 23:12:14.000000000 +0200
- +++ gsoap-2.8/gsoap/samples/autotest/Makefile.am 2011-11-01 06:25:39.071999543 +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 2011-10-22 23:12:15.000000000 +0200
- +++ gsoap-2.8/gsoap/samples/databinding/Makefile.am 2011-11-01 06:25:39.071999543 +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 -ur gsoap-2.8.orig/gsoap/samples/Makefile.defines gsoap-2.8/gsoap/samples/Makefile.defines
- --- gsoap-2.8.orig/gsoap/samples/Makefile.defines 2011-10-22 23:12:15.000000000 +0200
- +++ gsoap-2.8/gsoap/samples/Makefile.defines 2011-11-01 06:25:39.071999543 +0100
- @@ -15,13 +15,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
|