packages: asterisk/lpc10-system.patch - avoid /usr/lib poison on lib64 systems

[glen]

Author: glen                         Date: Thu Dec 31 18:49:14 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- avoid /usr/lib poison on lib64 systems

---- Files affected:
packages/asterisk:
   lpc10-system.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/asterisk/lpc10-system.patch
diff -u packages/asterisk/lpc10-system.patch:1.1 packages/asterisk/lpc10-system.patch:1.2
--- packages/asterisk/lpc10-system.patch:1.1	Thu Dec 31 13:27:11 2009
+++ packages/asterisk/lpc10-system.patch	Thu Dec 31 19:49:09 2009
@@ -64,7 +64,7 @@
  AST_EXT_LIB_SETUP([GTK], [gtk libraries], [gtk])
  AST_EXT_LIB_SETUP([GTK2], [gtk2 libraries], [gtk2])
  AST_EXT_LIB_SETUP([GMIME], [GMime library], [gmime])
-@@ -712,6 +713,63 @@
+@@ -712,6 +713,72 @@
     fi
  fi
  
@@ -72,6 +72,15 @@
 +AC_SUBST(LPC10_INTERNAL)
 +LPC10_SYSTEM="yes"
 +if test "${USE_LPC10}" != "no"; then
++   case "$host_cpu" in
++   x86_64|s390x)
++       _lib=lib64
++       ;;
++   *)
++       _lib=lib
++       ;;
++   esac
++
 +   if test "${LPC10_DIR}" = "internal"; then
 +      LPC10_SYSTEM="no"
 +   elif test "${LPC10_DIR}" != ""; then
@@ -80,8 +89,8 @@
 +   if test "${LPC10_SYSTEM}" = "yes"; then
 +      lpc10libdir=""
 +      if test "x${LPC10_DIR}" != "x"; then
-+         if test -d ${LPC10_DIR}/lib; then
-+            lpc10libdir="-L${LPC10_DIR}/lib"
++         if test -d ${LPC10_DIR}/${_lib}; then
++            lpc10libdir="-L${LPC10_DIR}/${_lib}"
 +         else
 +            lpc10libdir="-L${LPC10_DIR}"
 +         fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/lpc10-system.patch?r1=1.1&r2=1.2&f=u