LP2008252: Fix report output access when Shibboleth is enabled

[evergreen-equinox.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 53608d9..67596da 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ AC_SUBST([abs_top_builddir])
 #-----------------------------------
 
 
-AC_PROG_LIBTOOL
+LT_INIT
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -187,10 +187,7 @@ AC_ARG_WITH([libxml2],
 [LIBXML2_HEADERS=/usr/include/libxml2/])
 AC_SUBST([LIBXML2_HEADERS])
 
-AC_ARG_WITH([dbi],
-[  --with-dbi=path             location of the libdbi driver libraries (default is /usr/lib/x86_64-linux-gnu/dbd/)],
-[DBI_LIBS=${withval}],
-[DBI_LIBS=/usr/lib/x86_64-linux-gnu/dbd/])
+PKG_CHECK_MODULES([DBI], [dbi])
 
 AC_ARG_WITH([perlbase],
 [  --with-perlbase=path        base location to install Perl modules (default based on Config.pm)],
@@ -198,18 +195,6 @@ AC_ARG_WITH([perlbase],
 [PERL_BASE=x])
 AC_SUBST([PERL_BASE])
 
-# 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/lib64/dbd /usr/local/lib/dbd/ ; do
-        if test -d "$i"; then
-            DBI_LIBS="$i"
-            break
-        fi
-    done
-fi
-AC_SUBST([DBI_LIBS])
-
 AM_CONDITIONAL(CHECK_TESTS, test x$enable_tests = xyes)
 
 if test "x$openils_core" = "xtrue"; then
@@ -300,7 +285,6 @@ if test "x$openils_core" = "xtrue"; then
     # Checks for header files.
     #------------------------------------
 
-    AC_HEADER_STDC
     AC_CHECK_HEADERS([fcntl.h langinfo.h locale.h stdlib.h string.h unistd.h])
 
     #-------------------------------------------------------------------