[asterisk-commits] mmichelson: branch 1.6.1 r150211 - in /branches/1.6.1: ./ configure configure.ac

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Oct 16 16:24:47 2008
New Revision: 150211

URL: http://svn.digium.com/view/asterisk?view=rev&rev=150211
Log:
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)



........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/configure
    branches/1.6.1/configure.ac

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/configure.ac?view=diff&rev=150211&r1=150210&r2=150211
==============================================================================
--- branches/1.6.1/configure.ac (original)
+++ branches/1.6.1/configure.ac Thu Oct 16 16:24:47 2008
@@ -1387,7 +1387,7 @@
 
 # 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 @@
       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