diff options
| -rwxr-xr-x | configure | 14 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 9 insertions, 9 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 147306 . +# From configure.ac Revision: 149427 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -205,7 +205,7 @@ if as_func_ret_failure; then echo as_func_ret_failure succeeded. fi -if (set x; as_func_ret_success y && test x = \"\$1\" ); then +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then : else exitcode=1 @@ -409,7 +409,7 @@ if as_func_ret_failure; then echo as_func_ret_failure succeeded. fi -if (set x; as_func_ret_success y && test x = \"\$1\" ); then +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then : else exitcode=1 @@ -6586,7 +6586,7 @@ else GNU_MAKE_VERSION_MINOR=0 ; for a in make gmake gnumake ; do if test -z "$a" ; then continue ; fi ; - if (sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then + if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then GNU_MAKE=$a ; GNU_MAKE_VERSION_MAJOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f3 -d' ' | cut -f1 -d'.'` GNU_MAKE_VERSION_MINOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f2 -d'.' | cut -c1-2` @@ -43188,7 +43188,7 @@ if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lSaClm ${pbxlibdir} -L/usr/lib/openais $LIBS" +LIBS="-lSaClm ${pbxlibdir} -L/usr/lib/openais -L/usr/lib64/openais $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -43254,7 +43254,7 @@ fi # now check for the header. if test "${AST_OPENAIS_FOUND}" = "yes"; then - OPENAIS_LIB="${pbxlibdir} -lSaClm -L/usr/lib/openais" + OPENAIS_LIB="${pbxlibdir} -lSaClm -L/usr/lib/openais -L/usr/lib64/openais" # if --with-OPENAIS=DIR has been specified, use it. if test "x${OPENAIS_DIR}" != "x"; then OPENAIS_INCLUDE="-I${OPENAIS_DIR}/include" @@ -43435,7 +43435,7 @@ if test "${PBX_OPENAIS}" = 1; then AIS_LIB="-lSaEvt ${OPENAIS_LIB}" else AIS_INCLUDE="-I/usr/include/openais" - AIS_LIB="-lSaClm -lSaEvt -L/usr/lib/openais" + AIS_LIB="-lSaClm -lSaEvt -L/usr/lib/openais -L/usr/lib64/openais" fi fi diff --git a/configure.ac b/configure.ac index 30bcd9db2..426db49d3 100644 --- a/configure.ac +++ b/configure.ac @@ -1410,7 +1410,7 @@ PBX_AIS=0 # OpenAIS installs its libraries into /usr/lib/openais by default, so check there -AST_EXT_LIB_CHECK([OPENAIS], [SaClm], [saClmInitialize], [openais/saClm.h], [-L/usr/lib/openais]) +AST_EXT_LIB_CHECK([OPENAIS], [SaClm], [saClmInitialize], [openais/saClm.h], [-L/usr/lib/openais -L/usr/lib64/openais]) if test "${PBX_OPENAIS}" = 1; then PBX_AIS=1 @@ -1419,7 +1419,7 @@ if test "${PBX_OPENAIS}" = 1; then AIS_LIB="-lSaEvt ${OPENAIS_LIB}" else AIS_INCLUDE="-I/usr/include/openais" - AIS_LIB="-lSaClm -lSaEvt -L/usr/lib/openais" + AIS_LIB="-lSaClm -lSaEvt -L/usr/lib/openais -L/usr/lib64/openais" fi fi |