From 6dcf28d1c9a0f0221000a27ff5a37bb911678e20 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 14 Aug 2007 17:36:32 +0000 Subject: [PATCH] fixed redhat5 compilation git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1528 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/mod_ngobjweb/ChangeLog | 5 +++++ sope-appserver/mod_ngobjweb/GNUmakefile | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sope-appserver/mod_ngobjweb/ChangeLog b/sope-appserver/mod_ngobjweb/ChangeLog index 367884b5..acac6fb9 100644 --- a/sope-appserver/mod_ngobjweb/ChangeLog +++ b/sope-appserver/mod_ngobjweb/ChangeLog @@ -1,3 +1,8 @@ +2007-07-19 Wolfgang Sourdeau + + * GNUmakefile: include APR CFLAGS and LDFLAGS in compilation (fixes OGo + bug #1886) + 2007-07-06 Marcus Mueller * handler.c: fixed compilation for Apache 2.2.x. No heavy testing has diff --git a/sope-appserver/mod_ngobjweb/GNUmakefile b/sope-appserver/mod_ngobjweb/GNUmakefile index ed0f7456..0d80445c 100644 --- a/sope-appserver/mod_ngobjweb/GNUmakefile +++ b/sope-appserver/mod_ngobjweb/GNUmakefile @@ -69,6 +69,8 @@ endif ifneq ($(APR),) APR_INCLUDE_DIRS = -I$(shell $(APR) --includedir) +APR_CFLAGS = $(shell $(APR) --cppflags) +APR_LDFLAGS = $(shell $(APR) --ldflags --libs) endif GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)/Library/WOAdaptors/Apache @@ -78,9 +80,10 @@ LD = gcc SHARED_LIBEXT = .so CFLAGS = -Wall -I. -fPIC \ - $(APXS_CFLAGS) $(APXS_INCLUDE_DIRS) $(APR_INCLUDE_DIRS) + $(APXS_CFLAGS) $(APR_CFLAGS) \ + $(APXS_INCLUDE_DIRS) $(APR_INCLUDE_DIRS) -LDFLAGS = $(APXS_LDFLAGS) -shared -fPIC +LDFLAGS = $(APXS_LDFLAGS) $(APR_LDFLAGS) -shared -fPIC # adaptor -- 2.39.5