top_builddir=`pwd`
AC_SUBST(top_builddir)dnl
+ldap_subdir="openldap"
+
+AC_ARG_WITH(subdir, [ --with-subdir=DIR change default subdirectory used for installs], [
+ if test "$withval" = "no"; then
+ ldap_subdir=""
+ elif test "$withval" != "yes"; then
+ ldap_subdir="$withval"
+ fi
+])dnl
+
+AC_SUBST(ldap_subdir)dnl
+
OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes)dnl
dnl OL_ARG_ENABLE(syslog,[ --enable-syslog enable syslog support], auto)dnl
OL_ARG_ENABLE(proctitle,[ --enable-proctitle enable proctitle support], yes)dnl
auto, [auto k5 k4 afs yes no])
OL_ARG_WITH(threads,[ --with-threads use threads],
auto, [auto posix mach lwp yes no manual] )
-OL_ARG_WITH(preemptive,[ --with-preemptive thread implementation is preemptive],
+OL_ARG_WITH(yielding_select,[ --with-yielding-select with implicitly yielding select],
auto, [auto yes no manual] )
dnl Server options
AC_ARG_WITH(xxslapdoptions,[SLAPD Options:])
OL_ARG_ENABLE(slapd,[ --enable-slapd enable building slapd], yes)dnl
OL_ARG_ENABLE(aclgroups,[ --enable-aclgroups enable ACL group support], auto)dnl
+OL_ARG_ENABLE(cleartext,[ --enable-cleartext enable cleartext passwords], yes)dnl
OL_ARG_ENABLE(crypt,[ --enable-crypt enable crypt(3) passwords], auto)dnl
-OL_ARG_ENABLE(md5,[ --enable-md5 enable MD5 passwords], auto)dnl
-OL_ARG_ENABLE(sha1,[ --enable-sha1 enable SHA1 passwords], auto)dnl
OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no)dnl
OL_ARG_ENABLE(phonetic,[ --enable-phonetic enable phonetic/soundex], no)dnl
OL_ARG_ENABLE(rlookups,[ --enable-rlookups enable reverse lookups], auto)dnl
if test $ol_enable_aclgroups = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable_aclgroups argument])
fi
- if test $ol_enable_crypt = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_crypt argument])
- fi
- if test $ol_enable_md5 = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_md5 argument])
- fi
- if test $ol_enable_sha1 = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_sha1 argument])
- fi
if test $ol_enable_wrappers = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable_wrappers argument])
fi
ol_enable_shell=no
ol_enable_passwd=no
ol_enable_aclgroups=no
- ol_enable_crypt=no
- ol_enable_md5=no
- ol_enable_sha1=no
ol_enable_wrappers=no
ol_enable_phonetic=no
ol_enable_rlookups=no
ol_link_kerberos=yes
AC_DEFINE(HAVE_KERBEROS)
-
KRB_LIBS="-lkrb -ldes"
+
+ AC_CHECK_FUNCS(des_string_to_key)
fi
fi
fi
AC_CHECK_LIB(pthread, pthread_join, [
ol_link_threads=posix
LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lexc"
- if test $ol_with_preemptive = auto ; then
- ol_with_preemptive=yes
+ if test $ol_with_yielding_select = auto ; then
+ ol_with_yielding_select=yes
fi
],,[-lexc])
LIBS="$save_LIBS"
AC_CHECK_LIB(pthreads, pthread_join, [
ol_link_threads=posix
LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lmach -lexc -lc_r"
- if test $ol_with_preemptive = auto ; then
- ol_with_preemptive=yes
+ if test $ol_with_yielding_select = auto ; then
+ ol_with_yielding_select=yes
fi
],,[-lmach -lexc -lc_r])
LIBS="$save_LIBS"
thr_setconcurrency \
)
- dnl Check PREEMPTIVE Implementation
- if test $ol_with_preemptive = auto ; then
- AC_MSG_CHECKING([for preemptive Pthread implementation])
+ AC_MSG_CHECKING([if pthread_create() works])
+ AC_CACHE_VAL(ol_cv_pthread_create_works,[
+ AC_TRY_RUN([
+#include <pthread.h>
+#ifndef NULL
+#define NULL (void*)0
+#endif
+
+static void *task(p)
+ void *p;
+{
+ return (void *) (p == NULL);
+}
+
+int main(argc, argv)
+ int argc;
+ char **argv;
+{
+ pthread_t t;
+ exit(pthread_create(&t, NULL, task, NULL));
+}
+],
+ [ol_cv_pthread_create_works=yes],
+ [ol_cv_pthread_create_works=no],
+ [dnl assume yes
+ ol_cv_pthread_create_works=yes])])
+ AC_MSG_RESULT($ol_cv_pthread_create_works)
+
+ if test $ol_cv_pthread_create_works = no ; then
+ AC_MSG_ERROR([pthread.h and pthread_create are not compatible])
+ fi
+
+ dnl Check if select causes an yield
+ if test $ol_with_yielding_select = auto ; then
+ AC_MSG_CHECKING([if select yields when using pthreads])
+ AC_CACHE_VAL(ol_cv_pthread_select_yields,[
AC_TRY_RUN([
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
#include <pthread.h>
#ifndef NULL
-#define NULL 0
+#define NULL (void*) 0
#endif
-int task(arg)
- int *arg;
+static int fildes[2];
+
+static void *task(p)
+ void *p;
{
int i;
struct timeval tv;
- tv.tv_sec=5;
+ fd_set rfds;
+
+ tv.tv_sec=10;
tv.tv_usec=0;
+ FD_ZERO(&rfds);
+ FD_SET(fildes[0], &rfds);
+
/* we're not interested in any fds */
- i = select(FD_SETSIZE, NULL, NULL, NULL, &tv);
+ i = select(FD_SETSIZE, &rfds, NULL, NULL, &tv);
if(i < 0) {
perror("select");
+ exit(0);
}
exit(1); /* if we exit here, the select blocked the whole process */
}
-main(argc, argv)
-int argc; char **argv;
+int main(argc, argv)
+ int argc;
+ char **argv;
{
pthread_t t;
+ /* create a pipe to select */
+ if(pipe(&fildes[0])) {
+ perror("select");
+ exit(0);
+ }
+
#ifdef HAVE_PTHREAD_SETCONCURRENCY
(void) pthread_setconcurrency(2);
#else
#endif
#endif
- pthread_create(&t, NULL, (void *) task, NULL);
+ pthread_create(&t, NULL, task, NULL);
#if HAVE_SCHED_YIELD
sched_yield(); /* make sure task runs first */
#endif
#endif
exit(0);
-}
- ], [ol_pthread_preemptive=yes], [ol_pthread_preemptive=no], [
- AC_MSG_ERROR([crossing compiling: use --with-preemptive=yes|no|manual])])
- AC_MSG_RESULT($ol_pthread_preemptive)
-
- if test $ol_pthread_preemptive = yes ; then
- AC_DEFINE(HAVE_PREEMPTIVE_PTHREADS)
- ol_with_preemptive=yes
+}],
+ [ol_cv_pthread_select_yields=yes],
+ [ol_cv_pthread_select_yields=no], [
+ AC_MSG_ERROR([crossing compiling: use --with-yielding_select=yes|no|manual])])])
+ AC_MSG_RESULT($ol_cv_pthread_select_yields)
+
+ if test $ol_cv_pthread_select_yields = yes ; then
+ ol_with_yielding_select=yes
fi
fi
LTHREAD_LIBS="$LTHREAD_LIBS -lthread"
ol_link_threads=thr
- if test $ol_with_preemptive = auto ; then
- ol_with_preemptive=yes
+ if test $ol_with_yielding_select = auto ; then
+ ol_with_yielding_select=yes
fi
fi
fi
LTHREAD_LIBS="$LTHREAD_LIBS -llwp"
ol_link_threads=lwp
- if test $ol_with_preemptive = auto ; then
- ol_with_preemptive=no
+ if test $ol_with_yielding_select = auto ; then
+ ol_with_yielding_select=no
fi
fi
fi
fi
-if test $ol_with_preemptive = yes ; then
- AC_DEFINE(PREEMPTIVE_THREADS,1)
+if test $ol_with_yielding_select = yes ; then
+ AC_DEFINE(HAVE_YIELDING_SELECT,1)
fi
if test $ol_with_threads = manual ; then
if test $ol_with_threads != no ; then
dnl needed to get reentrant/threadsafe versions
dnl
+ AC_DEFINE(REENTRANT,1)
AC_DEFINE(_REENTRANT,1)
+ AC_DEFINE(THREAD_SAFE,1)
AC_DEFINE(_THREAD_SAFE,1)
+ AC_DEFINE(THREADSAFE,1)
AC_DEFINE(_THREADSAFE,1)
dnl this might cause the errno symbol to be
fi
AC_DEFINE(NO_THREADS,1)
- AC_DEFINE(PREEMPTIVE_THREADS,1)
LTHREAD_LIBS=""
fi
sys/resource.h \
sys/socket.h \
sys/syslog.h \
+ sys/time.h \
sys/types.h \
syslog.h \
termios.h \
+ unistd.h \
)
dnl ----------------------------------------------------------------
dnl ----------------------------------------------------------------
dnl Checks for library functions.
AC_FUNC_MEMCMP
-AM_FUNC_MKTIME dnl checks for sys/time.h and unistd.h
+dnl AM_FUNC_MKTIME dnl checks for sys/time.h and unistd.h
AC_FUNC_STRFTIME
-AM_FUNC_STRTOD
+dnl AM_FUNC_STRTOD
AC_FUNC_VPRINTF
if test $ac_cv_func_vprintf = yes ; then
if test $ol_enable_crypt != no ; then
AC_DEFINE(SLAPD_CRYPT,1)
fi
-if test $ol_enable_md5 != no ; then
- AC_DEFINE(SLAPD_MD5,1)
-fi
-if test $ol_enable_sha1 != no ; then
- AC_DEFINE(SLAPD_SHA1,1)
+if test $ol_enable_cleartext != no ; then
+ AC_DEFINE(SLAPD_CLEARTEXT,1)
fi
if test $ol_enable_phonetic != no ; then
AC_DEFINE(SLAPD_PHONETIC,1)
projects / openldap / blobdiff