From: František Dvořák <valtri@civ.zcu.cz>
Date: Wed, 13 Aug 2008 10:29:24 +0000 (+0000)
Subject: Build fixes:
X-Git-Tag: myproxy-config-R_2_0_1_1~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=5ca9d096b6dfdabf1893d89d97e87389bd1b36f0;p=jra1mw.git

Build fixes:
 - really fail build on build/install errors
 - wrong default include path for gsoap
 - fix build for gsoap 2.6.2.
---

diff --git a/org.glite.security.gsoap-plugin/Makefile b/org.glite.security.gsoap-plugin/Makefile
index ede762c..1dd0b0e 100644
--- a/org.glite.security.gsoap-plugin/Makefile
+++ b/org.glite.security.gsoap-plugin/Makefile
@@ -67,7 +67,6 @@ CFLAGS:= ${DEBUG} \
 	-DWITH_NONAMESPACES \
 	-I. -I${top_srcdir}/interface \
 	-I${stagedir}/include \
-	-I${gsoap_prefix}/include \
 	${COVERAGE_FLAGS} -D_GNU_SOURCE -DDATAGRID_EXTENSION
 
 LDFLAGS:=${COVERAGE_FLAGS}
@@ -85,8 +84,6 @@ ifeq (${lang},cxx)
 LINK_lang:=${LINKXX}
 endif
 
-GSOAP_LIBS:= -L${gsoap_prefix}/lib -lgsoap
-
 EX_LIBS:=-L${stagedir}/lib -lglite_security_gss_${nothrflavour}
 EX_THRLIBS:=-L${stagedir}/lib -lglite_security_gss_${thrflavour}
 HDRS:=glite_gsplugin.h glite_gscompat.h glite_gsplugin-int.h
@@ -161,13 +158,13 @@ all-libs-with-soap:
 	for v in ${gsoap_versions_noflavours}; do	\
 		dir=`echo $$v | tr -d .`; \
 		mkdir $$dir; \
-		( cd $$dir && ${MAKE} -f ../Makefile gsoap_version=$$v top_srcdir=../.. lang= libs-with-soap) ; \
+		${MAKE} -C $$dir -f ../Makefile gsoap_version=$$v top_srcdir=../.. lang= libs-with-soap || exit $?; \
 	done
 	for v in ${gsoap_versions_flavours}; do	\
 		dir=`echo $$v | tr -d .`; \
 		mkdir $$dir; \
-		( cd $$dir && ${MAKE} -f ../Makefile gsoap_version=$$v top_srcdir=../.. lang=c libs-with-soap) ; \
-		( cd $$dir && ${MAKE} -f ../Makefile gsoap_version=$$v top_srcdir=../.. lang=cxx libs-with-soap) ; \
+		${MAKE} -C $$dir -f ../Makefile gsoap_version=$$v top_srcdir=../.. lang=c libs-with-soap || exit $?; \
+		${MAKE} -C $$dir -f ../Makefile gsoap_version=$$v top_srcdir=../.. lang=cxx libs-with-soap || exit $?; \
 	done
 
 libs-with-soap: ${LTLIB_S} ${THRLTLIB_S} ${STATICLIB_S} ${THRSTATICLIB_S}
@@ -238,11 +235,11 @@ install:
 	${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
 	cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${PREFIX}/include/glite/security/
 	for v in ${gsoap_versions_noflavours}; do \
-		(cd `echo $$v | tr -d .` && ${MAKE} -f ../Makefile install-soaplib gsoap_version=$$v lang= PREFIX=${PREFIX} top_srcdir=${top_srcdir}/..); \
+		${MAKE} -C `echo $$v | tr -d .` -f ../Makefile install-soaplib gsoap_version=$$v lang= PREFIX=${PREFIX} top_srcdir=${top_srcdir}/.. || exit $?; \
 	done
 	for v in ${gsoap_versions_flavours}; do \
-		(cd `echo $$v | tr -d .` && ${MAKE} -f ../Makefile install-soaplib gsoap_version=$$v lang=c PREFIX=${PREFIX} top_srcdir=${top_srcdir}/..); \
-		(cd `echo $$v | tr -d .` && ${MAKE} -f ../Makefile install-soaplib gsoap_version=$$v lang=cxx PREFIX=${PREFIX} top_srcdir=${top_srcdir}/..); \
+		${MAKE} -C `echo $$v | tr -d .` -f ../Makefile install-soaplib gsoap_version=$$v lang=c PREFIX=${PREFIX} top_srcdir=${top_srcdir}/.. || exit $?; \
+		${MAKE} -C `echo $$v | tr -d .` -f ../Makefile install-soaplib gsoap_version=$$v lang=cxx PREFIX=${PREFIX} top_srcdir=${top_srcdir}/.. || exit $?; \
 	done
 
 install-soaplib:
diff --git a/org.glite.security.gsoap-plugin/src/glite_gsplugin.c b/org.glite.security.gsoap-plugin/src/glite_gsplugin.c
index 463e529..711a4cd 100644
--- a/org.glite.security.gsoap-plugin/src/glite_gsplugin.c
+++ b/org.glite.security.gsoap-plugin/src/glite_gsplugin.c
@@ -32,7 +32,9 @@ static size_t glite_gsplugin_recv(struct soap *, char *, size_t);
 static int glite_gsplugin_send(struct soap *, const char *, size_t);
 static int glite_gsplugin_connect(struct soap *, const char *, const char *, int);
 static int glite_gsplugin_close(struct soap *);
+#if GSOAP_VERSION >= 20700
 static int glite_gsplugin_poll(struct soap *);
+#endif
 static int glite_gsplugin_accept(struct soap *, int, struct sockaddr *, int *);
 static int glite_gsplugin_posthdr(struct soap *soap, const char *key, const char *val);
 
@@ -207,8 +209,8 @@ glite_gsplugin(struct soap *soap, struct soap_plugin *p, void *arg)
 	soap->fclose		= glite_gsplugin_close;
 #if GSOAP_VERSION >= 20700
 	soap->fclosesocket	= NULL;
-#endif
 	soap->fpoll		= glite_gsplugin_poll;
+#endif
 	soap->faccept		= glite_gsplugin_accept;
 	soap->fsend			= glite_gsplugin_send;
 	soap->frecv			= glite_gsplugin_recv;
@@ -500,6 +502,7 @@ glite_gsplugin_send(struct soap *soap, const char *buf, size_t bufsz)
 }
 
 
+#if GSOAP_VERSION >= 20700
 static int
 glite_gsplugin_poll(struct soap *soap)
 {
@@ -528,6 +531,7 @@ glite_gsplugin_poll(struct soap *soap)
 		return SOAP_EOF;
 	}
 }
+#endif
 
 
 static int http_send_header(struct soap *soap, const char *s) {