aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-10-16 21:23:38 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-10-16 21:23:38 +0000
commit8161f11e1c4513afd9d4fc4a586bd81312cb9c07 (patch)
tree11af4c8e1adc6725b97a8e49a5fd46a5308bd16d /configure
parente4ca5ed34308510f52641ef5aaaeef5654908e31 (diff)
Change configure script to search for openais in
both /usr/lib and /usr/lib64 since some distros place 64-bit libraries only in the /usr/lib64 directory. (closes issue #13721) Reported by: jcollie Patches: 0007-Look-in-64bit-dirs-for-openais.patch uploaded by jcollie (license 412) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@150210 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure14
1 files changed, 7 insertions, 7 deletions
diff --git a/configure b/configure
index 5145d3bde..269d53fa2 100755
--- a/configure
+++ b/configure
@@ -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