X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=1cdaf1abea96865a359ea21b5325344871cea167;hb=c1cef27bda78a361d110bd20b83145b62d01ba25;hp=9dbd600b32df8dc43454d9c7d83de5b5e6c7016a;hpb=1650f15d9d8725e5f12688fc1539baeb2e9be3cf;p=openldap diff --git a/configure.in b/configure.in index 9dbd600b32..1cdaf1abea 100644 --- a/configure.in +++ b/configure.in @@ -26,6 +26,18 @@ AC_PREFIX_DEFAULT(/usr/local) 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 @@ -55,9 +67,8 @@ dnl SLAPD 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 @@ -104,15 +115,6 @@ if test $ol_enable_slapd = no ; then 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 @@ -137,9 +139,6 @@ if test $ol_enable_slapd = no ; then 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 @@ -334,8 +333,9 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 ; then ol_link_kerberos=yes AC_DEFINE(HAVE_KERBEROS) - KRB_LIBS="-lkrb -ldes" + + AC_CHECK_FUNCS(des_string_to_key) fi fi fi @@ -504,22 +504,55 @@ if test $ol_with_threads = auto -o $ol_with_threads = posix ; then thr_setconcurrency \ ) + AC_MSG_CHECKING([if pthread_create() works]) + AC_CACHE_VAL(ol_cv_pthread_create_works,[ + AC_TRY_RUN([ +#include +#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]) + AC_MSG_CHECKING([if select yields when using pthreads]) + AC_CACHE_VAL(ol_cv_pthread_select_yields,[ AC_TRY_RUN([ #include #include #include #include #ifndef NULL -#define NULL 0 +#define NULL (void*) 0 #endif -int fildes[2]; +static int fildes[2]; -int task(arg) - int *arg; +static void *task(p) + void *p; { int i; struct timeval tv; @@ -564,7 +597,7 @@ int main(argc, argv) #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 */ @@ -574,12 +607,13 @@ int main(argc, argv) #endif #endif exit(0); -} - ], [ol_pthread_select_yields=yes], [ol_pthread_select_yields=no], [ - AC_MSG_ERROR([crossing compiling: use --with-yielding_select=yes|no|manual])]) - AC_MSG_RESULT($ol_pthread_select_yields) +}], + [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_pthread_select_yields = yes ; then + if test $ol_cv_pthread_select_yields = yes ; then ol_with_yielding_select=yes fi fi @@ -707,8 +741,11 @@ fi 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 @@ -965,9 +1002,11 @@ AC_CHECK_HEADERS( \ sys/resource.h \ sys/socket.h \ sys/syslog.h \ + sys/time.h \ sys/types.h \ syslog.h \ termios.h \ + unistd.h \ ) dnl ---------------------------------------------------------------- @@ -1082,11 +1121,8 @@ fi 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)