From 2556ab63cbc4098ee2534f7ab21bdfc88e6b0b6a Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 16 Oct 2008 21:24:47 +0000
Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@150211 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 configure    | 8 ++++----
 configure.ac | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 7134cf93b4..dd02b448c3 100755
--- a/configure
+++ b/configure
@@ -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
 
diff --git a/configure.ac b/configure.ac
index 41f4e385a1..9a44725f37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1387,7 +1387,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
@@ -1396,7 +1396,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