Added fix to allow modrdn whose new rdn was already an attr value.

[openldap] / configure.in

diff --git a/configure.in b/configure.in
index 8bbe32b472b6a98f1767304e0951b12f0eb6dfae..a3611e755c52fea31bc10b152b8fd39661566326 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,11 @@ 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
@@ -30,6 +34,8 @@ AC_PREFIX_DEFAULT(/usr/local)
 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], [
@@ -86,6 +92,7 @@ OL_ARG_ENABLE(wrappers,[    --enable-wrappers enable tcp wrapper support], no)dn
 
 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])
@@ -267,6 +274,7 @@ BUILD_SLAPD=no
 BUILD_SLURPD=no
 
 BUILD_BDB2=no
+BUILD_LDAP=no
 BUILD_LDBM=no
 BUILD_PASSWD=no
 BUILD_PERL=no
@@ -376,6 +384,8 @@ AC_MINGW32
 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
@@ -397,6 +407,7 @@ dnl hopefully we won't include too many libraries
 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)
@@ -1124,7 +1135,7 @@ dnl               #ifdef LDAP_R_COMPILE
 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            
@@ -1293,6 +1304,10 @@ if test $ol_enable_wrappers != no ; then
        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
@@ -1485,6 +1500,7 @@ AC_CHECK_HEADERS( \
        sys/ioctl.h             \
        sys/param.h             \
        sys/resource.h  \
+       sys/select.h    \
        sys/socket.h    \
        sys/syslog.h    \
        sys/time.h              \
@@ -1528,6 +1544,8 @@ AC_FUNC_MEMCMP
 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
 
@@ -1584,10 +1602,6 @@ dnl ----------------------------------------------------------------
 # Check Configuration
 OL_SYS_ERRLIST
 
-dnl ----------------------------------------------------------------
-dnl Check our declaration of strdup()
-OL_DECL_STRDUP
-
 dnl ----------------------------------------------------------------
 dnl Sort out defines
 
@@ -1643,6 +1657,12 @@ if test "$ol_link_bdb2" != no ; then
        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
@@ -1687,6 +1707,7 @@ dnl ----------------------------------------------------------------
 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)
@@ -1746,6 +1767,7 @@ 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 \
 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 \