From: Arran Cudbard-Bell Date: Fri, 1 Mar 2013 03:03:14 +0000 (-0500) Subject: Add extra search location for db2 X-Git-Tag: debian/3.0.0git+dfsg+moonshot3-2~70 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=commitdiff_plain;h=a5169a4f78b062356f3677e41f51c98b012cf9c5 Add extra search location for db2 --- diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure index e35af3a..66f3c79 100755 --- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure +++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure @@ -1843,7 +1843,7 @@ if test "${with_ibmdb2_dir+set}" = set; then : fi - smart_try_dir="$ibmdb2_lib_dir /usr/IBMdb2/V7.1/lib" + smart_try_dir="$ibmdb2_lib_dir /usr/local/db2/lib /usr/IBMdb2/V7.1/lib" ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2788,7 +2788,7 @@ fi fail="$fail libdb2" fi - smart_try_dir="$ibmdb2_include_dir /usr/IBMdb2/V7.1/include" + smart_try_dir="$ibmdb2_include_dir /usr/local/db2/include /usr/IBMdb2/V7.1/include" ac_safe=`echo "sqlcli.h" | sed 'y%./+-%__pm%'` diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.in b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.in index 3346085..a8b1a81 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.in +++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.in @@ -57,14 +57,14 @@ if test x$with_[]modname != xno; then esac]) dnl Check for SQLConnect in -ldb2 - smart_try_dir="$ibmdb2_lib_dir /usr/IBMdb2/V7.1/lib" + smart_try_dir="$ibmdb2_lib_dir /usr/local/db2/lib /usr/IBMdb2/V7.1/lib" FR_SMART_CHECK_LIB(db2, SQLConnect) if test "x$ac_cv_lib_db2_SQLConnect" != xyes; then fail="$fail libdb2" fi dnl Check for sqlcli.h - smart_try_dir="$ibmdb2_include_dir /usr/IBMdb2/V7.1/include" + smart_try_dir="$ibmdb2_include_dir /usr/local/db2/include /usr/IBMdb2/V7.1/include" FR_SMART_CHECK_INCLUDE(sqlcli.h) if test "x$ac_cv_header_sqlcli_h" != xyes; then fail="$fail sqlcli.h"