[asterisk-addons-commits] trunk r256 - in /trunk: acinclude.m4 configure

[asterisk-addons-commits at lists.digium.com]

Author: russell
Date: Tue Jul  4 18:47:37 2006
New Revision: 256

URL: http://svn.digium.com/view/asterisk-addons?rev=256&view=rev
Log:
also look literally in the directory specified by --with-lib=/path/to/dir
and not just in the lib directory inside of what is specified.  This is because
on some systems, people thought it was a good idea to put the mysqlclient lib
in places like /usr/lib/mysql, so this allows it to be found by running
configure with ./configure --with-mysqlclient=/usr/lib/mysql

Modified:
    trunk/acinclude.m4
    trunk/configure

Modified: trunk/acinclude.m4
URL: http://svn.digium.com/view/asterisk-addons/trunk/acinclude.m4?rev=256&r1=255&r2=256&view=diff
==============================================================================
--- trunk/acinclude.m4 (original)
+++ trunk/acinclude.m4 Tue Jul  4 18:47:37 2006
@@ -22,7 +22,7 @@
 if test "${USE_$4}" != "no"; then
    pbxlibdir=""
    if test "x${$4_DIR}" != "x"; then
-      pbxlibdir="-L${$1_DIR}/lib"
+      pbxlibdir="-L${$1_DIR} -L${$1_DIR}/lib"
    fi
    AC_CHECK_LIB([$1], [$2], [AST_$4_FOUND=yes], [AST_$4_FOUND=no], ${pbxlibdir} $6)
 

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk-addons/trunk/configure?rev=256&r1=255&r2=256&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Tue Jul  4 18:47:37 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 236 .
+# From configure.ac Revision: 252 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59e.
 #
@@ -5299,7 +5299,7 @@
 if test "${USE_CURSES}" != "no"; then
    pbxlibdir=""
    if test "x${CURSES_DIR}" != "x"; then
-      pbxlibdir="-L${curses_DIR}/lib"
+      pbxlibdir="-L${curses_DIR} -L${curses_DIR}/lib"
    fi
    { echo "$as_me:$LINENO: checking for initscr in -lcurses" >&5
 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6; }
@@ -5771,7 +5771,7 @@
 if test "${USE_MYSQLCLIENT}" != "no"; then
    pbxlibdir=""
    if test "x${MYSQLCLIENT_DIR}" != "x"; then
-      pbxlibdir="-L${mysqlclient_DIR}/lib"
+      pbxlibdir="-L${mysqlclient_DIR} -L${mysqlclient_DIR}/lib"
    fi
    { echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient" >&5
 echo $ECHO_N "checking for mysql_init in -lmysqlclient... $ECHO_C" >&6; }
@@ -6243,7 +6243,7 @@
 if test "${USE_NCURSES}" != "no"; then
    pbxlibdir=""
    if test "x${NCURSES_DIR}" != "x"; then
-      pbxlibdir="-L${ncurses_DIR}/lib"
+      pbxlibdir="-L${ncurses_DIR} -L${ncurses_DIR}/lib"
    fi
    { echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
 echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6; }