adding support for alternate APR header dirs

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1932 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile
index 8fd5e603e47365d13bf4eedafba80f4d6e3d87c1..309eba8b176d4a2c8f99395c978aec5de70b5de5 100644 (file)
--- a/Open-ILS/src/Makefile
+++ b/Open-ILS/src/Makefile
@@ -1,12 +1,12 @@
 
 export TMPDIR                  = $(TMP)/opensrf
 export LDFLAGS                 = -L $(TMPDIR) -L .
-export CFLAGS                  = -pipe -g -Wall -O2 -fPIC -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) \
+export CFLAGS                  = -pipe -g -Wall -O2 -fPIC -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) \
                                                                -I$(LIBXML2_HEADERS)/libxml  -I$(TMP) -I$(TMPDIR)
 
 export INCDIR = "$(INCLUDEDIR)/openils/"
 
-all: msg mod_xmltools mod_ils_rest_gateway c_apps
+all: mod_xmltools mod_ils_rest_gateway c_apps
 
 
 

diff --git a/OpenSRF/src/Makefile b/OpenSRF/src/Makefile
index 47c86a9b870ca5ce16ca7f5c18c7de6c900b3969..8b331c7dfbc8b92b2b40d3fd355bad3749dcb9b6 100644 (file)
--- a/OpenSRF/src/Makefile
+++ b/OpenSRF/src/Makefile
@@ -11,7 +11,8 @@ export INCLUDEDIR             = $(PREFIX)/include
 export LDLIBS                  += 
 export LDFLAGS                 += -L $(TMPDIR) -L . -L /opt/lib
 export CFLAGS                  += -pipe -g -Wall -O2 -fPIC -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) \
-                                                               -I$(LIBXML2_HEADERS)/libxml  -I$(TMP) -I$(TMPDIR)
+                                                               -I$(LIBXML2_HEADERS)/libxml  -I$(TMP) \
+                                                               -I$(APR_HEADERS) -I$(TMPDIR)
 
 LIBOPENSRF                             = libopensrf.so
 

diff --git a/config.sh b/config.sh
index bfebcbf8080ddb4d9dc915b8451d5a2ff9a10e36..7363f4032372696ca2afc309f6c6c843a644892b 100755 (executable)
--- a/config.sh
+++ b/config.sh
@@ -67,6 +67,9 @@ function buildConfig {
        prompt "Apache2 headers directory [$APACHE2_HEADERS] "
        read X; if [ ! -z "$X" ]; then APACHE2_HEADERS="$X"; fi;
 
+       prompt "Apache2 APR headers directory [$APR_HEADERS] "
+       read X; if [ ! -z "$X" ]; then APR_HEADERS="$X"; fi;
+
        prompt "Libxml2 headers directory [$LIBXML2_HEADERS] "
        read X; if [ ! -z "$X" ]; then LIBXML2_HEADERS="$X"; fi;
 
@@ -110,6 +113,7 @@ function writeConfig {
        _write "TMP=\"$TMP\"";
        _write "APXS2=\"$APXS2\"";
        _write "APACHE2_HEADERS=\"$APACHE2_HEADERS\"";
+       _write "APR_HEADERS=\"$APR_HEADERS\"";
        _write "LIBXML2_HEADERS=\"$LIBXML2_HEADERS\"";
 
        _write "WEBDIR=\"$WEBDIR\"";

diff --git a/install.conf.default b/install.conf.default
index 336126997c818b52037d4c9bb4e6346989f75540..c1593c31a190c920407200f875b1d1f1ffd33c70 100644 (file)
--- a/install.conf.default
+++ b/install.conf.default
@@ -78,11 +78,12 @@ APXS2="/opt/bin/apxs";
 
 
 # --------------------------------------------------------------------
-# Directory where the Apache2 header files are located.  This must 
+# Directories where the Apache2 header files are located.  These must 
 # be set when building the mod_ils_gateway C plugin for allowing web 
 # access to the published API.
 # --------------------------------------------------------------------
 APACHE2_HEADERS="/opt/include/";
+APR_HEADERS="/opt/include/";
 
 
 # --------------------------------------------------------------------

diff --git a/install.sh b/install.sh
index f4cc6ca092553935def8d3a79330482ec7779785..c0139e80a8d71544e94d0ca75fb5af5acec8e502 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -116,7 +116,7 @@ function runInstall {
                echo "-------------- [ $target ] -------------------------------------------";
                echo ""
 
-               MAKE="make $verbose APXS2=$APXS2 PREFIX=$PREFIX TMP=$TMP \
+               MAKE="make $verbose APXS2=$APXS2 PREFIX=$PREFIX TMP=$TMP APR_HEADERS=$APR_HEADERS \
                        APACHE2_HEADERS=$APACHE2_HEADERS LIBXML2_HEADERS=$LIBXML2_HEADERS \
                        BINDIR=$BINDIR LIBDIR=$LIBDIR PERLDIR=$PERLDIR INCLUDEDIR=$INCLUDEDIR \
                        WEBDIR=$WEBDIR TEMPLATEDIR=$TEMPLATEDIR ETCDIR=$ETCDIR \