diff options
author | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-24 08:04:59 +0000 |
---|---|---|
committer | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-24 08:04:59 +0000 |
commit | 0779bda0039cbf4db0e63770c09c67f6ad250305 (patch) | |
tree | 4b74466d44c17d45b122d9b06f1b47f9d8b1bf6b | |
parent | 5fd69945ddf7f199cb1b0db14b68d03f31fc3074 (diff) |
Allow x64 builds of H.323 (please, rebuild configure)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@51895 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | acinclude.m4 | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e165e4bab..1800cc69c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -146,13 +146,21 @@ if test "${HAS_PWLIB:-unset}" = "unset" ; then AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/share/pwlib/make) fi PWLIB_INCDIR="/usr/local/include" - PWLIB_LIBDIR="/usr/local/lib" + if test "x$LIB64" != "x"; then + PWLIB_LIBDIR="/usr/local/lib64" + else + PWLIB_LIBDIR="/usr/local/lib" + fi else AC_CHECK_FILE(/usr/include/ptlib.h, HAS_PWLIB=1, ) if test "${HAS_PWLIB:-unset}" != "unset" ; then AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/pwlib/make) PWLIB_INCDIR="/usr/include" - PWLIB_LIBDIR="/usr/lib" + if test "x$LIB64" != "x"; then + PWLIB_LIBDIR="/usr/lib64" + else + PWLIB_LIBDIR="/usr/lib" + fi fi fi fi @@ -177,12 +185,20 @@ if test "${HAS_PWLIB:-unset}" != "unset" ; then if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then PWLIBDIR="/usr/share/pwlib" PWLIB_INCDIR="/usr/include" - PWLIB_LIBDIR="/usr/lib" + if test "x$LIB64" != "x"; then + PWLIB_LIBDIR="/usr/lib64" + else + PWLIB_LIBDIR="/usr/lib" + fi fi if test "x$PWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then PWLIBDIR="/usr/local/share/pwlib" PWLIB_INCDIR="/usr/local/include" - PWLIB_LIBDIR="/usr/local/lib" + if test "x$LIB64" != "x"; then + PWLIB_LIBDIR="/usr/local/lib64" + else + PWLIB_LIBDIR="/usr/local/lib" + fi fi if test "${PWLIB_INCDIR:-unset}" = "unset"; then @@ -307,13 +323,21 @@ if test "${HAS_OPENH323:-unset}" = "unset" ; then if test "${HAS_OPENH323:-unset}" != "unset" ; then OPENH323DIR="/usr/local/share/openh323" OPENH323_INCDIR="/usr/local/include/openh323" - OPENH323_LIBDIR="/usr/local/lib" + if test "x$LIB64" != "x"; then + OPENH323_LIBDIR="/usr/local/lib64" + else + OPENH323_LIBDIR="/usr/local/lib" + fi else AC_CHECK_FILE(/usr/include/openh323/h323.h, HAS_OPENH323=1, ) if test "${HAS_OPENH323:-unset}" != "unset" ; then OPENH323DIR="/usr/share/openh323" OPENH323_INCDIR="/usr/include/openh323" - OPENH323_LIBDIR="/usr/lib" + if test "x$LIB64" != "x"; then + OPENH323_LIBDIR="/usr/lib64" + else + OPENH323_LIBDIR="/usr/lib" + fi fi fi fi |