From: Alberto Di Meglio <alberto.di.meglio@cern.ch>
Date: Wed, 19 Apr 2006 09:44:29 +0000 (+0000)
Subject: Added fix for httpd location resolution
X-Git-Tag: gridsite-core_R_1_1_18_ETICS~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=16f98626524b880e9ab2793ede4b222d8133dfe0;p=jra1mw.git

Added fix for httpd location resolution
---

diff --git a/org.gridsite.core/project/configure.properties.xml b/org.gridsite.core/project/configure.properties.xml
index 6cc728b..ec2f8ad 100644
--- 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/project/version.properties b/org.gridsite.core/project/version.properties
index 8103a38..da633cf 100644
--- a/org.gridsite.core/project/version.properties
+++ b/org.gridsite.core/project/version.properties
@@ -1,2 +1,2 @@
 module.version=1.1.18 
-module.age=1
+module.age=1_etics
diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index 7cd43f6..0b1d213 100644
--- 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