dnl in file LICENSE in the top-level directory of the distribution.
dnl
+dnl Disable config.cache!
+define([AC_CACHE_LOAD], )dnl
+define([AC_CACHE_SAVE], )dnl
+
dnl Configure.in for OpenLDAP
AC_INIT(include/ldap.h)dnl
AC_CONFIG_AUX_DIR(build)dnl
-AM_INIT_AUTOMAKE(OpenLDAP,[2.0-devel], [no ac_define])dnl
+AM_INIT_AUTOMAKE(OpenLDAP,[2.0-devel], [no defines])dnl
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)
+AC_DEFINE_UNQUOTED(OPENLDAP_VERSION,"$VERSION",Version)
dnl We use autoconf features new to 2.13.
dnl aclocal.m4 should be built using aclocal from automake 1.4
top_builddir=`pwd`
AC_SUBST(top_builddir)dnl
+AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion])
+
ldap_subdir="openldap"
AC_ARG_WITH(subdir, [ --with-subdir=DIR change default subdirectory used for installs], [
AC_SUBST(ldap_subdir)dnl
OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes)dnl
-ol_enable_syslog=no
-dnl OL_ARG_ENABLE(syslog,[ --enable-syslog enable syslog support], auto)dnl
+dnl ol_enable_syslog=no
+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(cache,[ --enable-cache enable caching], yes)dnl
OL_ARG_ENABLE(dns,[ --enable-dns enable V2 DNS extension], no)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(wrappers,[ --enable-wrappers enable tcp wrapper support], no)dnl
+OL_ARG_ENABLE(modules,[ --enable-modules enable dynamic module 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(wrappers,[ --enable-wrappers enable tcp wrapper support], no)dnl
dnl SLAPD Backend options
OL_ARG_ENABLE(bdb2,[ --enable-bdb2 enable bdb2 backend], no)dnl
+OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend], no)dnl
OL_ARG_ENABLE(ldbm,[ --enable-ldbm enable ldbm backend], yes)dnl
OL_ARG_WITH(ldbm_api,[ --with-ldbm-api use LDBM API], auto,
[auto db2 db mdbm gdbm ndbm manual])
if test $ol_enable_aclgroups = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable_aclgroups argument])
fi
+ if test $ol_enable_modules = yes ; then
+ AC_MSG_WARN([slapd disabled, ignoring --enable_modules argument])
+ fi
if test $ol_enable_wrappers = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable_wrappers argument])
fi
ol_enable_perl=no
ol_enable_shell=no
ol_enable_tcl=no
+
ol_enable_aclgroups=no
- ol_enable_wrappers=no
+ ol_enable_modules=no
ol_enable_phonetic=no
ol_enable_rlookups=no
+ ol_enable_wrappers=no
+
ol_with_ldbm_api=no
ol_with_ldbm_type=no
+
ol_enable_slurpd=no
elif test $ol_enable_ldbm = no ; then
AC_MSG_ERROR([BDB2 requires --enable-ldbm])
fi
- if test $ol_enable_passwd = no -a \
+ if test $ol_enable_modules != yes -a \
+ $ol_enable_passwd = no -a \
$ol_enable_perl = no -a \
$ol_enable_shell = no -a \
$ol_enable_tcl = no ; then
BUILD_SLURPD=no
BUILD_BDB2=no
+BUILD_LDAP=no
BUILD_LDBM=no
BUILD_PASSWD=no
BUILD_PERL=no
BUILD_TCL=no
BUILD_THREAD=no
+SLAPD_MODULES_LDFLAGS=
+SLAPD_MODULES_CPPFLAGS=
+
SLAPD_PERL_LDFLAGS=
SLAPD_PERL_CPPFLAGS=
AC_PATH_PROG(EDITOR, vi, /usr/ucb/vi, $PATH:/usr/ucb)
AC_PATH_PROG(FINGER, finger, /usr/ucb/finger, $PATH:/usr/ucb)
-if test $ol_enable_perl = yes ; then
+ol_link_modules=no
+if test $ol_enable_modules != no ; then
+ AC_PATH_PROG(GLIBCONFIG, glib-config)
+
+ if test "no$GLIBCONFIG" = "no" ; then
+ if test $ol_enable_modules = yes ; then
+ AC_MSG_ERROR([could not locate glib-config])
+ fi
+
+ else
+ SLAPD_MODULES_VERSION="`$GLIBCONFIG --version gmodule`"
+ SLAPD_MODULES_CPPFLAGS="`$GLIBCONFIG --cflags gmodule`"
+ SLAPD_MODULES_LDFLAGS="`$GLIBCONFIG --libs gmodule`"
+
+ dnl should check glib version
+ ol_link_modules=yes
+ fi
+fi
+
+ol_link_perl=no
+if test $ol_enable_perl != no ; then
AC_PATH_PROG(PERLBIN, perl, /usr/bin/perl)
if test "no$PERLBIN" = "no" ; then
- ol_enable_perl=no
- fi
+ if test $ol_enable_perl = yes ; then
+ AC_MSG_ERROR([could not locate perl])
+ fi
+
+ else
+ SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`"
+ SLAPD_PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`"
- SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`"
- SLAPD_PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`"
+ dnl should check perl version
+ ol_link_perl=yes
+ fi
fi
AC_PROG_CPP
AC_EXEEXT
AC_OBJEXT
+AC_DEFINE_UNQUOTED( EXEEXT, "${EXEEXT}", [defined to be the EXE extension])
+
dnl OpenLDAP requires STDC features
AM_PROG_CC_STDC
if test "X${am_cv_prog_cc_stdc}" = "Xno" ; then
dnl
AC_CHECK_LIB(socket, main)
AC_CHECK_LIB(net, main)
+ AC_CHECK_LIB(net, socket)
AC_CHECK_LIB(nsl_s, main)
AC_CHECK_LIB(nsl, main)
AC_CHECK_LIB(inet, socket)
dnl Check pthread (final) libraries
dnl pthread_mutex_unlock() in -lpthread -lmach -lexc -lc_r (OSF/1)
dnl pthread_mutex_lock() in -lpthread -lmach -lexc (OSF/1)
- dnl pthread_mutex_trylock() in -lpthread -lexc (OSF/1)
+ dnl (skipped) pthread_mutex_trylock() in -lpthread -lexc (OSF/1)
dnl pthread_join() -Wl,-woff,85 -lpthread (IRIX)
dnl pthread_create() in -lpthread (many)
dnl pthread_create() in -lc_r (FreeBSD)
/* make sure pthread_create() isn't just a stub */
#if HAVE_PTHREADS_D4
- status = pthread_create(&t, pthread_attr_default, task, NULL));
+ status = pthread_create(&t, pthread_attr_default, task, NULL);
#else
status = pthread_create(&t, NULL, task, NULL);
#endif
[ol_cv_pthread_lpthread_lmach_lexc_lc_r])
OL_PTHREAD_TRY_LINK([-lpthread -lmach -lexc],
[ol_cv_pthread_lpthread_lmach_lexc])
- OL_PTHREAD_TRY_LINK([-lpthread -lexc],
- [ol_cv_pthread_lpthread_lexc])
+dnl OL_PTHREAD_TRY_LINK([-lpthread -lexc],
+dnl [ol_cv_pthread_lpthread_lexc])
OL_PTHREAD_TRY_LINK([-lpthread -Wl,-woff,85],
[ol_cv_pthread_lib_lpthread_woff])
OL_PTHREAD_TRY_LINK([-lpthread],[ol_cv_pthread_lpthread])
OL_PTHREAD_TRY_LINK([-lc_r], [ol_cv_pthread_lc_r])
- OL_PTHREAD_TRY_LINK([-threads], [ol_cv_pthread_pthread])
+ OL_PTHREAD_TRY_LINK([-threads], [ol_cv_pthread_threads])
OL_PTHREAD_TRY_LINK([-lpthreads -lmach -lexc -lc_r],
[ol_cv_pthread_lpthreads_lmach_lexc_lc_r])
fi
if test $ac_cv_func_sched_yield = no -a \
$ac_cv_func_pthread_yield = no ; then
- dnl Solaris has sched_yield() in -lposix4
+ dnl Solaris has sched_yield() stub in -lposix4
dnl but we'll use thr_yield instead.
AC_CHECK_FUNCS(thr_yield)
fi
dnl # include LDAP_R_COMPILE
dnl #endif
dnl
-dnl LDAP_R_COMIPLE is defined by libldap_r/Makefile.in
+dnl LDAP_R_COMPILE is defined by libldap_r/Makefile.in
dnl specifically for compiling the threadsafe version of
dnl the ldap library (-lldap_r).
dnl
if test $have_wrappers = yes ; then
AC_DEFINE(HAVE_TCPD,1, [define if you have -lwrap])
SLAPD_LIBS="$SLAPD_LIBS -lwrap"
+
+ dnl We add another check for -lnsl since some libwrap's
+ dnl need it, but it isn't always included from above
+ AC_CHECK_LIB(nsl, main)
else
AC_MSG_WARN(could not find -lwrap)
if test $ol_enable_wrappers = yes ; then
sys/ioctl.h \
sys/param.h \
sys/resource.h \
+ sys/select.h \
sys/socket.h \
sys/syslog.h \
sys/time.h \
dnl AM_FUNC_MKTIME dnl checks for sys/time.h and unistd.h
AC_FUNC_STRFTIME
dnl AM_FUNC_STRTOD
+
+dnl we should use vfork instead of fork in a number of places...
dnl AC_FUNC_VFORK
AC_FUNC_VPRINTF
endgrent \
endpwent \
flock \
- getdtablesize \
+ getdtablesize \
getgrgid \
gethostname \
getpass \
getpwuid \
- gettimeofday \
+ gettimeofday \
+ initgroups \
lockf \
memcpy \
memmove \
recv \
recvfrom \
setpwfile \
+ setgid \
+ setegid \
setsid \
+ setuid \
+ seteuid \
signal \
sigset \
snprintf \
# Check Configuration
OL_SYS_ERRLIST
-dnl ----------------------------------------------------------------
-dnl Check our declaration of strdup()
-OL_DECL_STRDUP
-
dnl ----------------------------------------------------------------
dnl Sort out defines
AC_DEFINE(SLAPD_RLOOKUPS,1)
fi
+if test "$ol_link_modules" != no ; then
+ AC_DEFINE(SLAPD_MODULES,1)
+ BUILD_SLAPD=yes
+fi
+
if test "$ol_link_bdb2" != no ; then
AC_DEFINE(SLAPD_BDB2,1)
BUILD_SLAPD=yes
BUILD_BDB2=yes
fi
+if test "$ol_link_ldap" != no ; then
+ AC_DEFINE(SLAPD_LDAP,1)
+ BUILD_SLAPD=yes
+ BUILD_LDAP=yes
+fi
+
if test "$ol_link_ldbm" != no ; then
AC_DEFINE(SLAPD_LDBM,1)
BUILD_SLAPD=yes
BUILD_PASSWD=yes
fi
-if test "$ol_enable_perl" != no ; then
+if test "$ol_link_perl" != no ; then
AC_DEFINE(SLAPD_PERL,1)
BUILD_SLAPD=yes
BUILD_PERL=yes
AC_SUBST(BUILD_LDAPD)
AC_SUBST(BUILD_SLAPD)
AC_SUBST(BUILD_BDB2)
+ AC_SUBST(BUILD_LDAP)
AC_SUBST(BUILD_LDBM)
AC_SUBST(BUILD_PASSWD)
AC_SUBST(BUILD_PERL)
AC_SUBST(LTHREAD_LIBS)
AC_SUBST(LUTIL_LIBS)
+AC_SUBST(SLAPD_MODULES_CPPFLAGS)
+AC_SUBST(SLAPD_MODULES_LDFLAGS)
+
AC_SUBST(SLAPD_PERL_CPPFLAGS)
AC_SUBST(SLAPD_PERL_LDFLAGS)
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 \
servers/slapd/back-bdb2/Makefile:build/top.mk:servers/slapd/back-bdb2/Makefile.in:build/srv.mk \
+servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/srv.mk \
servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/srv.mk \
servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/srv.mk \
servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/srv.mk \
projects / openldap / blobdiff