dnl SLAPD OPTIONS
OL_ARG_ENABLE(slapd,[ --enable-slapd enable building slapd], yes)dnl
-OL_ARG_ENABLE(aclgroup,[ --enable-aclgroup enable ACL group support], auto)dnl
+OL_ARG_ENABLE(aclgroups,[ --enable-aclgroups enable ACL group support], auto)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
if test $ol_enable_slapd = no ; then
dnl SLAPD was specificallly disabled
if test $ol_enable_ldbm = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_ldbm argument]);
+ AC_MSG_WARN([slapd disabled, ignoring --enable_ldbm argument])
fi
if test $ol_enable_passwd = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_passwd argument]);
+ AC_MSG_WARN([slapd disabled, ignoring --enable_passwd argument])
fi
if test $ol_enable_shell = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_shell argument]);
+ AC_MSG_WARN([slapd disabled, ignoring --enable_shell argument])
fi
- if test $ol_enable_aclgroup = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_aclgroup argument]);
+ 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]);
+ 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]);
+ 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]);
+ 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]);
+ AC_MSG_WARN([slapd disabled, ignoring --enable_wrappers argument])
fi
if test $ol_enable_phonetic = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_phonetic argument]);
+ AC_MSG_WARN([slapd disabled, ignoring --enable_phonetic argument])
fi
if test $ol_enable_rlookups = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_rlookups argument]);
+ AC_MSG_WARN([slapd disabled, ignoring --enable_rlookups argument])
fi
if test $ol_with_ldbm_api != auto ; then
- AC_MSG_WARN([slapd disabled, ignoring --with_ldbm_api argument]);
+ AC_MSG_WARN([slapd disabled, ignoring --with_ldbm_api argument])
fi
if test $ol_with_ldbm_type != auto ; then
- AC_MSG_WARN([slapd disabled, ignoring --with_ldbm_type argument]);
+ AC_MSG_WARN([slapd disabled, ignoring --with_ldbm_type argument])
fi
if test $ol_enable_slurpd = yes ; then
- AC_MSG_ERROR([slurpd requires slapd]);
+ AC_MSG_ERROR([slurpd requires slapd])
fi
# force settings to no
ol_enable_ldbm=no
ol_enable_shell=no
ol_enable_passwd=no
- ol_enable_aclgroup=no
+ ol_enable_aclgroups=no
ol_enable_crypt=no
ol_enable_md5=no
ol_enable_sha1=no
dnl SLAPD without LDBM
if test $ol_with_ldbm_api != auto ; then
- AC_MSG_WARN([LDBM disabled, ignoring --with_ldbm_api argument]);
+ AC_MSG_WARN([LDBM disabled, ignoring --with_ldbm_api argument])
fi
if test $ol_with_ldbm_type != auto ; then
- AC_MSG_WARN([LDBM disabled, ignoring --with_ldbm_type argument]);
+ AC_MSG_WARN([LDBM disabled, ignoring --with_ldbm_type argument])
fi
if test $ol_enable_passwd = no -a $ol_enable_shell = no ; then
- AC_MSG_ERROR([slapd requires a backend]);
+ AC_MSG_ERROR([slapd requires a backend])
fi
ol_with_ldbm_api=no
if test $ol_with_ldbm_api = gdbm -a \
$ol_with_ldbm_type = btree ; then
- AC_MSG_ERROR([GDBM only supports LDBM type hash]);
+ AC_MSG_ERROR([GDBM only supports LDBM type hash])
fi
if test $ol_with_ldbm_api = ndbm -a \
$ol_with_ldbm_type = btree ; then
- AC_MSG_ERROR([NDBM only supports LDBM type hash]);
+ AC_MSG_ERROR([NDBM only supports LDBM type hash])
fi
fi
if test $ol_enable_slurpd = yes ; then
dnl SLURPD was specifically enabled
if test $ol_with_threads = no ; then
- AC_MSG_ERROR([slurpd requires threads]);
+ AC_MSG_ERROR([slurpd requires threads])
fi
fi
OL_POSIX_THREAD_VERSION
if test $ol_cv_pthread_version = final ; then
- dnl AC_DEFINE(HAVE_PTHREADS_FINAL)
+ AC_DEFINE(HAVE_PTHREADS_FINAL)
elif test $ol_cv_pthread_version = draft4 ; then
AC_DEFINE(HAVE_PTHREADS_D4)
else
AC_DEFINE(HAVE_DCE)
ol_link_threads=posix
LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc -lc"],,
- if test $with_preemptive = auto ; then
+ if test $ol_with_preemptive = auto ; then
ol_with_preemptive=yes
fi
[-lmach -lexc -lc])
AC_CHECK_LIB(thread, thr_create, [have_lwp=yes], [have_lwp=no])
if test $have_lwp = yes ; then
- AC_DEFINE(HAVE_LWP)
- AC_DEFINE(HAVE_LWP_THR)
+ AC_DEFINE(HAVE_THR)
LTHREAD_LIBS="$LTHREAD_LIBS -llwp"
+
+ if test $ol_with_preemptive = auto ; then
+ ol_with_preemptive=yes
+ fi
fi
fi
AC_DEFINE(HAVE_LWP)
LTHREAD_LIBS="$LTHREAD_LIBS -llwp"
- if test $with_preemptive = auto ; then
- with_preemptive=yes
+ if test $ol_with_preemptive = auto ; then
+ ol_with_preemptive=no
fi
fi
fi
fi
if test $ol_with_preemptive = yes ; then
- AC_DEFINE(THREAD_PREEMPTIVE,1)
+ AC_DEFINE(PREEMPTIVE_THREADS,1)
fi
if test $ol_with_threads = manual ; then
fi
AC_DEFINE(NO_THREADS,1)
+ AC_DEFINE(PREEMPTIVE_THREADS,1)
LTHREAD_LIBS=""
fi
fi
if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then
- AC_MSG_WARN(Could not find LDBM with BTREE support);
+ AC_MSG_WARN(Could not find LDBM with BTREE support)
$ol_with_ldbm_api=none
fi
dnl ----------------------------------------------------------------
dnl Checks for header files.
AC_HEADER_STDC
+
+if test $ac_cv_header_stdc != yes; then
+ AC_MSG_WARN([could not locate Standard C headers])
+fi
+
AC_HEADER_DIRENT
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS( \
- stddef.h \
- errno.h \
- fcntl.h \
- filio.h \
- getopt.h \
- limits.h \
- malloc.h \
- regex.h \
- sgtty.h \
- sys/file.h \
- sys/errno.h \
- sys/ioctl.h \
- sys/param.h \
- sys/socket.h\
- sys/time.h \
- sys/types.h \
- syslog.h \
- termios.h \
- unistd.h \
+AC_CHECK_HEADERS( \
+ stddef.h \
+ errno.h \
+ fcntl.h \
+ filio.h \
+ getopt.h \
+ limits.h \
+ malloc.h \
+ regex.h \
+ sgtty.h \
+ sys/file.h \
+ sys/errno.h \
+ sys/ioctl.h \
+ sys/param.h \
+ sys/socket.h \
+ sys/syslog.h \
+ sys/time.h \
+ sys/types.h \
+ syslog.h \
+ termios.h \
+ unistd.h \
)
dnl ----------------------------------------------------------------
lockf \
memcpy \
memmove \
+ mkstemp \
mktime \
select \
setpwfile \
strtol \
strtoul \
sysconf \
+ tempnam \
waitpid \
)
-AC_REPLACE_FUNCS(getopt strdup)
+AC_REPLACE_FUNCS(getopt strdup tempnam)
dnl ----------------------------------------------------------------
# Check Configuration
AC_DEFINE(LDAP_CONNECTIONLESS,1)
fi
-if test $ol_enable_aclgroup != no ; then
- AC_DEFINE(SLAPD_ACLGROUP,1)
+if test $ol_enable_aclgroups != no ; then
+ AC_DEFINE(SLAPD_ACLGROUPS,1)
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)
fi
-
if test $ol_enable_phonetic != no ; then
AC_DEFINE(SLAPD_PHONETIC,1)
fi
-
if test $ol_enable_rlookups != no ; then
AC_DEFINE(SLAPD_RLOOKUPS,1)
fi
projects / openldap / blobdiff