-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_ARG_WITH(xxliboptions,[Library Generation & Linking Options])
AM_ENABLE_STATIC
-dnl AM_DISABLE_SHARED
-AM_ENABLE_SHARED
+AM_DISABLE_SHARED
+dnl AM_ENABLE_SHARED
dnl General "enable" options
# validate options
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)
AC_PATH_PROG(PEPSY, pepsy)
fi
+dnl
+dnl check for kerberos
+dnl
+ol_link_kerberos=no
+
if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 ; then
AC_CHECK_HEADERS(kerberosIV/krb.h kerberosIV/des.h)
ol_link_kerberos=yes
AC_DEFINE(HAVE_KERBEROS)
-
KRB_LIBS="-lkrb4 -lkrb5 -ldes425"
fi
fi
fi
+
if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 ; then
AC_CHECK_HEADERS(krb.h des.h)
AC_DEFINE(HAVE_KERBEROS)
KRB_LIBS="-lkrb -ldes"
-
- AC_CHECK_FUNCS(des_string_to_key)
fi
fi
fi
+dnl if test $ol_link_kerberos = yes ; then
+dnl save_LIBS=$LIBS
+dnl LIBS="$KRB_LIBS $LIBS"
+dnl AC_CHECK_FUNCS(des_string_to_key)
+dnl LIBS=$save_LIBS
+dnl fi
+
ol_link_threads=no
-if test $ol_with_threads = auto -o $ol_with_threads = posix ; then
+if test $ol_with_threads = auto -o $ol_with_threads = yes \
+ -o $ol_with_threads = posix ; then
+
AC_CHECK_HEADERS(pthread.h sched.h)
if test $ac_cv_header_pthread_h = yes ; then
fi
fi
+ if test $ol_link_threads = no ; then
+ dnl try -pthreads
+ AC_CACHE_CHECK([for pthread_create with -pthreads],
+ [ol_cv_pthreads_flag], [
+ dnl save the flags
+ save_LIBS="$LIBS"
+ LIBS="-pthreads $LIBS"
+ AC_TRY_LINK([char pthread();],[
+ pthread_create();
+ ], ol_cv_pthreads_flag=yes, ol_cv_pthreads_flag=no)
+ dnl restore the LIBS
+ LIBS="$save_LIBS"
+ ])
+
+ if test $ol_cv_pthreads_flag = yes ; then
+ LTHREAD_LIBS="$LTHREAD_LIBS -pthreads"
+ ol_link_threads=posix
+ fi
+ fi
+
if test $ol_link_threads = no ; then
dnl try -thread
AC_CACHE_CHECK([for pthread_create with -thread],
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
+ if test $ol_link_threads = no ; then
+ dnl try -lpthreads
+ save_LIBS="$LIBS"
+ AC_CHECK_LIB(pthreads, pthread_create, [
+ ol_link_threads=posix
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"])
+ 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(i < 0) {
perror("select");
- exit(0);
+ exit(10);
}
- exit(1); /* if we exit here, the select blocked the whole process */
+ exit(0); /* if we exit here, the select blocked the whole process */
}
int main(argc, argv)
/* create a pipe to select */
if(pipe(&fildes[0])) {
perror("select");
- exit(0);
+ exit(1);
}
#ifdef HAVE_PTHREAD_SETCONCURRENCY
pthread_yield(); /* make sure task runs first */
#endif
#endif
- exit(0);
+
+ exit(2);
}],
- [ol_cv_pthread_select_yields=yes],
- [ol_cv_pthread_select_yields=no], [
+ [ol_cv_pthread_select_yields=no],
+ [ol_cv_pthread_select_yields=yes], [
AC_MSG_ERROR([crossing compiling: use --with-yielding_select=yes|no|manual])])])
AC_MSG_RESULT($ol_cv_pthread_select_yields)
fi
fi
-dnl dnl check for reentrant/threadsafe functions
-dnl AC_CHECK_FUNCS( \
-dnl feof_unlocked \
-dnl unlocked_feof \
-dnl ftrylockfile \
-dnl flockfile \
-dnl putc_unlocked \
-dnl gmtime_r \
-dnl strtok_r \
-dnl )
-
dnl restore flags
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
fi
fi
-if test $ol_with_threads = auto -o $ol_with_threads = mach ; then
+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)
if test $ac_cv_header_mach_cthreads_h = yes ; then
fi
fi
-if test $ol_with_threads = auto -o $ol_with_threads = lwp ; then
+if test $ol_with_threads = auto -o $ol_with_threads = yes \
+ -o $ol_with_threads = lwp ; then
+
dnl check for SunOS5 LWP
AC_CHECK_HEADERS(thread.h synch.h)
if test $ac_cv_header_thread_h = yes -a $ac_cv_header_synch_h = yes ; then
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
AC_CHECK_HEADERS(thread.h synch.h)
fi
-if test $ol_with_threads != no ; then
+if test $ol_link_threads != no ; then
dnl needed to get reentrant/threadsafe versions
dnl
AC_DEFINE(REENTRANT,1)
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
fi
fi
-if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = ndbm ; then
+if test $ol_with_ldbm_api = auto ; then
+ AC_MSG_WARN([skipping automatic checking for NDBM, must be manually enabled.])
+elif test $ol_with_ldbm_api = ndbm ; then
OL_NDBM
if test $ol_cv_ndbm = yes ; then
- if test $ol_with_ldbm_api = auto ; then
- AC_MSG_WARN([Attempting to use NDBM. Functionality will be limited.])
- fi
-
ol_link_ldbm=ndbm
ol_with_ldbm_api=ndbm
fi
if test $ol_enable_wrappers = yes ; then
- AC_CHECK_LIB(wrap, hosts_access,
+ AC_CHECK_LIB(wrap, main,
[have_wrappers=yes], [have_wrappers=no])
if test $have_wrappers = yes ; then
if test $ac_cv_func_vprintf = yes ; then
dnl check for vsnprintf
- AC_CHECK_FUNCS(vsnprintf)
+ AC_CHECK_FUNCS(vsnprintf vsprintf)
fi
AC_FUNC_WAIT3
memcpy \
memmove \
mkstemp \
- res_search \
select \
setpwfile \
setsid \
dnl ----------------------------------------------------------------
dnl Sort out defines
-if test $ol_enable_debug != no ; then
+if test "$ol_enable_debug" != no ; then
AC_DEFINE(LDAP_DEBUG,1)
fi
-dnl if test $ol_enable_syslog != no ; then
+dnl if test "$ol_enable_syslog" != no ; then
dnl AC_DEFINE(LDAP_SYSLOG,1)
dnl fi
-if test $ol_enable_libui = yes ; then
+if test "$ol_enable_libui" = yes ; then
AC_DEFINE(LDAP_LIBUI,1)
fi
-if test $ol_enable_cache = no ; then
+if test "$ol_enable_cache" = no ; then
AC_DEFINE(LDAP_NOCACHE,1)
fi
-if test $ol_enable_dns != no ; then
+if test "$ol_enable_dns" != no ; then
AC_DEFINE(LDAP_DNS,1)
fi
-if test $ol_enable_proctitle != no ; then
+if test "$ol_enable_proctitle" != no ; then
AC_DEFINE(LDAP_PROCTITLE,1)
fi
-if test $ol_enable_referrals != no ; then
+if test "$ol_enable_referrals" != no ; then
AC_DEFINE(LDAP_REFERRALS,1)
fi
-if test $ol_enable_cldap != no ; then
+if test "$ol_enable_cldap" != no ; then
AC_DEFINE(LDAP_CONNECTIONLESS,1)
fi
-if test $ol_enable_aclgroups != no ; then
+if test "$ol_enable_aclgroups" != no ; then
AC_DEFINE(SLAPD_ACLGROUPS,1)
fi
-if test $ol_enable_crypt != no ; then
+if test "$ol_enable_crypt" != no ; then
AC_DEFINE(SLAPD_CRYPT,1)
fi
-if test $ol_enable_cleartext != no ; then
+if test "$ol_enable_cleartext" != no ; then
AC_DEFINE(SLAPD_CLEARTEXT,1)
fi
-if test $ol_enable_phonetic != no ; then
+if test "$ol_enable_phonetic" != no ; then
AC_DEFINE(SLAPD_PHONETIC,1)
fi
-if test $ol_enable_rlookups != no ; then
+if test "$ol_enable_rlookups" != no ; then
AC_DEFINE(SLAPD_RLOOKUPS,1)
fi
-if test $ol_link_ldbm != no ; then
+if test "$ol_link_ldbm" != no ; then
AC_DEFINE(SLAPD_LDBM,1)
BUILD_SLAPD=yes
BUILD_LDBM=yes
fi
-if test $ol_enable_passwd != no ; then
+if test "$ol_enable_passwd" != no ; then
AC_DEFINE(SLAPD_PASSWD,1)
BUILD_SLAPD=yes
BUILD_PASSWD=yes
fi
-if test $ol_enable_shell != no ; then
+if test "$ol_enable_shell" != no ; then
AC_DEFINE(SLAPD_SHELL,1)
BUILD_SLAPD=yes
BUILD_SHELL=yes
fi
-if test $ol_enable_slurpd != no -a $ol_link_threads != no -a \
+if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \
$BUILD_SLAPD = yes ; then
BUILD_SLURPD=yes
fi
-if test $ol_link_isode != no ; then
+if test "$ol_link_isode" != no ; then
BUILD_LDAPD=yes
fi
AC_SUBST(BUILD_SHELL)
AC_SUBST(BUILD_SLURPD)
-
AC_SUBST(LDAP_LIBS)
AC_SUBST(LDAPD_LIBS)
AC_SUBST(SLAPD_LIBS)
projects / openldap / blobdiff