Changeset 19292

Timestamp:

2009-04-29T23:15:32+12:00 (15 years ago)

Author:

davidb

Message:

Adjustment to -I flags to compile mod_gsdl.cpp/so so it can find the apr and apr-util files included in the apache-httpd source directory

File:

• gsdl/trunk/runtime-src/src/recpt/Makefile.in (modified) (2 diffs)

gsdl/trunk/runtime-src/src/recpt/Makefile.in

@@ -79 +79 @@
 APACHE_OBJS = string_pool.o mod_gsdl.o
 
-APXS=$(GSDL_DIR)/apache-httpd/$(GSDLOS)/bin/apxs
-APXS_CFLAGS=`$(APXS) -q CFLAGS`   
-APXS_CFLAGS_SHLIB=`$(APXS) -q CFLAGS_SHLIB`   
-APXS_INCLUDEDIR=`$(APXS) -q INCLUDEDIR`   
-APXS_LIBEXECDIR=`$(APXS) -q LIBEXECDIR`
-APXS_LDFLAGS_SHLIB=`$(APXS) -q LDFLAGS_SHLIB`
-APXS_SYSCONFDIR=`$(APXS) -q SYSCONFDIR`
-APXS_LIBS_SHLIB=`$(APXS) -q LIBS_SHLIB`
+APACHE_INSTDIR=$(GSDL_DIR)/apache-httpd/$(GSDLOS)
+APACHE_SRCLIBDIR=../../packages/apache-httpd/httpd-2.2.11/srclib
+
+APXS_CFLAGS=-I$(APACHE_INSTDIR)/include \
+  -I$(APACHE_SRCLIBDIR)/apr/include -I$(APACHE_SRCLIBDIR)/apr-util/include
+
+APXS_LDFLAGS= -L$(APACHE_INSTDIR)/lib \
+  -L$(APACHE_SRCLIBDIR)/apr/include -L$(APACHE_SRCLIBDIR)/apr-util/include
+
 APACHE_MODULE = mod_gsdl.so
 else
 APACHE_OBJS =
-APACHE_MODULE = mod_gsdl.so
+APACHE_MODULE =
 endif
 
@@ -235 +236 @@
 
 mod_gsdl.o: mod_gsdl.cpp
-    $(CXX) -c  $(CXXFLAGS) $(DEFS) $(INCLUDES) -D_APACHE_MOD=2 -fPIC -I$(APXS_INCLUDEDIR) -I. -iquote $(APXS_CFLAGS) $(APXS_CFLAGS_SHLIB) -Wall -o $@ $< 
+    $(CXX) -c  $(CXXFLAGS) $(DEFS) $(INCLUDES) -D_APACHE_MOD=2 -fPIC $(APXS_CFLAGS) -Wall -o $@ $< 
 
 mod_gsdl.so: $(APACHE_OBJS) $(LIBRARY)
-    $(CXX) -fPIC -shared -o $@ $(APACHE_OBJS) $(APXS_LIBS_SHLIB) $(LIBRARY) $(GSDL_LIBS) $(LIBS)
+    $(CXX) -fPIC -shared -o $@ $(APACHE_OBJS) $(LIBRARY) $(GSDL_LIBS) $(LIBS)