Relocatable httpd build patch

diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES
index e0fc482..e37c332 100644 (file)
--- a/org.gridsite.core/CHANGES
+++ b/org.gridsite.core/CHANGES
@@ -1,3 +1,6 @@
+* Mon Apr 10 2006 Andrew McNab <Andrew.McNab@man.ac.uk>
+- Patch from Alberto di Meglio <alberto.di.meglio@cern.ch>
+  to allow use of relocated httpd include files.
 * Mon Apr  3 2006 Andrew McNab <Andrew.McNab@man.ac.uk>
 - Use dist for building tar balls
 * Mon Apr  3 2006 Andrew McNab <Andrew.McNab@man.ac.uk>

diff --git a/org.gridsite.core/project/configure.properties.xml b/org.gridsite.core/project/configure.properties.xml
index 6cc728b..44d8dac 100644 (file)
--- a/org.gridsite.core/project/configure.properties.xml
+++ b/org.gridsite.core/project/configure.properties.xml
@@ -4,6 +4,6 @@
 
        <project name="configure options">
         <property name="build.make.arguments"
-               value="prefix=${stage.abs.dir} GSOAPDIR=${ext.gsoap.subdir} OPENSSL_GLOBUS_FLAGS=-I${with.globus.prefix}/include/${with.globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${with.globus.prefix}/lib/ FLAVOR_GLOBUS_EXT=_${with.globus.dbg.nothr.flavor}" />
+               value="prefix=${stage.abs.dir} GSOAPDIR=${ext.gsoap.subdir} OPENSSL_GLOBUS_FLAGS=-I${with.globus.prefix}/include/${with.globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${with.globus.prefix}/lib/ FLAVOR_GLOBUS_EXT=_${with.globus.dbg.nothr.flavor} HTTPD_FLAGS=${with.httpd.prefix}/include/httpd" />
        </project>
 

diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index 6fee567..978e343 100644 (file)
--- a/org.gridsite.core/src/Makefile
+++ b/org.gridsite.core/src/Makefile
@@ -44,8 +44,12 @@ ifndef prefix
 export prefix=/usr/local
 endif
 
+ifndef HTTPD_FLAGS
+export HTTPD_FLAGS=/usr/include/httpd
+endif
+
 ifndef MYCFLAGS
-export MYCFLAGS=-I. -I../interface -I/usr/include/httpd -I/usr/include/apr-0 -I/opt/glite/include -fPIC
+export MYCFLAGS=-I. -I../interface -I$(HTTPD_FLAGS) -I/usr/include/apr-0 -I/opt/glite/include -fPIC
 endif
 
 ifndef MYLDFLAGS