define([AC_CACHE_SAVE], )dnl
dnl Configure.in for OpenLDAP
-AC_INIT(include/ldap.h)dnl
+AC_INIT(build/version)dnl
AC_CONFIG_AUX_DIR(build)dnl
-AM_INIT_AUTOMAKE(OpenLDAP,[2.0-devel], [no ac_define])dnl
+
+OL_VERSION=`cat $ac_aux_dir/version`
+if test -z "$OL_VERSION"; then
+ AC_MSG_ERROR([could not determine version])
+fi
+
+AM_INIT_AUTOMAKE(OpenLDAP,[$OL_VERSION], [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], [
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_slapd = no ; then
dnl SLAPD was specificallly disabled
if test $ol_enable_bdb2 = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_bdb2 argument])
+ AC_MSG_WARN([slapd disabled, ignoring --enable-bdb2 argument])
+ fi
+ if test $ol_enable_ldap = yes ; then
+ AC_MSG_WARN([slapd disabled, ignoring --enable-ldap argument])
fi
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_perl = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_perl argument])
+ AC_MSG_WARN([slapd disabled, ignoring --enable-perl 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_tcl = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_tcl argument])
+ AC_MSG_WARN([slapd disabled, ignoring --enable-tcl argument])
fi
if test $ol_enable_aclgroups = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_aclgroups argument])
+ 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])
+ 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])
+ 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])
# force settings to no
ol_enable_bdb2=no
+ ol_enable_ldap=no
ol_enable_ldbm=no
ol_enable_passwd=no
ol_enable_perl=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_bdb2 = yes ; then
fi
if test $ol_enable_modules != yes -a \
+ $ol_enable_ldap = no -a \
$ol_enable_passwd = no -a \
$ol_enable_perl = no -a \
$ol_enable_shell = no -a \
BUILD_SLURPD=no
BUILD_BDB2=no
+BUILD_LDAP=no
BUILD_LDBM=no
BUILD_PASSWD=no
BUILD_PERL=no
dnl ----------------------------------------------------------------
dnl Checks for programs
-AC_PROG_INSTALL
+dnl AC_PROG_INSTALL
dnl The default compiler is cc (NOT gcc)
-CC=${CC-"cc"}
+dnl (should check to see if 'cc' exists)
+save_CC="$CC"
+if test -z "${CC}"; then
+ AC_CHECK_PROGS(CC,cc)
+fi
+
dnl The default CFLAGS is empty NOT whatever AC_PROG_CC sets.
dnl CFLAGS=${CFLAGS-""}
+dnl
+dnl AIX Thread requires we use cc_r or xlc_r.
+dnl But only do this IF AIX and CC is zero (initially),
+dnl and cc exists and threads are auto|yes|posix.
+dnl
+dnl If we find cc_r|xlc_r, force pthreads and assume
+dnl pthread_create is in $LIBS (ie: don't bring in
+dnl any additional thread libraries)
+dnl If we do not find cc_r|xlc_r, disable threads
+dnl
+AC_CANONICAL_HOST
+
+case "$host" in
+ *-*-aix*) ol_host_os=aix ;;
+esac
+
+ol_aix_threads=no
+if test -z "$save_CC" -a "$CC" = cc -a "$ol_host_os" = aix ; then
+ case "$ol_with_threads" in
+ auto | yes | posix) ol_aix_threads=yes ;;
+ esac
+fi
+
+if test ol_aix_threads = yes ; then
+ CC=
+ AC_CHECK_PROGS(CC,cc_r xlc_r)
+
+ if test "$CC" ; then
+ if test $ol_with_threads != auto ; then
+ AC_MSG_ERROR([--with-threads requires cc_r (or other suitable compiler) on AIX])
+ else
+ AC_MSG_WARN([disabling threads, no cc_r on AIX])
+ fi
+ ol_with_threads=no
+ else
+ ol_with_threads=posix
+ ol_cv_pthread_create=yes
+ fi
+fi
+
AM_PROG_LIBTOOL
dnl AC_PROG_MAKE_SET
AC_ISC_POSIX
AC_MINIX
-dnl BeOS requires -lbe -lroot
-AC_CHECK_LIB(be, be_app, [LIBS="$LIBS -lbe -lroot"], :, [-lroot])
+dnl BeOS requires -lbe -lroot -lnet
+AC_CHECK_LIB(be, be_app, [LIBS="$LIBS -lbe -lroot -lnet"], :, [-lroot -lnet])
dnl Checks for system services
AC_CYGWIN
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 AM_C_PROTOTYPES
+dnl Check cc depend flags
+OL_MKDEPEND
+if test "${ol_cv_mkdep}" = no ; then
+ # this will soon become an error
+ AC_MSG_WARN([do not know how to generate dependencies])
+fi
+
dnl Checks for libraries
dnl Find socket()
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 HP-UX requires -lV3
AC_CHECK_LIB(V3, sigset)
+AC_CHECK_HEADERS( regex.h )
+if test "$ac_cv_header_regex_h" != yes ; then
+ AC_MSG_ERROR([POSIX regex.h required.])
+fi
+AC_CHECK_FUNC(regfree, :, AC_MSG_ERROR([POSIX regex required.]))
+
AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.]))
dnl Select arg types
# ISODE tests
ol_link_isode=no
if test $ol_enable_ldapd != no ; then
+ AC_MSG_WARN([ldapd support deprecated. Manual intervention required.])
+
dnl look for ISODE libraries
AC_CHECK_LIB(xtpp, main, [
ol_link_isode=yes
[ol_cv_errno_thread_specific=no])
])
- if test $ol_cv_errno_thread_specific != yes ; then
+ dnl The h_errno declaration may dependent upon _REENTRANT.
+ dnl If it does, we must link with thread support.
+ AC_CACHE_CHECK([for thread specific h_errno],
+ [ol_cv_h_errno_thread_specific], [
+ AC_TRY_LINK([#include <netdb.h>], [h_errno = 0;],
+ [ol_cv_h_errno_thread_specific=yes],
+ [ol_cv_h_errno_thread_specific=no])
+ ])
+
+ if test $ol_cv_errno_thread_specific != yes \
+ -o $ol_cv_h_errno_thread_specific != yes ; then
LIBS="$LTHREAD_LIBS $LIBS"
LTHREAD_LIBS=""
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
locale.h \
malloc.h \
memory.h \
- regex.h \
psap.h \
pwd.h \
resolv.h \
sys/ioctl.h \
sys/param.h \
sys/resource.h \
+ sys/select.h \
sys/socket.h \
sys/syslog.h \
sys/time.h \
AC_CHECK_FUNCS( \
bcopy \
+ closesocket \
endgrent \
endpwent \
flock \
# Check Configuration
OL_SYS_ERRLIST
-dnl ----------------------------------------------------------------
-dnl Check our declaration of strdup()
-OL_DECL_STRDUP
-
dnl ----------------------------------------------------------------
dnl Sort out defines
BUILD_BDB2=yes
fi
+if test "$ol_enable_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
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)
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