From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Tue, 4 Oct 2005 11:23:00 +0000 (+0000)
Subject: add apr-include dirs for Apache2 (see #900)
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29825788df9f99f9fe2ade9c55862acc0eb6b0a0;p=sope

add apr-include dirs for Apache2 (see #900)


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1152 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sope-appserver/mod_ngobjweb/ChangeLog b/sope-appserver/mod_ngobjweb/ChangeLog
index 6ecca576..e457e4ac 100644
--- a/sope-appserver/mod_ngobjweb/ChangeLog
+++ b/sope-appserver/mod_ngobjweb/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-04  Helge Hess  <helge.hess@skyrix.com>
+
+	* GNUmakefile: add APR include dirs if apr-config can be found (this is
+	  for Apache2 only) (OGo bug #900)
+
 2005-08-01  Helge Hess  <helge.hess@skyrix.com>
 
 	* scanhttp.c, sns.c: fixed gcc 4.0 warnings
diff --git a/sope-appserver/mod_ngobjweb/GNUmakefile b/sope-appserver/mod_ngobjweb/GNUmakefile
index c9fafeec..ed0f7456 100644
--- a/sope-appserver/mod_ngobjweb/GNUmakefile
+++ b/sope-appserver/mod_ngobjweb/GNUmakefile
@@ -7,7 +7,9 @@
 
 APACHE = /usr
 APXS   = $(APACHE)/sbin/apxs
+APR    = 
 
+# lowercase are commandline args (eg make apxs=/usr/bin/apxs)
 ifneq ($(apxs),no)
 ifneq ($(apxs),yes)
 ifneq ($(apxs),)
@@ -22,6 +24,21 @@ else
 APXS=
 endif
 
+# lowercase are commandline args (eg make apr=/usr/bin/apr)
+ifneq ($(apr),no)
+ifneq ($(apr),yes)
+ifneq ($(apr),)
+APR=$(apr)
+else
+APR=$(shell which apr-config 2>/dev/null)
+endif
+else
+APR=$(shell which apr-config 2>/dev/null)
+endif
+else
+APR=
+endif
+
 ifeq ($(APXS),)
 APXS=$(shell which apxs2 2>/dev/null)
 ifeq ($(APXS),)
@@ -50,13 +67,19 @@ APXS_CFLAGS="-DSHARED_MODULE -O2 -DEAPI_MM -fPIC -D_LARGEFILE_SOURCE -D_FILE_OFF
 
 endif
 
+ifneq ($(APR),)
+APR_INCLUDE_DIRS = -I$(shell $(APR) --includedir)
+endif
+
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)/Library/WOAdaptors/Apache
 
 CC            = gcc
 LD            = gcc
 SHARED_LIBEXT = .so
 
-CFLAGS  = -Wall -I. -fPIC $(APXS_CFLAGS) $(APXS_INCLUDE_DIRS)
+CFLAGS  = -Wall -I. -fPIC \
+	$(APXS_CFLAGS) $(APXS_INCLUDE_DIRS) $(APR_INCLUDE_DIRS)
+
 LDFLAGS = $(APXS_LDFLAGS) -shared -fPIC
 
 # adaptor
@@ -78,7 +101,7 @@ clean ::
 	rm -f *.o $(product) *.so *~
 
 distclean :: clean
-	
+
 
 apache-dir :
 	$(MKDIRS) $(GNUSTEP_INSTALLATION_DIR)