Patch from Dan Scott:

Current SVN has libdbi hardcoded to a location of /usr/local/lib/dbd
but one of these days a distro is going to ship a version of libdbi
that's new enough _and_ that had libdbdpgsql.so linked to libdbi.so to
our satisfaction, and it won't be in /usr/local/lib/dbd -- so we might
as well prepare ourselves now.

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

diff --git a/Open-ILS/src/c-apps/Makefile b/Open-ILS/src/c-apps/Makefile
index 4006a0c..775d75e 100644 (file)
--- a/Open-ILS/src/c-apps/Makefile
+++ b/Open-ILS/src/c-apps/Makefile
@@ -1,4 +1,5 @@
 LDLIBS += -lobjson -lopensrf #-lfieldmapper 
+LDFLAGS += -L$(DBI_LIBS)
 CFLAGS += -DOSRF_LOG_PARAMS
 
 #all:  oils_auth.so oils_fetch.so oils_cstore.so
@@ -18,21 +19,18 @@ oils_dataloader:    oils_dataloader.o
 
 oils_cstore.so:        oils_cstore.o liboils_utils.so liboils_idl.so
        @echo $@
-       $(CC) -shared -W1 -L/usr/local/lib/dbd \
-               $(LDLIBS) $(LDFLAGS) -loils_idl -ldbi -loils_utils -ldbdpgsql oils_cstore.o -o $(TMP)/$@
+       $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) -loils_idl -ldbi -loils_utils -ldbdpgsql oils_cstore.o -o $(TMP)/$@
 
 oils_rstore.o: oils_cstore.c oils_utils.h
        $(CC) $(CFLAGS) -I$(TMP) -DRSTORE -c -o $@ oils_cstore.c 
 
 oils_rstore.so:        oils_rstore.o liboils_utils.so liboils_idl.so
        @echo $@
-       $(CC) -shared -W1 -L/usr/local/lib/dbd \
-               $(LDLIBS) $(LDFLAGS) -loils_idl -ldbi -ldbdpgsql oils_rstore.o -o $(TMP)/$@
+       $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) -loils_idl -ldbi -ldbdpgsql oils_rstore.o -o $(TMP)/$@
 
 oils_fetch.so: oils_fetch.o liboils_utils.so
        @echo $@
-       $(CC) -shared -W1 -L/usr/local/lib/dbd \
-               $(LDLIBS) $(LDFLAGS) -ldbi -ldbdpgsql -loils_utils oils_fetch.o -o $(TMP)/$@
+       $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) -ldbi -ldbdpgsql -loils_utils oils_fetch.o -o $(TMP)/$@
 
 oils_idl-core.o:       oils_idl-core.c oils_idl.h
 

diff --git a/config.sh b/config.sh
index f1aeb78..b40845c 100755 (executable)
--- a/config.sh
+++ b/config.sh
@@ -77,6 +77,9 @@ function buildConfig {
        prompt "Apache2 APR headers directory [$APR_HEADERS] "
        read X; if [ ! -z "$X" ]; then APR_HEADERS="$X"; fi;
 
+       prompt "Libdbi libraries directory [$DBI_LIBS] "
+       read X; if [ ! -z "$X" ]; then DBI_LIBS="$X"; fi;
+
        prompt "Libxml2 headers directory [$LIBXML2_HEADERS] "
        read X; if [ ! -z "$X" ]; then LIBXML2_HEADERS="$X"; fi;
 
@@ -139,6 +142,7 @@ function writeConfig {
        _write "APXS2=\"$APXS2\"";
        _write "APACHE2_HEADERS=\"$APACHE2_HEADERS\"";
        _write "APR_HEADERS=\"$APR_HEADERS\"";
+       _write "DBI_LIBS=\"$DBI_LIBS\"";
        _write "LIBXML2_HEADERS=\"$LIBXML2_HEADERS\"";
 
        _write "OPENSRF_HEADERS=\"$OPENSRF_HEADERS\"";

diff --git a/install.conf.default b/install.conf.default
index 4303729..3133a88 100644 (file)
--- a/install.conf.default
+++ b/install.conf.default
@@ -77,6 +77,12 @@ APR_HEADERS="/usr/include/apr-1.0/";
 
 
 # --------------------------------------------------------------------
+# Directory where the libdbi libraries are located. libdbi is used
+# by the OpenILS cstore, fetch, and rstore applications
+# --------------------------------------------------------------------
+DBI_LIBS="/usr/local/lib/dbd";
+
+# --------------------------------------------------------------------
 # Directory where the libxml2 headers are located.  Libxml2 is used
 # by various components
 # --------------------------------------------------------------------

diff --git a/install.sh b/install.sh
index 91150cf..290496a 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -114,7 +114,7 @@ function runInstall {
 
                MAKE="make $verbose APXS2=$APXS2 PREFIX=$PREFIX TMP=$TMP APR_HEADERS=$APR_HEADERS \
                        APACHE2_HEADERS=$APACHE2_HEADERS LIBXML2_HEADERS=$LIBXML2_HEADERS DBPORT=$DBPORT\
-                       BINDIR=$BINDIR LIBDIR=$LIBDIR PERLDIR=$PERLDIR INCLUDEDIR=$INCLUDEDIR \
+                       BINDIR=$BINDIR DBI_LIBS=$DBI_LIBS LIBDIR=$LIBDIR PERLDIR=$PERLDIR INCLUDEDIR=$INCLUDEDIR \
                        WEBDIR=$WEBDIR TEMPLATEDIR=$TEMPLATEDIR ETCDIR=$ETCDIR REPORTERDIR=$REPORTERDIR\
                        OPENSRF_HEADERS=$OPENSRF_HEADERS OPENSRF_LIBS=$OPENSRF_LIBS OPENILSDIR=$OPENILSDIR EVERGREENDIR=$EVERGREENDIR \
                        CIRCRULESDIR=$CIRCRULESDIR CATALOGSCRIPTDIR=$CATALOGSCRIPTDIR CGIDIR=$CGIDIR \