Generate OpenLDAP id for configure

[openldap] / configure.in

diff --git a/configure.in b/configure.in
index 0c032f89ac8498b6aece2576eadfa4f698ad9426..3612401224a39670f85d926ace6c17cb1e9533a3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,11 @@
-dnl
+dnl $OpenLDAP$
+
 dnl Copyright 1998,1999 The OpenLDAP Foundation.  All Rights Reserved.
 dnl 
 dnl Redistribution and use in source and binary forms are permitted only
 dnl as authorized by the OpenLDAP Public License.  A copy of this
 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 Disable config.cache!
 define([AC_CACHE_LOAD], )dnl
@@ -14,6 +14,7 @@ define([AC_CACHE_SAVE], )dnl
 dnl Configure.in for OpenLDAP
 AC_INIT(build/version)dnl
 AC_CONFIG_AUX_DIR(build)dnl
+OPENLDAP_ID=OL_RCS_ID(OpenLDAP)
 
 OL_VERSION=`cat $ac_aux_dir/version`
 if test -z "$OL_VERSION"; then
@@ -71,7 +72,7 @@ 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(dns,[  --enable-dns              enable V2 DX Referrals extension], no)dnl
 OL_ARG_ENABLE(referrals,[  --enable-referrals  enable V2 Referrals extension], yes)dnl
 OL_ARG_ENABLE(cldap,[  --enable-cldap  enable connectionless ldap], no)dnl
 OL_ARG_ENABLE(x_compile,[  --enable-x-compile  enable cross compiling],
@@ -98,11 +99,11 @@ OL_ARG_WITH(yielding_select,[  --with-yielding-select       with implicitly yielding s
 dnl Server options
 
 dnl LDAPD OPTIONS
-AC_ARG_WITH(xxldapdoptions,[LDAPD Options:])
+AC_ARG_WITH(xxldapdoptions,[LDAPD (X.500-to-LDAP Gateway) Options:])
 OL_ARG_ENABLE(ldapd,[  --enable-ldapd  enable building ldapd], no)dnl
 
 dnl SLAPD OPTIONS
-AC_ARG_WITH(xxslapdoptions,[SLAPD Options:])
+AC_ARG_WITH(xxslapdoptions,[SLAPD (Standalone LDAP Daemon) Options:])
 OL_ARG_ENABLE(slapd,[  --enable-slapd  enable building slapd], yes)dnl
 OL_ARG_ENABLE(cleartext,[    --enable-cleartext        enable cleartext passwords], yes)dnl
 OL_ARG_ENABLE(crypt,[    --enable-crypt        enable crypt(3) passwords], auto)dnl
@@ -144,7 +145,7 @@ OL_ARG_WITH(tcl_module,[      --with-tcl-module     module type], static,
        [static dynamic])
 
 dnl SLURPD OPTIONS
-AC_ARG_WITH(xxslurpdoptions,[SLURPD Options:])
+AC_ARG_WITH(xxslurpdoptions,[SLURPD (Replication Daemon) Options:])
 OL_ARG_ENABLE(slurpd,[  --enable-slurpd        enable building slurpd], auto)dnl
 
 AC_ARG_WITH(xxliboptions,[Library Generation & Linking Options])
@@ -403,7 +404,6 @@ dnl AC_PROG_INSTALL
 
 AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion])
 
-
 dnl
 dnl Determine which C translator to use
 dnl
@@ -628,9 +628,7 @@ dnl         -lsocket [ -lnsl_s | -lnsl ]
 dnl            -linet
 
 AC_CHECK_FUNC(socket, :, [     
-dnl
 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)
@@ -640,14 +638,19 @@ dnl
        AC_CHECK_LIB(gen, main)
 ])
 
+dnl require select
 AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.]))
+dnl AC_CHECK_FUNCS(socketpair)
 
 dnl Select arg types
 dnl (if this detection becomes permenent, it and the select() detection
 dnl should be done before the yielding select test) 
 AC_FUNC_SELECT_ARGTYPES
 
+dnl check to see if system call automatically restart
+dnl AC_SYS_RESTARTABLE_SYSCALLS
 
+dnl require POSIX regex
 AC_CHECK_HEADERS( regex.h )
 if test "$ac_cv_header_regex_h" != yes ; then
        AC_MSG_ERROR([POSIX regex.h required.])
@@ -659,7 +662,6 @@ if test "$ol_cv_c_posix_regex" = no ; then
        AC_MSG_ERROR([broken POSIX regex!])
 fi
 
-
 dnl HP-UX requires -lV3
 AC_CHECK_LIB(V3, sigset)
 
@@ -1837,6 +1839,7 @@ AC_CHECK_FUNCS(           \
        memcpy                  \
        memmove                 \
        mkstemp                 \
+       pipe                    \
        read                    \
        recv                    \
        recvfrom                \
@@ -1846,6 +1849,7 @@ AC_CHECK_FUNCS(           \
        setsid                  \
        setuid                  \
        seteuid                 \
+       sigaction               \
        signal                  \
        sigset                  \
        snprintf                \