From fa2ab77d9f7425d153e6712c5b4a1af99ccc9111 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 24 Dec 1998 19:42:30 +0000 Subject: [PATCH] Update docs and import Randy's configure.in cleanup changes from -devel. --- CHANGES | 4 +++- Makefile.in | 10 ++++++++++ README | 2 +- configure | 36 ++++++++++++++++++------------------ configure.in | 38 +++++++++++++++++++------------------- include/portable.h.in | 3 +++ 6 files changed, 54 insertions(+), 39 deletions(-) diff --git a/CHANGES b/CHANGES index e80ec243da..439363ec93 100644 --- a/CHANGES +++ b/CHANGES @@ -2,7 +2,7 @@ OpenLDAP Change Log Changes included in OpenLDAP 1.1.1 CVS Tag: OPENLDAP_REL_ENG_1_1 - Updated INSTALL, hints, and devel documents. + Updated INSTALL, README, hints, and devel documents. Updated slapd/ldif2dbm to disable write sync'ing Fixed slapd & slurpd syslogging (ITS#6) Fixed libldif/line64 analyzed 3 not 4 bug @@ -10,11 +10,13 @@ Changes included in OpenLDAP 1.1.1 Fixed slapd/back-ldbm/cache.c delete_internal dntree/idtree bug Fixed slapd/tools DB2 uninitialized Datum bugs Fixed slapd/back-ldbm search realbase free bug (ITS#12) + Fixed slapd/back-ldbm kerberos bind rc bug (ITS#17) Build environment (autoconf) Fix --enable-wrappers (ITS#9) Fix --without-SERVER-COMPONENTS Fix library make clean Fix ltconfig for Solaris ProC and FreeBSD elf + Fix make veryclean Changes included in OpenLDAP 1.1.0 CVS Tag: OPENLDAP_REL_ENG_1_1_0 diff --git a/Makefile.in b/Makefile.in index 6852e77e62..91866269b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -29,3 +29,13 @@ Makefile: Makefile.in config.status config.status: configure ./config.status --recheck + +# force a make all before make install +# only done at the top-level +install-common: all FORCE + +clean-local: FORCE + $(RM) config.log + +veryclean-local: FORCE + $(RM) config.cache config.status libtool stamp-h stamp-h.in diff --git a/README b/README index 4d5e50e4eb..051b607a37 100644 --- a/README +++ b/README @@ -23,7 +23,7 @@ REQUIRED SOFTWARE SLAPD: LDBM compatible datastore - (Berkeley DB, Sleepycat DB2, or GDBM) + (Berkeley DB, Sleepycat Berkeley DB 2.3.16, or GDBM) SLURPD: LTHREAD compatible thread package diff --git a/configure b/configure index 3f3a9b6bd8..673d4f5888 100755 --- a/configure +++ b/configure @@ -7724,7 +7724,7 @@ fi if test $ac_cv_func_vprintf = yes ; then - for ac_func in vsnprintf + for ac_func in vsnprintf vsprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:7731: checking for $ac_func" >&5 @@ -8057,81 +8057,81 @@ fi -if test $ol_enable_debug != no ; then +if test "$ol_enable_debug" != no ; then cat >> confdefs.h <<\EOF #define LDAP_DEBUG 1 EOF fi -if test $ol_enable_libui = yes ; then +if test "$ol_enable_libui" = yes ; then cat >> confdefs.h <<\EOF #define LDAP_LIBUI 1 EOF fi -if test $ol_enable_cache = no ; then +if test "$ol_enable_cache" = no ; then cat >> confdefs.h <<\EOF #define LDAP_NOCACHE 1 EOF fi -if test $ol_enable_dns != no ; then +if test "$ol_enable_dns" != no ; then cat >> confdefs.h <<\EOF #define LDAP_DNS 1 EOF fi -if test $ol_enable_proctitle != no ; then +if test "$ol_enable_proctitle" != no ; then cat >> confdefs.h <<\EOF #define LDAP_PROCTITLE 1 EOF fi -if test $ol_enable_referrals != no ; then +if test "$ol_enable_referrals" != no ; then cat >> confdefs.h <<\EOF #define LDAP_REFERRALS 1 EOF fi -if test $ol_enable_cldap != no ; then +if test "$ol_enable_cldap" != no ; then cat >> confdefs.h <<\EOF #define LDAP_CONNECTIONLESS 1 EOF fi -if test $ol_enable_aclgroups != no ; then +if test "$ol_enable_aclgroups" != no ; then cat >> confdefs.h <<\EOF #define SLAPD_ACLGROUPS 1 EOF fi -if test $ol_enable_crypt != no ; then +if test "$ol_enable_crypt" != no ; then cat >> confdefs.h <<\EOF #define SLAPD_CRYPT 1 EOF fi -if test $ol_enable_cleartext != no ; then +if test "$ol_enable_cleartext" != no ; then cat >> confdefs.h <<\EOF #define SLAPD_CLEARTEXT 1 EOF fi -if test $ol_enable_phonetic != no ; then +if test "$ol_enable_phonetic" != no ; then cat >> confdefs.h <<\EOF #define SLAPD_PHONETIC 1 EOF fi -if test $ol_enable_rlookups != no ; then +if test "$ol_enable_rlookups" != no ; then cat >> confdefs.h <<\EOF #define SLAPD_RLOOKUPS 1 EOF fi -if test $ol_link_ldbm != no ; then +if test "$ol_link_ldbm" != no ; then cat >> confdefs.h <<\EOF #define SLAPD_LDBM 1 EOF @@ -8140,7 +8140,7 @@ EOF BUILD_LDBM=yes fi -if test $ol_enable_passwd != no ; then +if test "$ol_enable_passwd" != no ; then cat >> confdefs.h <<\EOF #define SLAPD_PASSWD 1 EOF @@ -8149,7 +8149,7 @@ EOF BUILD_PASSWD=yes fi -if test $ol_enable_shell != no ; then +if test "$ol_enable_shell" != no ; then cat >> confdefs.h <<\EOF #define SLAPD_SHELL 1 EOF @@ -8158,12 +8158,12 @@ EOF BUILD_SHELL=yes fi -if test $ol_enable_slurpd != no -a $ol_link_threads != no -a \ +if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \ $BUILD_SLAPD = yes ; then BUILD_SLURPD=yes fi -if test $ol_link_isode != no ; then +if test "$ol_link_isode" != no ; then BUILD_LDAPD=yes fi diff --git a/configure.in b/configure.in index bc6b50805c..00fded675a 100644 --- a/configure.in +++ b/configure.in @@ -1096,7 +1096,7 @@ AC_FUNC_VPRINTF if test $ac_cv_func_vprintf = yes ; then dnl check for vsnprintf - AC_CHECK_FUNCS(vsnprintf) + AC_CHECK_FUNCS(vsnprintf vsprintf) fi AC_FUNC_WAIT3 @@ -1142,71 +1142,71 @@ OL_SYS_ERRLIST dnl ---------------------------------------------------------------- dnl Sort out defines -if test $ol_enable_debug != no ; then +if test "$ol_enable_debug" != no ; then AC_DEFINE(LDAP_DEBUG,1) fi -dnl if test $ol_enable_syslog != no ; then +dnl if test "$ol_enable_syslog" != no ; then dnl AC_DEFINE(LDAP_SYSLOG,1) dnl fi -if test $ol_enable_libui = yes ; then +if test "$ol_enable_libui" = yes ; then AC_DEFINE(LDAP_LIBUI,1) fi -if test $ol_enable_cache = no ; then +if test "$ol_enable_cache" = no ; then AC_DEFINE(LDAP_NOCACHE,1) fi -if test $ol_enable_dns != no ; then +if test "$ol_enable_dns" != no ; then AC_DEFINE(LDAP_DNS,1) fi -if test $ol_enable_proctitle != no ; then +if test "$ol_enable_proctitle" != no ; then AC_DEFINE(LDAP_PROCTITLE,1) fi -if test $ol_enable_referrals != no ; then +if test "$ol_enable_referrals" != no ; then AC_DEFINE(LDAP_REFERRALS,1) fi -if test $ol_enable_cldap != no ; then +if test "$ol_enable_cldap" != no ; then AC_DEFINE(LDAP_CONNECTIONLESS,1) fi -if test $ol_enable_aclgroups != no ; then +if test "$ol_enable_aclgroups" != no ; then AC_DEFINE(SLAPD_ACLGROUPS,1) fi -if test $ol_enable_crypt != no ; then +if test "$ol_enable_crypt" != no ; then AC_DEFINE(SLAPD_CRYPT,1) fi -if test $ol_enable_cleartext != no ; then +if test "$ol_enable_cleartext" != no ; then AC_DEFINE(SLAPD_CLEARTEXT,1) fi -if test $ol_enable_phonetic != no ; then +if test "$ol_enable_phonetic" != no ; then AC_DEFINE(SLAPD_PHONETIC,1) fi -if test $ol_enable_rlookups != no ; then +if test "$ol_enable_rlookups" != no ; then AC_DEFINE(SLAPD_RLOOKUPS,1) fi -if test $ol_link_ldbm != no ; then +if test "$ol_link_ldbm" != no ; then AC_DEFINE(SLAPD_LDBM,1) BUILD_SLAPD=yes BUILD_LDBM=yes fi -if test $ol_enable_passwd != no ; then +if test "$ol_enable_passwd" != no ; then AC_DEFINE(SLAPD_PASSWD,1) BUILD_SLAPD=yes BUILD_PASSWD=yes fi -if test $ol_enable_shell != no ; then +if test "$ol_enable_shell" != no ; then AC_DEFINE(SLAPD_SHELL,1) BUILD_SLAPD=yes BUILD_SHELL=yes fi -if test $ol_enable_slurpd != no -a $ol_link_threads != no -a \ +if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \ $BUILD_SLAPD = yes ; then BUILD_SLURPD=yes fi -if test $ol_link_isode != no ; then +if test "$ol_link_isode" != no ; then BUILD_LDAPD=yes fi diff --git a/include/portable.h.in b/include/portable.h.in index 680f253a30..f531273a20 100644 --- a/include/portable.h.in +++ b/include/portable.h.in @@ -432,6 +432,9 @@ is provided ``as is'' without express or implied warranty. /* Define if you have the vsnprintf function. */ #undef HAVE_VSNPRINTF +/* Define if you have the vsprintf function. */ +#undef HAVE_VSPRINTF + /* Define if you have the waitpid function. */ #undef HAVE_WAITPID -- 2.39.2