diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-16 21:24:47 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-16 21:24:47 +0000 |
commit | c17227553064a37808ef76b011be0ed69c9fe5b2 (patch) | |
tree | 9d45f5888c43ce3575361f271ea38baf3829c9db /configure | |
parent | c3dc265b337814280db7a436a680fee0c2fc7cb0 (diff) |
Merged revisions 150210 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r150210 | mmichelson | 2008-10-16 16:23:38 -0500 (Thu, 16 Oct 2008) | 12 lines
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/branches/1.6.1@150211 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 145694 . +# From configure.ac Revision: 147811 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -42874,7 +42874,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 @@ -42940,7 +42940,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" @@ -43121,7 +43121,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 |