From 4f285c73e5e5aafb04ff11080563b73dfd0f533d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 22 Mar 2011 13:13:17 +0000 Subject: [PATCH] CFLAGS cleanup, HTTPD_FLAGS replaces httpd-specific cflags. --- org.glite.lb/configure | 2 ++ org.gridsite.core/src/Makefile | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/org.glite.lb/configure b/org.glite.lb/configure index 136cfc2..52b932d 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -806,6 +806,8 @@ for my $ext (keys %deps_aux) { 'gridsite.core' => { sl5_x86_64_gcc412 => { aprSuffix => '1' }, sl5_ia32_gcc412 => { aprSuffix => '1' }, + sl5_x86_64_gcc412EPEL => { aprSuffix => '1' }, + sl5_ia32_gcc412EPEL => { aprSuffix => '1' }, deb5_x86_64_gcc432 => { aprSuffix => '1.0' }, deb5_ia32_gcc432 => { aprSuffix => '1.0' }, slc4_x86_64_gcc346 => { aprSuffix => '0' }, diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile index f912ad5..b45945c 100644 --- a/org.gridsite.core/src/Makefile +++ b/org.gridsite.core/src/Makefile @@ -48,19 +48,20 @@ ifndef libdir export libdir=lib endif +CURL_CFLAGS=`curl-config --cflags` +CURL_LIBS=`curl-config --libs` +XML2_CFLAGS=`xml2-config --cflags` +XML2_LIBS=`xml2-config --libs` +HTTPD_FLAGS=-I/usr/include/httpd -I/usr/include/apache2 -I/usr/include/apr-0 -I/usr/include/apr-1 -I/usr/include/apr-1.0 + ifndef MYCFLAGS -export MYCFLAGS=-I. -I../interface -I/usr/include/httpd -I/usr/include/apache2 -I/usr/include/apr-0 -I/usr/include/apr-1 -I/usr/include/apr-1.0 -I/opt/glite/include -fPIC -DLINUX=2 -D_REENTRANT -D_LARGEFILE64_SOURCE $(HTTPD_FLAGS) +export MYCFLAGS=-I. -I../interface -fPIC -DLINUX=2 -D_REENTRANT -D_LARGEFILE64_SOURCE $(HTTPD_FLAGS) endif ifndef MYLDFLAGS export MYLDFLAGS=-L. endif -CURL_CFLAGS=`curl-config --cflags` -CURL_LIBS=`curl-config --libs` -XML2_CFLAGS=`xml2-config --cflags` -XML2_LIBS=`xml2-config --libs` - # # Build -- 1.8.2.3