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 35a6734e0ec55ac80543af020be87d9b77915c01..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
@@ -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
 
@@ -870,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