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 Configure.in for OpenLDAP
-dnl
-AC_INIT(include/ldap.h)
-dnl
-dnl
-AC_PREREQ(2.10)dnl Required Autoconf version
+AC_INIT(include/ldap.h)dnl
+AC_CONFIG_AUX_DIR(build)dnl
+AM_INIT_AUTOMAKE(OpenLDAP,[2.0-devel], [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
dnl with /bin/sh. Autoconf 2.10 seems to be okay.
-AC_CONFIG_AUX_DIR(build)
+AC_PREREQ(2.10)dnl Required Autoconf version
+
AC_CONFIG_HEADER(include/portable.h include/ldap_features.h)dnl
+
dnl
dnl Start Args
AC_MSG_CHECKING(configure arguments)
AC_PREFIX_DEFAULT(/usr/local)
-dnl General "enable" options
-OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes)dnl
+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
OL_ARG_ENABLE(libui,[ --enable-libui enable library user interface], 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
dnl LDAPD OPTIONS
+AC_ARG_WITH(xxldapdoptions,[LDAPD Options:])
OL_ARG_ENABLE(ldapd,[ --enable-ldapd enable building ldapd], no)dnl
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
OL_ARG_ENABLE(shell,[ --enable-shell enable shell backend], no)dnl
dnl SLURPD OPTIONS
+AC_ARG_WITH(xxslurpdoptions,[SLURPD Options:])
OL_ARG_ENABLE(slurpd,[ --enable-slurpd enable building slurpd], auto)dnl
+AC_ARG_WITH(xxliboptions,[Library Generation & Linking Options])
+AM_ENABLE_STATIC
+dnl AM_DISABLE_SHARED
+AM_ENABLE_SHARED
+
+dnl General "enable" options
# validate options
if test $ol_enable_referrals = no ; then
if test $ol_enable_dns = yes ; 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
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
AC_MSG_RESULT(done)
+AC_CANONICAL_HOST
+
## Initialize vars
LDAP_LIBS=
LDBM_LIBS=
dnl ----------------------------------------------------------------
dnl Checks for programs
-AC_PROG_LN_S
AC_PROG_INSTALL
-AC_PROG_RANLIB
-AC_PROG_MAKE_SET
+AM_PROG_LIBTOOL
+dnl AC_PROG_MAKE_SET
AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail,
$PATH:/usr/libexec:/usr/lib:/usr/sbin:/usr/etc:/etc)
AC_PATH_PROG(FINGER, finger, /usr/ucb/finger, $PATH:/usr/ucb)
dnl Checks the compiler and UNIX Variants
-AC_PROG_CC
if test $cross_compiling = yes -a $ol_enable_x_compile = yes; then
- AC_WARN([cross compiling.... some functionality will be removed.])
+ AC_MSG_WARN([cross compiling.... some functionality will be removed.])
elif test $cross_compiling = no -a $ol_enable_x_compile = yes; then
- AC_WARN([programs compiled here do run here...])
- AC_ERROR([ if not cross compiling, use --disable-x-compile.])
+ AC_MSG_WARN([programs compiled here do run here...])
+ AC_MSG_ERROR([ if not cross compiling, use --disable-x-compile.])
elif test $cross_compiling = yes -a $ol_enable_x_compile = no; then
- AC_WARN([programs compiled here do not run here...])
- AC_ERROR([ if cross compiling, add --enable-x-compile.])
+ AC_MSG_WARN([programs compiled here do not run here...])
+ AC_MSG_ERROR([ if cross compiling, add --enable-x-compile.])
fi
-dnl OpenLDAP requires STDC features
-dnl AC_PROG_GCC_TRADITIONAL
AC_PROG_CPP
-
AC_AIX
AC_ISC_POSIX
AC_MINIX
+dnl OpenLDAP requires STDC features
+AM_PROG_CC_STDC
+if test "X${am_cv_prog_cc_stdc}" = "Xno" ; then
+ AC_MSG_ERROR([OpenLDAP requires compiler to support STDC prototypes.])
+fi
+
+dnl AM_C_PROTOTYPES
+
dnl Checks for libraries
dnl Find socket()
dnl -lsocket [ -lnsl_s | -lnsl ]
dnl -linet
-AC_CHECK_FUNC(socket, :, [
+AC_CHECK_FUNC(socket, [have_socket=yes], [
dnl
dnl hopefully we won't include too many libraries
dnl
ol_link_kerberos=yes
AC_DEFINE(HAVE_KERBEROS)
-
KRB_LIBS="-lkrb -ldes"
+
+ AC_CHECK_FUNCS(des_string_to_key)
fi
fi
fi
dnl Now the hard part, how to link
- dnl A few platforms have pthread support in standard libraries
+ dnl Check for pthread support in current $LIBS
AC_CHECK_FUNC(pthread_create,[ol_link_threads=yes])
if test $ol_link_threads = no ; then
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
if test $ac_cv_header_mach_cthreads_h = yes ; then
ol_with_threads=found
- dnl A few platforms have cthread support in standard libraries
+ dnl check for cthread support in current $LIBS
AC_CHECK_FUNC(cthread_fork,[ol_link_threads=yes])
if test $ol_link_threads = no ; 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
- AC_CHECK_LIB(thread, thr_create, [have_lwp=yes], [have_lwp=no])
+ AC_CHECK_LIB(thread, thr_create, [have_thr=yes], [have_thr=no])
- if test $have_lwp = yes ; then
+ if test $have_thr = yes ; then
AC_DEFINE(HAVE_THR)
- LTHREAD_LIBS="$LTHREAD_LIBS -llwp"
+ 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
if test $have_lwp = yes ; then
AC_DEFINE(HAVE_LWP)
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
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
- if test $ol_with_ldbm_api = ndbm ; then
- AC_WARN([Attempting to use NDBM. Functionality will be limited.])
- fi
-
if test $ol_cv_lib_ndbm != yes ; then
LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_ndbm"
fi
AC_HEADER_STDC
if test $ac_cv_header_stdc != yes; then
- AC_MSG_WARN([could not locate Standard C headers])
+ AC_MSG_WARN([could not Standard C compliant headers])
fi
AC_HEADER_DIRENT
AC_HEADER_SYS_WAIT
+AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
+if test $am_cv_sys_posix_termios = yes ; then
+ AC_DEFINE(HAVE_POSIX_TERMIOS,1)
+fi
+
AC_CHECK_HEADERS( \
crypt.h \
errno.h \
malloc.h \
memory.h \
regex.h \
+ psap.h \
pwd.h \
sgtty.h \
stdarg.h \
dnl ----------------------------------------------------------------
dnl Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_GETGROUPS
+AC_TYPE_GETGROUPS dnl requires AC_TYPE_UID_T
AC_TYPE_MODE_T
AC_TYPE_OFF_T
AC_TYPE_PID_T
+AM_TYPE_PTRDIFF_T
AC_TYPE_SIGNAL
AC_TYPE_SIZE_T
-AC_TYPE_UID_T
AC_STRUCT_ST_BLKSIZE
AC_HEADER_TIME
AC_STRUCT_TM
dnl ----------------------------------------------------------------
dnl Checks for library functions.
AC_FUNC_MEMCMP
+dnl AM_FUNC_MKTIME dnl checks for sys/time.h and unistd.h
AC_FUNC_STRFTIME
+dnl AM_FUNC_STRTOD
AC_FUNC_VPRINTF
if test $ac_cv_func_vprintf = yes ; then
memcpy \
memmove \
mkstemp \
- mktime \
res_search \
select \
setpwfile \
strrchr \
strsep \
strstr \
- strtod \
strtok \
strtol \
strtoul \
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)
clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \
include/Makefile:build/top.mk:include/Makefile.in \
libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk \
-libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk \
-libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk \
-libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk \
-libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib.mk \
-libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk \
-libraries/liblthread/Makefile:build/top.mk:libraries/liblthread/Makefile.in:build/lib.mk \
-libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk \
+libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk:build/lib-static.mk \
+libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk \
+libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk \
+libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib.mk:build/lib-static.mk \
+libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk:build/lib-static.mk \
+libraries/liblthread/Makefile:build/top.mk:libraries/liblthread/Makefile.in:build/lib.mk:build/lib-static.mk \
+libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk \
servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk \
servers/ldapd/Makefile:build/top.mk:servers/ldapd/Makefile.in:build/srv.mk \
servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \
projects / openldap / blobdiff