From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 24 Jun 2010 04:36:20 +0000 (+0000)
Subject: Fix Fedora 13 compiling for libdbi/libdbd
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=968bf8018a4746cb4910278ae6891eff903fed9e;p=evergreen%2Ftadl.git

Fix Fedora 13 compiling for libdbi/libdbd

  * Add libdbi-devel as a prereq
  * Add Fedora's 64-bit location for the dbd driver libraries


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

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 32bbc58c50..7aab6a93de 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -163,6 +163,7 @@ FEDORA_13_RPMS = \
 	js-devel \
 	libdbi \
 	libdbi-dbd-pgsql \
+	libdbi-devel \
 	libssh2-devel \
 	libyaz \
 	libyaz-devel \
diff --git a/configure.ac b/configure.ac
index 889111c320..e1e1552db8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,7 +219,7 @@ AC_ARG_WITH([dbi],
 # If the passed in value doesn't work, fall back to reasonable defaults
 # Distributions are starting to package a good version of libdbi / libdbd
 if ! test -d "$DBI_LIBS"; then
-	for i in /usr/lib/dbd/ /usr/local/lib/dbd/ ; do
+	for i in /usr/lib/dbd/ /usr/lib64/dbd /usr/local/lib/dbd/ ; do
 		if test -d "$i"; then
 			DBI_LIBS="$i"
 			break
@@ -291,7 +291,7 @@ if test "x$openils_core" = "xtrue"; then
 	AC_CHECK_LIB([readline], [main], [], AC_MSG_ERROR(*** OpenILS requires libreadline))
 	AC_CHECK_LIB([xml2], [main], [], AC_MSG_ERROR(*** OpenILS requires libxml2))
 	AC_CHECK_LIB([xslt], [main], [], AC_MSG_ERROR(*** OpenILS requires libxslt))
-	AC_CHECK_LIB([perl], [main], [], AC_MSG_ERROR(*** OpenILS requires libperl-dev))
+#	AC_CHECK_LIB([perl], [main], [], AC_MSG_ERROR(*** OpenILS requires libperl-dev))
 	AC_CHECK_LIB([pq], [main], [], AC_MSG_ERROR(*** OpenILS requires libpq))