Merged revisions 46506 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r46506 | file | 2006-10-30 16:09:13 -0500 (Mon, 30 Oct 2006) | 2 lines

Don't explicitly link in crypt as it is not used on some platforms.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46507 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index b13b488ecd66b1df3cc05156106b079007d97260..97453b30d43ab5d0041652a6444bca52d844614a 100755 (executable)
--- a/configure
+++ b/configure
@@ -24336,7 +24336,7 @@ fi
 
 
    if test "${ac_cv_lib_pq_PQexec}" = "yes"; then
-      PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz -lcrypt"
+      PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz"
       PGSQL_INCLUDE="-I${PGSQL_includedir}"
       PBX_PGSQL=1
    fi

diff --git a/configure.ac b/configure.ac
index 0cc4ac56241456aa9f798cabeaf44b9f922b43b4..17f0959ff6bed931f23226c8562500c3028f212c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -632,7 +632,7 @@ if test "${PG_CONFIG}" != No; then
    [Define to indicate the PostgreSQL library]), [], -L${PGSQL_libdir} -lz)
 
    if test "${ac_cv_lib_pq_PQexec}" = "yes"; then
-      PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz -lcrypt"
+      PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz"
       PGSQL_INCLUDE="-I${PGSQL_includedir}"
       PBX_PGSQL=1
    fi