ITS#2348 fix from HEAD

[openldap] / configure.in

diff --git a/configure.in b/configure.in
index 6681a20c5f14c620e9d3e10a89f9d82bcc3de85b..423459ba204c749ed0cb4b44ff965fc2b4ef21a5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1387,11 +1387,11 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
        -o $ol_with_threads = mach ; then
 
        dnl check for Mach CThreads
-       AC_CHECK_HEADERS(mach/cthreads.h cthread.h)
+       AC_CHECK_HEADERS(mach/cthreads.h cthreads.h)
        if test $ac_cv_header_mach_cthreads_h = yes ; then
                ol_with_threads=found
 
-               dnl check for cthread support in current $LIBS
+               dnl check for cthreads support in current $LIBS
                AC_CHECK_FUNC(cthread_fork,[ol_link_threads=yes])
 
                if test $ol_link_threads = no ; then
@@ -1412,6 +1412,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                        if test $ol_cv_cthread_all_load = yes ; then
                                LTHREAD_LIBS="$LTHREAD_LIBS -all_load"
                                ol_link_threads=mach
+                               ol_with_threads=found
                        fi
                fi
 
@@ -1430,6 +1431,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                if test $ol_link_threads = yes ; then
                        LTHREAD_LIBS="-lthreads"
                        ol_link_threads=mach
+                       ol_with_threads=found
                else
                        AC_MSG_ERROR([could not link with Mach CThreads])
                fi
@@ -1458,6 +1460,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                        AC_DEFINE(HAVE_GNU_PTH,1,[if you have GNU Pth])
                        LTHREAD_LIBS="$LTHREAD_LIBS -lpth"
                        ol_link_threads=pth
+                       ol_with_threads=found
 
                        if test $ol_with_yielding_select = auto ; then
                                ol_with_yielding_select=yes
@@ -1839,6 +1842,11 @@ if test $ol_with_cyrus_sasl != no ; then
                if test $have_cyrus_sasl != no ; then
                        SASL_LIBS="-lsasl"
                        AC_DEFINE(HAVE_CYRUS_SASL,1,[define if you have Cyrus SASL])
+                       OL_SASL_COMPAT
+                       if test $ol_cv_sasl_compat = no ; then
+                               ol_link_sasl=no
+                               AC_MSG_ERROR([Cyrus SASL library located but incompatible])
+                       fi
                        ol_link_sasl=yes
                fi
        fi
@@ -2101,16 +2109,12 @@ AC_CHECK_FUNCS(         \
 )
 
 dnl We actually may need to replace more than this.
-AC_REPLACE_FUNCS(getopt tempnam)
+AC_REPLACE_FUNCS(getopt)
 
 if test "$ac_cv_func_getopt" != yes; then
     LIBSRCS="$LIBSRCS getopt.c"
 fi
 
-if test "$ac_cv_func_tempnam" != yes; then
-    LIBSRCS="$LIBSRCS tempnam.c"
-fi
-
 dnl ----------------------------------------------------------------
 # Check Configuration
 OL_SYS_ERRLIST