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)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103694 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Jason Parker 18 years ago
parent 8f625a4664
commit 85c7af3810

11991
configure vendored

File diff suppressed because it is too large Load Diff

@ -150,7 +150,6 @@ if test "x$with_gnu_ld" = "xyes" ; then
fi fi
AC_SUBST(GNU_LD) AC_SUBST(GNU_LD)
AC_PATH_PROG([AWK], [awk], :)
AC_PATH_PROG([GREP], [grep], :) AC_PATH_PROG([GREP], [grep], :)
AC_PATH_PROG([FIND], [find], :) AC_PATH_PROG([FIND], [find], :)
AC_PATH_PROG([COMPRESS], [compress], :) AC_PATH_PROG([COMPRESS], [compress], :)
@ -817,7 +816,7 @@ AST_EXT_LIB_CHECK([JACK], [jack], [jack_activate], [jack/jack.h])
# Needed by unixodbc # Needed by unixodbc
AST_EXT_LIB_CHECK([LTDL], [ltdl], [lt_dlinit], [ltdl.h], []) 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]) AST_EXT_LIB_CHECK([MISDN], [mISDN], [mISDN_open], [mISDNuser/mISDNlib.h])

@ -1175,6 +1175,9 @@
#ifndef _POSIX_PTHREAD_SEMANTICS #ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS
#endif #endif
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Define like PROTOTYPES; this can be used by system headers. */ /* Define like PROTOTYPES; this can be used by system headers. */
#undef __PROTOTYPES #undef __PROTOTYPES

Loading…
Cancel
Save