[svn-commits] qwell: trunk r103694 - in /trunk: ./ include/asterisk/

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu Feb 14 15:21:53 2008
New Revision: 103694

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103694
Log:
Modify ldap autoconf function, so that an incorrect ldap library is not found on Solaris (it is incompatible).
Also removes second check for awk, which causes Solaris to find an incompatible version of awk.

(closes issue #11829)
Reported by: snuffy
Patches:
      bug-11829.diff uploaded by snuffy (license 35)

Modified:
    trunk/configure
    trunk/configure.ac
    trunk/include/asterisk/autoconfig.h.in

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=103694&r1=103693&r2=103694
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Feb 14 15:21:53 2008
@@ -150,7 +150,6 @@
 fi
 AC_SUBST(GNU_LD)
 
-AC_PATH_PROG([AWK], [awk], :)
 AC_PATH_PROG([GREP], [grep], :)
 AC_PATH_PROG([FIND], [find], :)
 AC_PATH_PROG([COMPRESS], [compress], :)
@@ -817,7 +816,7 @@
 # Needed by unixodbc
 AST_EXT_LIB_CHECK([LTDL], [ltdl], [lt_dlinit], [ltdl.h], [])
 
-AST_EXT_LIB_CHECK([LDAP], [ldap], [ldap_first_attribute], [ldap.h])
+AST_EXT_LIB_CHECK([LDAP], [ldap], [ldap_initialize], [ldap.h])
 
 AST_EXT_LIB_CHECK([MISDN], [mISDN], [mISDN_open], [mISDNuser/mISDNlib.h])
 

Modified: trunk/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/autoconfig.h.in?view=diff&rev=103694&r1=103693&r2=103694
==============================================================================
--- trunk/include/asterisk/autoconfig.h.in (original)
+++ trunk/include/asterisk/autoconfig.h.in Thu Feb 14 15:21:53 2008
@@ -1175,6 +1175,9 @@
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
 
 /* Define like PROTOTYPES; this can be used by system headers. */
 #undef __PROTOTYPES