-dnl Copyright 1998 The OpenLDAP Foundation. All Rights Reserved.
+dnl
+dnl Copyright 1998,1999 The OpenLDAP Foundation. All Rights Reserved.
dnl
dnl Redistribution and use in source and binary forms are permitted only
dnl as authorized by the OpenLDAP Public License. A copy of this
dnl license is available at http://www.OpenLDAP.org/license.html or
dnl in file LICENSE in the top-level directory of the distribution.
-dnl ----
+dnl
dnl Configure.in for OpenLDAP
AC_INIT(include/ldap.h)dnl
AC_CONFIG_AUX_DIR(build)dnl
-AM_INIT_AUTOMAKE(OpenLDAP,[1.1-beta], [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
AC_CHECK_LIB(gen, main)
])
-dnl Check for resolv
-AC_CHECK_LIB(resolv, res_search)
+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_lib_bind_res_search" = "yes" ; then
+ AC_DEFINE(HAVE_RES_SEARCH,1)
+ else
+ AC_CHECK_LIB(resolv, res_search)
+ if test "$ac_cv_lib_resolv_res_search" = "yes" ; then
+ AC_DEFINE(HAVE_RES_SEARCH,1)
+ fi
+ fi
+fi
dnl HP-UX requires -lV3
AC_CHECK_LIB(V3, sigset)
if test $ol_link_threads = no ; then
dnl try DEC Threads -lpthread -lexc
save_LIBS="$LIBS"
- AC_CHECK_LIB(pthread, pthread_join, [
+ AC_CHECK_LIB(pthread, pthread_mutex_lock, [
ol_link_threads=posix
LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lexc"
if test $ol_with_yielding_select = auto ; then
if test $ol_link_threads = no ; then
dnl try DEC Threads -lpthreads -lmach -lexc -lc_r
save_LIBS="$LIBS"
- AC_CHECK_LIB(pthreads, pthread_join, [
+ AC_CHECK_LIB(pthreads, pthread_mutex_unlock, [
ol_link_threads=posix
LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lmach -lexc -lc_r"
if test $ol_with_yielding_select = auto ; then
LIBS="$save_LIBS"
fi
+ dnl IRIX Pthread check
+ if test $ol_link_threads = no ; then
+ dnl try IRIX Pthreads -Wl,-woff,85 -lpthreads
+ save_LIBS="$LIBS"
+ AC_CHECK_LIB(pthreads, pthread_join, [
+ ol_link_threads=posix
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"
+ ],[-Wl,-woff,85])
+ LIBS="$save_LIBS"
+ fi
+
+ dnl HP-UX 11 Pthread check
+ if test $ol_link_threads = no; then
+ save_LIBS="$LIBS"
+ LIBS="$LIBS -lpthread"
+ AC_MSG_CHECKING([for pthread_create() in HP-UX -lpthread])
+ ol_try_pthread_hpux_11=no
+ AC_CACHE_VAL(ol_cv_pthread_hpux_11,[
+ AC_TRY_LINK([
+#include <pthread.h>
+#include <elf.h>
+#ifndef ELFABI_HPUX_REL11
+ die horribly
+#endif
+ ], [pthread_create(NULL, NULL, NULL, NULL);],
+ ol_try_pthread_hpux_11=yes
+ ol_cv_pthread_hpux_11=yes,
+ ol_cv_pthread_hpux_11=no)])
+ AC_MSG_RESULT(yes)
+ LIBS="$save_LIBS"
+
+ if test $ol_cv_pthread_hpux_11=yes ; then
+ ol_link_threads=posix
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"
+ if test $ol_try_pthread_hpux_11=yes ; then
+ dnl Some tests below may fail, cause we aint including
+ dnl pthread.h. Force appropriate ones to yes
+ ac_cv_func_pthread_attr_init=yes
+ fi
+ fi
+ fi
+
if test $ol_link_threads != no ; then
AC_DEFINE(HAVE_PTHREADS)
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 \
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
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 ----------------------------------------------------------------
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
memcpy \
memmove \
mkstemp \
- res_search \
select \
setpwfile \
setsid \
AC_SUBST(BUILD_SHELL)
AC_SUBST(BUILD_SLURPD)
-
AC_SUBST(LDAP_LIBS)
AC_SUBST(LDAPD_LIBS)
AC_SUBST(SLAPD_LIBS)
projects / openldap / blobdiff