From: Marcel Poul <marcel.poul@cern.ch>
Date: Thu, 13 Sep 2012 11:27:37 +0000 (+0000)
Subject: make it built again with new header file canl_mod_ssl-private.h; When building it... 
X-Git-Tag: gridsite-core_R_2_0_0~12
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=9bfab0bf83d79f89c40842f70192cc0eb8e1afd7;p=jra1mw.git

make it built again with new header file canl_mod_ssl-private.h; When building it with caNl, print out all warnings (for now)
---

diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index d14ee91..dbfc8c0 100644
--- a/org.gridsite.core/src/Makefile
+++ b/org.gridsite.core/src/Makefile
@@ -80,12 +80,17 @@ endif
 
 # caNl adoption part
 # caNl library and headers have to be in standard system places.
+# Print all warnings
 ifeq ($(GRIDSITE_WITH_CANL),yes)
 GRST_X509_FILE=grst_canl_x509.c
 MOD_GRIDSITE_FILE=canl_mod_gridsite.c
+MOD_SSLPRIVATE_HEADER=canl_mod_ssl-private.h
 MYCANLLDFLAGS=-lcanl_c
+MYCFLAGS += -Wall
 else
+MOD_GRIDSITE_FILE=mod_gridsite.c
 GRST_X509_FILE=grst_x509.c
+MOD_SSLPRIVATE_HEADER=mod_ssl-private.h
 MYCANLLDFLAGS=
 endif
 
@@ -282,7 +287,8 @@ gridsite-copy.cgi: gridsite-copy.c libgridsite.so.$(VERSION)
             $(CURL_CFLAGS) $(CURL_LIBS) \
             $(MYFCGILIBS) -lgridsite
 
-mod_gridsite.so: ${MOD_GRIDSITE_FILE} mod_ssl-private.h libgridsite.so.$(VERSION)
+mod_gridsite.so: ${MOD_GRIDSITE_FILE} ${MOD_SSLPRIVATE_HEADER} \
+                 libgridsite.so.$(VERSION)
 	gcc -g $(MYCFLAGS) -shared -Wl,-soname=gridsite_module \
            -I/usr/kerberos/include \
            $(XML2_CFLAGS) -lcrypto -lssl ${MYCANLLDFLAGS} \