Import op -> slap_op , conn -> slap_conn change from rel eng 1.1.

[openldap] / configure.in

diff --git a/configure.in b/configure.in
index f15b65667955f951fa4cd58c40da7f07aa6f81f0..8c240b3b6ff89c36786b1f85df3238b11199efb2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ dnl
 dnl Configure.in for OpenLDAP
 AC_INIT(include/ldap.h)dnl
 AC_CONFIG_AUX_DIR(build)dnl
-AM_INIT_AUTOMAKE(openldap,[1.1], [no ac_define])dnl
+AM_INIT_AUTOMAKE(openldap,[1.2], [no ac_define])dnl
 
 dnl Do not use AutoConf 2.12; it produces a configuration script
 dnl that causes an "internal 2K buffer" error on HPUX when run
@@ -274,11 +274,11 @@ dnl Check for resolver routines
 AC_CHECK_FUNCS(res_search)
 if test $ac_cv_func_res_search = "no" ; then 
        AC_CHECK_LIB(bind, res_search)
-       if test $ac_cv_libac_cv_lib_bind_res_search = "yes" ; then
+       if test "$ac_cv_lib_bind_res_search" = "yes" ; then
                AC_DEFINE(HAVE_RES_SEARCH,1)
        else
                AC_CHECK_LIB(resolv, res_search)
-               if test $ac_cv_libac_cv_lib_resolv_res_search = "yes" ; then
+               if test "$ac_cv_lib_resolv_res_search" = "yes" ; then
                        AC_DEFINE(HAVE_RES_SEARCH,1)
                fi
        fi
@@ -582,11 +582,11 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                        if test $ac_cv_func_sched_yield = no -a \
                                $ac_cv_func_pthread_yield = no ; then
                                AC_MSG_WARN([could not locate sched_yield() or pthread_yield()])
-                               AC_MSG_ERROR([POSIX Threads are not usable])
                        fi
 
                        dnl Check functions for compatibility
-                       AC_CHECK_FUNCS(pthread_kill)
+                       AC_CHECK_FUNCS(pthread_kill pthread_detach)
+
                        AC_CHECK_FUNCS( \
                                pthread_attr_create pthread_attr_init \
                                pthread_attr_destroy pthread_attr_delete \
@@ -788,6 +788,22 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                        if test $ol_with_yielding_select = auto ; then
                                ol_with_yielding_select=yes
                        fi
+
+                       AC_CACHE_CHECK([for misplaced posix thread in headers],
+                               [ol_cv_header_misplaced_pthreads], [
+                               AC_TRY_COMPILE([
+#include <sys/types.h>
+typedef double pthread_t;
+                               ], [
+                               pthread_t thread = 0.0;
+                               ],
+                               [ol_cv_header_misplaced_pthreads=no],
+                               [ol_cv_header_misplaced_pthreads=yes])
+                       ])
+
+                       if test "$ol_cv_header_misplaced_pthreads" = yes ; then
+                               AC_MSG_ERROR([pthread types are misplaced, use --with-threads=posix]);
+                       fi
                fi
        fi
 
@@ -856,25 +872,6 @@ int x = errno;
                LIBS="$LTHREAD_LIBS $LIBS"
                LTHREAD_LIBS=""
        fi
-
-       dnl check for reentrant/threadsafe functions
-       dnl
-       dnl note: these should only be used when linking
-       dnl       with $LTHREAD_LIBS
-       dnl
-       save_CPPFLAGS="$CPPFLAGS"
-       save_LIBS="$LIBS"
-       LIBS="$LTHREAD_LIBS $LIBS"
-       AC_CHECK_FUNCS( \
-               strtok_r \
-               gmtime_r \
-               gethostbyaddr_r gethostbyname_r \
-               feof_unlocked unlocked_feof \
-               putc_unlocked unlocked_putc \
-               flockfile ftrylockfile \
-       )
-       CPPFLAGS="$save_CPPFLAGS"
-       LIBS="$save_LIBS"
 fi  
 
 dnl ----------------------------------------------------------------
@@ -889,6 +886,22 @@ if test $ol_link_threads = no ; then
                ol_with_threads=no
        fi
 
+       AC_CACHE_CHECK([for misplaced posix thread in headers],
+               [ol_cv_header_misplaced_pthreads], [
+               AC_TRY_COMPILE([
+#include <sys/types.h>
+typedef double pthread_t;
+                       ], [
+                               pthread_t thread = 0.0;
+                       ],
+                       [ol_cv_header_misplaced_pthreads=no],
+                       [ol_cv_header_misplaced_pthreads=yes])
+       ])
+
+       if test "$ol_cv_header_misplaced_pthreads" = yes ; then
+               AC_MSG_ERROR([pthread types are misplaced, use --with-threads=posix]);
+       fi
+
        AC_DEFINE(NO_THREADS,1)
        LTHREAD_LIBS=""
 fi