kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-15 22:38:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 150210 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@150211 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-10-16 21:24:47 +00:00
parent 5f5136952e
commit 2556ab63cb
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 145694 . # From configure.ac Revision: 147811 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6. # 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 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS 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 cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@@ -42940,7 +42940,7 @@ fi
# now check for the header. # now check for the header.
if test "${AST_OPENAIS_FOUND}" = "yes"; then 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 --with-OPENAIS=DIR has been specified, use it.
if test "x${OPENAIS_DIR}" != "x"; then if test "x${OPENAIS_DIR}" != "x"; then
OPENAIS_INCLUDE="-I${OPENAIS_DIR}/include" OPENAIS_INCLUDE="-I${OPENAIS_DIR}/include"
@@ -43121,7 +43121,7 @@ if test "${PBX_OPENAIS}" = 1; then
AIS_LIB="-lSaEvt ${OPENAIS_LIB}" AIS_LIB="-lSaEvt ${OPENAIS_LIB}"
else else
AIS_INCLUDE="-I/usr/include/openais" 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
fi fi

4
configure.ac
View File

@@ -1387,7 +1387,7 @@ PBX_AIS=0
# OpenAIS installs its libraries into /usr/lib/openais by default, so check there # 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 if test "${PBX_OPENAIS}" = 1; then
PBX_AIS=1 PBX_AIS=1
@@ -1396,7 +1396,7 @@ if test "${PBX_OPENAIS}" = 1; then
AIS_LIB="-lSaEvt ${OPENAIS_LIB}" AIS_LIB="-lSaEvt ${OPENAIS_LIB}"
else else
AIS_INCLUDE="-I/usr/include/openais" 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
fi fi