adding support for alternate APR header dirs
authormiker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 1 Nov 2005 17:57:04 +0000 (17:57 +0000)
committermiker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 1 Nov 2005 17:57:04 +0000 (17:57 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@1932 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/src/Makefile
OpenSRF/src/Makefile
config.sh
install.conf.default
install.sh

index 8fd5e60..309eba8 100644 (file)
@@ -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
 
 
 
index 47c86a9..8b331c7 100644 (file)
@@ -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
 
index bfebcbf..7363f40 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\"";
index 3361269..c1593c3 100644 (file)
@@ -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/";
 
 
 # --------------------------------------------------------------------
index f4cc6ca..c0139e8 100755 (executable)
@@ -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 \