[open-ils-commits] r16800 - in trunk: . Open-ILS/src/extras (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-06-24 00:36:20 -0400 (Thu, 24 Jun 2010)
New Revision: 16800

Modified:
   trunk/Open-ILS/src/extras/Makefile.install
   trunk/configure.ac
Log:
Fix Fedora 13 compiling for libdbi/libdbd

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


Modified: trunk/Open-ILS/src/extras/Makefile.install
===================================================================
--- trunk/Open-ILS/src/extras/Makefile.install	2010-06-24 03:38:40 UTC (rev 16799)
+++ trunk/Open-ILS/src/extras/Makefile.install	2010-06-24 04:36:20 UTC (rev 16800)
@@ -163,6 +163,7 @@
 	js-devel \
 	libdbi \
 	libdbi-dbd-pgsql \
+	libdbi-devel \
 	libssh2-devel \
 	libyaz \
 	libyaz-devel \

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2010-06-24 03:38:40 UTC (rev 16799)
+++ trunk/configure.ac	2010-06-24 04:36:20 UTC (rev 16800)
@@ -219,7 +219,7 @@
 # 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 @@
 	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))