upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Backout autoconf 2.57 changes. Too much work for now.

Browse source
This commit is contained in:
Kurt Zeilenga 2003-04-07 22:23:24 +00:00
parent b851a1a757
commit acdbf29e93
8 changed files with 10730 additions and 22267 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.in
View file

@ -25,7 +25,7 @@ clean-local: FORCE
$(RM) config.log $(RM) config.log
veryclean-local: FORCE veryclean-local: FORCE
$(RM) config.cache config.status configure.lineno libtool stamp-h $(RM) config.cache config.status libtool stamp-h stamp-h.in
distclean: veryclean FORCE distclean: veryclean FORCE

1
acconfig.h
View file

@ -117,6 +117,5 @@
#include "ldap_features.h" #include "ldap_features.h"
#include "ac/assert.h" #include "ac/assert.h"
#include "ac/localize.h"
#endif /* _LDAP_PORTABLE_H */ #endif /* _LDAP_PORTABLE_H */

287
aclocal.m4 vendored
View file

@ -1,15 +1,14 @@
# generated automatically by aclocal 1.7.3 -*- Autoconf -*- dnl aclocal.m4 generated automatically by aclocal 1.4a
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation
# This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it,
# gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful, dnl This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE. dnl PARTICULAR PURPOSE.
dnl dnl
dnl Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA dnl Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
@ -26,43 +25,119 @@ dnl
divert(-1) divert(-1)
builtin(include, build/openldap.m4)dnl builtin(include, build/openldap.m4)dnl
# Do all the work for Automake. This macro actually does too much --
# some checks are only needed if your package does certain things.
# But this isn't really a big deal.
AC_DEFUN(AC_PROG_SHTOOL,[dnl # serial 1
AC_PREREQ(2.13)dnl
AC_MSG_CHECKING([for GNU shtool]) dnl Usage:
AC_CACHE_VAL(ac_cv_shtool,[dnl dnl AM_INIT_AUTOMAKE(package,version, [no-define])
# canonicalize and split path string
ac_paths="`echo .:$ac_aux_dir:$PATH |\ AC_DEFUN(AM_INIT_AUTOMAKE,
sed -e 's%/*:%:%g' -e 's%/*$%%' \ [AC_REQUIRE([AC_PROG_INSTALL])
-e 's/^:/.:/' -e 's/::/:.:/g' -e 's/:$/:./' \ dnl We require 2.13 because we rely on SHELL being computed by configure.
-e 's/:/ /g'`" AC_PREREQ([2.13])
# iterate over $PATH but prefer CWD PACKAGE=[$1]
ac_cv_shtool="" AC_SUBST(PACKAGE)
for ac_path in $ac_paths; do VERSION=[$2]
if test -f "$ac_path/shtool" && test ! -d "$ac_path/shtool"; then AC_SUBST(VERSION)
ac_cv_shtool="$ac_path/shtool" dnl test to see if srcdir already configured
break if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
fi AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
done
# check for existance
if test ".$ac_cv_shtool" = .; then
AC_MSG_ERROR([no shtool found in .:$PATH])
fi fi
# check deeper ifelse([$3],,
ac_rc=`($ac_cv_shtool --version) </dev/null 2>/dev/null | grep 'GNU shtool'` AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
if test ".$ac_rc" = .; then AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
ac_cv_shtool="${CONFIG_SHELL-/bin/sh} $ac_cv_shtool" AC_REQUIRE([AM_SANITY_CHECK])
ac_rc=`($ac_cv_shtool --version) </dev/null 2>/dev/null | grep 'GNU shtool'` AC_REQUIRE([AC_ARG_PROGRAM])
if test ".$ac_rc" = .; then dnl FIXME This is truly gross.
AC_MSG_ERROR([$ac_cv_shtool seems not to be GNU shtool]) missing_dir=`cd $ac_aux_dir && pwd`
AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
dnl Set install_sh for make dist
install_sh="$missing_dir/install-sh"
test -f "$install_sh" || install_sh="$missing_dir/install.sh"
AC_SUBST(install_sh)
dnl We check for tar when the user configures the end package.
dnl This is sad, since we only need this for "dist". However,
dnl there's no other good way to do it. We prefer GNU tar if
dnl we can find it. If we can't find a tar, it doesn't really matter.
AC_CHECK_PROGS(AMTAR, gnutar gtar tar)
dnl We need awk for the "check" target. The system "awk" is bad on
dnl some platforms.
AC_REQUIRE([AC_PROG_AWK])
AMTARFLAGS=
if test -n "$AMTAR"; then
if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then
dnl We have GNU tar.
AMTARFLAGS=o
fi fi
fi fi
])dnl AC_SUBST(AMTARFLAGS)
AC_MSG_RESULT([$ac_cv_shtool]) AC_REQUIRE([AC_PROG_MAKE_SET])])
SHTOOL="$ac_cv_shtool"
AC_SUBST(SHTOOL)
])
#
# Check to make sure that the build environment is sane.
#
AC_DEFUN(AM_SANITY_CHECK,
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
echo timestamp > conftestfile
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
if test "[$]*" = "X"; then
# -L didn't work.
set X `ls -t $srcdir/configure conftestfile`
fi
if test "[$]*" != "X $srcdir/configure conftestfile" \
&& test "[$]*" != "X conftestfile $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
alias in your environment])
fi
test "[$]2" = conftestfile
)
then
# Ok.
:
else
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
rm -f conftest*
AC_MSG_RESULT(yes)])
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
dnl The program must properly implement --version.
AC_DEFUN(AM_MISSING_PROG,
[AC_MSG_CHECKING(for working $2)
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if ($2 --version) < /dev/null > /dev/null 2>&1; then
$1=$2
AC_MSG_RESULT(found)
else
$1="$3/missing $2"
AC_MSG_RESULT(missing)
fi
AC_SUBST($1)])
# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
@ -3686,24 +3761,7 @@ AC_MSG_RESULT([$SED])
]) ])
# Copyright 1996, 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. # serial 1
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 2
# @defmac AC_PROG_CC_STDC # @defmac AC_PROG_CC_STDC
# @maindex PROG_CC_STDC # @maindex PROG_CC_STDC
@ -3720,7 +3778,7 @@ AC_MSG_RESULT([$SED])
# program @code{ansi2knr}, which comes with Ghostscript. # program @code{ansi2knr}, which comes with Ghostscript.
# @end defmac # @end defmac
AC_DEFUN([AM_PROG_CC_STDC], AC_DEFUN(AM_PROG_CC_STDC,
[AC_REQUIRE([AC_PROG_CC]) [AC_REQUIRE([AC_PROG_CC])
AC_BEFORE([$0], [AC_C_INLINE]) AC_BEFORE([$0], [AC_C_INLINE])
AC_BEFORE([$0], [AC_C_CONST]) AC_BEFORE([$0], [AC_C_CONST])
@ -3730,7 +3788,7 @@ dnl like #elif.
dnl FIXME: can't do this because then AC_AIX won't work due to a dnl FIXME: can't do this because then AC_AIX won't work due to a
dnl circular dependency. dnl circular dependency.
dnl AC_BEFORE([$0], [AC_PROG_CPP]) dnl AC_BEFORE([$0], [AC_PROG_CPP])
AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C]) AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
AC_CACHE_VAL(am_cv_prog_cc_stdc, AC_CACHE_VAL(am_cv_prog_cc_stdc,
[am_cv_prog_cc_stdc=no [am_cv_prog_cc_stdc=no
ac_save_CC="$CC" ac_save_CC="$CC"
@ -3783,7 +3841,7 @@ CC="$ac_save_CC"
if test -z "$am_cv_prog_cc_stdc"; then if test -z "$am_cv_prog_cc_stdc"; then
AC_MSG_RESULT([none needed]) AC_MSG_RESULT([none needed])
else else
AC_MSG_RESULT([$am_cv_prog_cc_stdc]) AC_MSG_RESULT($am_cv_prog_cc_stdc)
fi fi
case "x$am_cv_prog_cc_stdc" in case "x$am_cv_prog_cc_stdc" in
x|xno) ;; x|xno) ;;
@ -3791,55 +3849,68 @@ case "x$am_cv_prog_cc_stdc" in
esac esac
]) ])
AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC]) dnl From Jim Meyering.
# Helper functions for option handling. -*- Autoconf -*-
# Copyright 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 1 # serial 1
# Obsolete Automake macros. AC_DEFUN(AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL,
[AC_REQUIRE([AM_SYS_POSIX_TERMIOS])
AC_CACHE_CHECK([whether use of TIOCGWINSZ requires sys/ioctl.h],
am_cv_sys_tiocgwinsz_needs_sys_ioctl_h,
[am_cv_sys_tiocgwinsz_needs_sys_ioctl_h=no
# We put here only the macros whose substitution is not an Automake gwinsz_in_termios_h=no
# macro; otherwise including this file would trigger dependencies for if test $am_cv_sys_posix_termios = yes; then
# all the subsitutions. Generally, obsolete Automake macros are AC_EGREP_CPP([yes],
# better AU_DEFUNed in the same file as their replacement, or alone in [#include <sys/types.h>
# a separate file (see obsol-gt.m4 or obsol-lt.m4 for instance). # include <termios.h>
# ifdef TIOCGWINSZ
yes
# endif
], gwinsz_in_termios_h=yes)
fi
AU_DEFUN([AC_FEATURE_CTYPE], [AC_HEADER_STDC]) if test $gwinsz_in_termios_h = no; then
AU_DEFUN([AC_FEATURE_ERRNO], [AC_REPLACE_FUNCS([strerror])]) AC_EGREP_CPP([yes],
AU_DEFUN([AM_CYGWIN32], [AC_CYGWIN]) [#include <sys/types.h>
AU_DEFUN([AM_EXEEXT], [AC_EXEEXT]) # include <sys/ioctl.h>
AU_DEFUN([AM_FUNC_MKTIME], [AC_FUNC_MKTIME]) # ifdef TIOCGWINSZ
AU_DEFUN([AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL], yes
[AC_HEADER_TIOCGWINSZ]) # endif
AU_DEFUN([AM_MINGW32], [AC_MINGW32]) ], am_cv_sys_tiocgwinsz_needs_sys_ioctl_h=yes)
AU_DEFUN([AM_PROG_INSTALL], [AC_PROG_INSTALL]) fi
AU_DEFUN([AM_SANITY_CHECK_CC], [AC_PROG_CC]) ])
AU_DEFUN([AM_SYS_POSIX_TERMIOS], [AC_SYS_POSIX_TERMIOS]) if test $am_cv_sys_tiocgwinsz_needs_sys_ioctl_h = yes; then
AU_DEFUN([fp_FUNC_FNMATCH], [AC_FUNC_FNMATCH]) AC_DEFINE(GWINSZ_IN_SYS_IOCTL,1,
AU_DEFUN([fp_PROG_INSTALL], [AC_PROG_INSTALL]) [Define if TIOCGWINSZ requires sys/ioctl.h])
AU_DEFUN([md_TYPE_PTRDIFF_T], [AC_CHECK_TYPES([ptrdiff_t])]) fi
])
# Don't know how to translate these. dnl From Jim Meyering.
# If used, Autoconf will complain that they are possibly unexpended;
# this seems a good enough error message. # serial 1
# AC_FEATURE_EXIT
# AC_SYSTEM_HEADER AC_DEFUN(AM_SYS_POSIX_TERMIOS,
[AC_CACHE_CHECK([POSIX termios], am_cv_sys_posix_termios,
[AC_TRY_LINK([#include <sys/types.h>
#include <unistd.h>
#include <termios.h>],
[/* SunOS 4.0.3 has termios.h but not the library calls. */
tcgetattr(0, 0);],
am_cv_sys_posix_termios=yes,
am_cv_sys_posix_termios=no)])
])
# From Ulrich Drepper.
# serial 1
AC_DEFUN(AM_TYPE_PTRDIFF_T,
[AC_CACHE_CHECK([for ptrdiff_t], am_cv_type_ptrdiff_t,
[AC_TRY_COMPILE([#include <stddef.h>], [ptrdiff_t p],
am_cv_type_ptrdiff_t=yes, am_cv_type_ptrdiff_t=no)])
if test $am_cv_type_ptrdiff_t = yes; then
AC_DEFINE(HAVE_PTRDIFF_T,1,[Define if system has ptrdiff_t type])
fi
])

87
build/openldap.m4
View file

@ -19,10 +19,9 @@ dnl $2 = help-string
dnl $3 = default value (auto) dnl $3 = default value (auto)
dnl $4 = allowed values (auto yes no) dnl $4 = allowed values (auto yes no)
AC_DEFUN([OL_ARG_ENABLE], [# OpenLDAP --enable-$1 AC_DEFUN([OL_ARG_ENABLE], [# OpenLDAP --enable-$1
AC_ARG_ENABLE([$1], AC_HELP_STRING([--enable-$1], AC_ARG_ENABLE($1,changequote(<,>)<$2 [>ifelse($3,,auto,$3)<]>changequote([,]),[
[$2 <m4_ifval([$4],[$4],[auto yes no])> default=m4_ifval([$3],[$3],[auto])]), ol_arg=invalid
[ ol_arg=invalid for ol_val in ifelse($4,,[auto yes no],[$4]) ; do
for ol_val in m4_ifval([$4],[$4],[auto yes no]) ; do
if test "$enableval" = "$ol_val" ; then if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val" ol_arg="$ol_val"
fi fi
@ -32,7 +31,8 @@ AC_DEFUN([OL_ARG_ENABLE], [# OpenLDAP --enable-$1
fi fi
ol_enable_$1="$ol_arg" ol_enable_$1="$ol_arg"
], ],
[ ol_enable_$1=m4_ifval([$3],["$3"],["auto"])])dnl [ ol_enable_$1=ifelse($3,,"auto","$3")])dnl
dnl AC_VERBOSE(OpenLDAP -enable-$1 $ol_enable_$1)
# end --enable-$1 # end --enable-$1
])dnl ])dnl
dnl dnl
@ -42,12 +42,11 @@ dnl
dnl $1 = option name dnl $1 = option name
dnl $2 = help-string dnl $2 = help-string
dnl $3 = default value (no) dnl $3 = default value (no)
dnl $4 = allowed values (yes no) dnl $4 = allowed values (yes or no)
AC_DEFUN([OL_ARG_WITH], [# OpenLDAP --with-$1 AC_DEFUN([OL_ARG_WITH], [# OpenLDAP --with-$1
AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1], AC_ARG_WITH($1,changequote(<,>)<$2 [>ifelse($3,,yes,$3)<]>changequote([,]),[
[$2 <m4_ifval([$4],[$4],[auto yes no])> default=m4_ifval([$3],[$3],[auto])]), ol_arg=invalid
[ ol_arg=invalid for ol_val in ifelse($4,,[yes no],[$4]) ; do
for ol_val in m4_ifval([$4],[$4],[auto yes no]) ; do
if test "$withval" = "$ol_val" ; then if test "$withval" = "$ol_val" ; then
ol_arg="$ol_val" ol_arg="$ol_val"
fi fi
@ -57,11 +56,39 @@ AC_DEFUN([OL_ARG_WITH], [# OpenLDAP --with-$1
fi fi
ol_with_$1="$ol_arg" ol_with_$1="$ol_arg"
], ],
[ ol_with_$1=m4_ifval([$3],["$3"],["auto"])])dnl [ ol_with_$1=ifelse($3,,"no","$3")])dnl
dnl AC_VERBOSE(OpenLDAP --with-$1 $ol_with_$1)
# end --with-$1 # end --with-$1
])dnl ])dnl
dnl dnl
dnl ==================================================================== dnl ====================================================================
dnl
AC_DEFUN(AC_COMPILE_CHECK_SIZEOF,
[changequote(<<, >>)dnl
dnl The name to #define.
define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
dnl The cache variable name.
define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
changequote([, ])dnl
AC_MSG_CHECKING(size of $1)
AC_CACHE_VAL(AC_CV_NAME,
[for ac_size in 4 8 1 2 16 $2 ; do # List sizes in rough order of prevalence.
AC_TRY_COMPILE([#include "confdefs.h"
#include <sys/types.h>
$2
], [switch (0) case 0: case (sizeof ($1) == $ac_size):;], AC_CV_NAME=$ac_size)
if test x$AC_CV_NAME != x ; then break; fi
done
])
if test x$AC_CV_NAME = x ; then
AC_MSG_ERROR([cannot determine a size for $1])
fi
AC_MSG_RESULT($AC_CV_NAME)
AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1])
undefine([AC_TYPE_NAME])dnl
undefine([AC_CV_NAME])dnl
])
dnl ====================================================================
dnl check if hard links are supported. dnl check if hard links are supported.
dnl dnl
AC_DEFUN([OL_PROG_LN_H], [# test for ln hardlink support AC_DEFUN([OL_PROG_LN_H], [# test for ln hardlink support
@ -189,19 +216,33 @@ dnl
dnl ==================================================================== dnl ====================================================================
dnl Check if struct passwd has pw_gecos dnl Check if struct passwd has pw_gecos
AC_DEFUN([OL_STRUCT_PASSWD_PW_GECOS], [# test for pw_gecos in struct passwd AC_DEFUN([OL_STRUCT_PASSWD_PW_GECOS], [# test for pw_gecos in struct passwd
AC_CHECK_MEMBER(struct passwd.pw_gecos,,,[#include <pwd.h>]) AC_CACHE_CHECK([struct passwd for pw_gecos],ol_cv_struct_passwd_pw_gecos,[
if test $ac_cv_member_struct_passwd_pw_gecos = "yes" ; then AC_TRY_COMPILE([#include <pwd.h>],[
struct passwd pwd;
pwd.pw_gecos = pwd.pw_name;
],
[ol_cv_struct_passwd_pw_gecos=yes],
[ol_cv_struct_passwd_pw_gecos=no])])
if test $ol_cv_struct_passwd_pw_gecos = yes ; then
AC_DEFINE(HAVE_PW_GECOS,1, [define if struct passwd has pw_gecos]) AC_DEFINE(HAVE_PW_GECOS,1, [define if struct passwd has pw_gecos])
fi fi
])dnl ])
dnl
dnl -------------------------------------------------------------------- dnl --------------------------------------------------------------------
dnl Check if struct passwd has pw_passwd dnl Check if struct passwd has pw_passwd
AC_DEFUN([OL_STRUCT_PASSWD_PW_PASSWD], [# test for pw_passwd in struct passwd AC_DEFUN([OL_STRUCT_PASSWD_PW_PASSWD], [# test for pw_passwd in struct passwd
AC_CHECK_MEMBER(struct passwd.pw_passwd,,,[#include <pwd.h>]) AC_CACHE_CHECK([struct passwd for pw_passwd],ol_cv_struct_passwd_pw_passwd,[
if test $ac_cv_member_struct_passwd_pw_passwd = "yes" ; then AC_TRY_COMPILE([#include <pwd.h>],[
struct passwd pwd;
pwd.pw_passwd = pwd.pw_name;
],
[ol_cv_struct_passwd_pw_passwd=yes],
[ol_cv_struct_passwd_pw_passwd=no])])
if test $ol_cv_struct_passwd_pw_passwd = yes ; then
AC_DEFINE(HAVE_PW_PASSWD,1, [define if struct passwd has pw_passwd]) AC_DEFINE(HAVE_PW_PASSWD,1, [define if struct passwd has pw_passwd])
fi fi
])dnl ])
dnl
dnl ==================================================================== dnl ====================================================================
dnl Berkeley DB macros dnl Berkeley DB macros
dnl dnl
@ -1178,8 +1219,12 @@ AC_DEFUN([OL_SASL_COMPAT],
dnl ==================================================================== dnl ====================================================================
dnl check for msg_accrights in msghdr dnl check for msg_accrights in msghdr
AC_DEFUN(OL_MSGHDR_MSG_ACCRIGHTS, AC_DEFUN(OL_MSGHDR_MSG_ACCRIGHTS,
[AC_CHECK_MEMBER(struct msghdr.msg_accrights,,,[#include <sys/socket.h>]) [AC_CACHE_CHECK(for msg_accrights in msghdr, ol_cv_msghdr_msg_accrights,
if test $ac_cv_member_struct_msghdr_msg_accrights = "yes" ; then [AC_TRY_COMPILE([#include <sys/socket.h>],
[struct msghdr m; m.msg_accrightslen=0],
ol_cv_msghdr_msg_accrights=yes, ol_cv_msghdr_msg_accrights=no)
])
if test $ol_cv_msghdr_msg_accrights = "yes" ; then
AC_DEFINE(HAVE_MSGHDR_MSG_ACCRIGHTS,1, AC_DEFINE(HAVE_MSGHDR_MSG_ACCRIGHTS,1,
[define if struct msghdr has msg_accrights]) [define if struct msghdr has msg_accrights])
fi fi

5
build/top.mk
View file

@ -8,8 +8,8 @@
## http://www.OpenLDAP.org/license.html or in file LICENSE in the ## http://www.OpenLDAP.org/license.html or in file LICENSE in the
## top-level directory of the distribution. ## top-level directory of the distribution.
## ##
PACKAGE= @OPENLDAP_PACKAGE@ PACKAGE= @PACKAGE@
VERSION= @OPENLDAP_VERSION@ VERSION= @VERSION@
RELEASEDATE= @OPENLDAP_RELEASE_DATE@ RELEASEDATE= @OPENLDAP_RELEASE_DATE@
@SET_MAKE@ @SET_MAKE@
@ -37,7 +37,6 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@$(ldap_subdir) sysconfdir = @sysconfdir@$(ldap_subdir)
schemadir = $(sysconfdir)/schema schemadir = $(sysconfdir)/schema
localedir = @datadir@/locale
PLAT = @PLAT@ PLAT = @PLAT@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@

31278
configure vendored
View file

File diff suppressed because it is too large Load diff

360
configure.in
View file

@ -9,28 +9,56 @@ dnl http://www.OpenLDAP.org/license.html or in file LICENSE in the
dnl top-level directory of the distribution. dnl top-level directory of the distribution.
dnl dnl
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
AC_COPYRIGHT( dnl Redefine AC_INIT_BINSH to provide RCS IDs and copyright notice
[Copyright 1998-2003 The OpenLDAP Foundation. All Rights Reserved. dnl at top of generated configure script. Prints simple copyright.
define([AC_INIT_BINSH],
[[#! /bin/sh
# $]OpenLDAP[$
# from] translit([$OpenLDAP$], $")] [
Redistribution and use in source and binary forms, with or without # Copyright 1998-2003 The OpenLDAP Foundation. All Rights Reserved.
modification, are permitted only as authorized by the OpenLDAP #
Public License. A copy of this license is available at # Redistribution and use in source and binary forms, with or without
http://www.OpenLDAP.org/license.html or in file LICENSE in the # modification, are permitted only as authorized by the OpenLDAP
top-level directory of the distribution. # Public License. A copy of this license is available at
# http://www.OpenLDAP.org/license.html or in file LICENSE in the
# top-level directory of the distribution.
echo "Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved."
echo " Restrictions apply, see COPYRIGHT and LICENSE files."
])dnl ])dnl
dnl ----------------------------------------------------------------
dnl Disable config.cache!
define([AC_CACHE_LOAD], )dnl
define([AC_CACHE_SAVE], )dnl
dnl ================================================================ dnl ================================================================
dnl Configure.in for OpenLDAP dnl Configure.in for OpenLDAP
AC_INIT(build/version.sh)dnl
AC_INIT([OpenLDAP],,[<http://www.openldap.org/its/>]) # set unset (borrowed from autoconf 2.49c)
AC_CONFIG_SRCDIR([include/ldap.h])dnl if (OL_FOO=OL_FOO; unset OL_FOO) >/dev/null 2>&1; then
AC_CONFIG_AUX_DIR([build])dnl ol_unset=unset
else
ol_unset=false
fi
# unset CDPATH
$ol_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
AC_CONFIG_AUX_DIR(build)dnl
eval `$ac_aux_dir/version.sh` eval `$ac_aux_dir/version.sh`
if test -z "$OL_STRING"; then if test -z "$OL_STRING"; then
AC_MSG_ERROR([could not determine version]) AC_MSG_ERROR([could not determine version])
fi fi
AC_PROG_SHTOOL if test -f "$ac_aux_dir/shtool" -a ! -d $ac_aux_dir/shtool; then
ac_cv_shtool="$ac_aux_dir/shtool"
else
AC_MSG_ERROR([no shtool found in $ac_aux_dir])
fi
SHTOOL="$ac_cv_shtool"
dnl AC_SUBST(SHTOOL)dnl
TB="`$SHTOOL echo -e '%B' 2>/dev/null`" TB="`$SHTOOL echo -e '%B' 2>/dev/null`"
TN="`$SHTOOL echo -e '%b' 2>/dev/null`" TN="`$SHTOOL echo -e '%b' 2>/dev/null`"
@ -46,19 +74,16 @@ dnl Determine host platform
dnl we try not to use this for much dnl we try not to use this for much
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
OPENLDAP_PACKAGE=$OL_PACKAGE AM_INIT_AUTOMAKE([$OL_PACKAGE],[$OL_VERSION], [no defines])dnl
OPENLDAP_VERSION=$OL_VERSION AC_SUBST(PACKAGE)dnl
AC_SUBST(VERSION)dnl
AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)
AC_DEFINE_UNQUOTED(OPENLDAP_VERSION,"$VERSION",Version)
AC_SUBST(OPENLDAP_PACKAGE) AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION,$OL_API_INC,Version)
AC_SUBST(OPENLDAP_VERSION) AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_MAJOR,$OL_MAJOR,Major)
AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_MINOR,$OL_MINOR,Minor)
AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$OL_PACKAGE",OpenLDAP Package) AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_PATCH,$OL_PATCH,Patch)
AC_DEFINE_UNQUOTED(OPENLDAP_VERSION,"$OL_VERSION",OpenLDAP Version)
AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION,$OL_API_INC,Vendor Version)
AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_MAJOR,$OL_MAJOR,Vendor Major)
AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_MINOR,$OL_MINOR,Vendor Minor)
AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_PATCH,$OL_PATCH,Vendor Patch)
OPENLDAP_LIBVERSION=$OL_API_LIB OPENLDAP_LIBVERSION=$OL_API_LIB
AC_SUBST(OPENLDAP_LIBVERSION)dnl AC_SUBST(OPENLDAP_LIBVERSION)dnl
@ -66,10 +91,10 @@ AC_SUBST(OPENLDAP_LIBVERSION)dnl
OPENLDAP_RELEASE_DATE="$OL_RELEASE_DATE" OPENLDAP_RELEASE_DATE="$OL_RELEASE_DATE"
AC_SUBST(OPENLDAP_RELEASE_DATE)dnl AC_SUBST(OPENLDAP_RELEASE_DATE)dnl
dnl We use autoconf features new to 2.57. dnl We use autoconf features new to 2.13.
dnl aclocal.m4 should be built using aclocal from automake 1.7.3 dnl aclocal.m4 should be built using aclocal from automake 1.4
dnl libtool 1.4.3 should be installed. dnl libtool 1.4.2 should be installed.
AC_PREREQ(2.57)dnl Required Autoconf version AC_PREREQ(2.13)dnl Required Autoconf version
AC_CONFIG_HEADER(include/portable.h include/ldap_features.h include/lber_types.h)dnl AC_CONFIG_HEADER(include/portable.h include/ldap_features.h include/lber_types.h)dnl
@ -105,87 +130,115 @@ AC_SUBST(ldap_subdir)dnl
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl General "enable" options dnl General "enable" options
OL_ARG_ENABLE(debug,[enable debugging], yes)dnl OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes)dnl
OL_ARG_ENABLE(dynamic,[enable linking built binaries with dynamic libs], no)dnl OL_ARG_ENABLE(dynamic,[ --enable-dynamic enable linking built binaries with dynamic libs], no)dnl
OL_ARG_ENABLE(syslog,[enable syslog support], auto)dnl OL_ARG_ENABLE(syslog,[ --enable-syslog enable syslog support], auto)dnl
OL_ARG_ENABLE(proctitle,[enable proctitle support], yes)dnl OL_ARG_ENABLE(proctitle,[ --enable-proctitle enable proctitle support], yes)dnl
dnl OL_ARG_ENABLE(referrals,[enable LDAPv2+ Referrals (experimental)], no)dnl dnl OL_ARG_ENABLE(referrals,[ --enable-referrals enable LDAPv2+ Referrals (experimental)], no)dnl
ol_enable_referrals=${ol_enable_referrals-no} ol_enable_referrals=${ol_enable_referrals-no}
dnl OL_ARG_ENABLE(kbind,[enable LDAPv2+ Kerberos IV bind (deprecated)], no)dnl dnl OL_ARG_ENABLE(kbind,[ --enable-kbind enable LDAPv2+ Kerberos IV bind (deprecated)], no)dnl
ol_enable_kbind=${ol_enable_kbind-no} ol_enable_kbind=${ol_enable_kbind-no}
OL_ARG_ENABLE(ipv6,[enable IPv6 support], auto)dnl OL_ARG_ENABLE(ipv6,[ --enable-ipv6 enable IPv6 support], auto)dnl
OL_ARG_ENABLE(local,[enable AF_LOCAL (AF_UNIX) socket support], auto)dnl OL_ARG_ENABLE(local,[ --enable-local enable AF_LOCAL (AF_UNIX) socket support], auto)dnl
OL_ARG_ENABLE(x-compile,[enable cross compiling], no, [yes no])dnl OL_ARG_ENABLE(x_compile,[ --enable-x-compile enable cross compiling],
no, [yes no])dnl
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl General "with" options dnl General "with" options
OL_ARG_WITH(cyrus_sasl,[with Cyrus SASL support], auto)dnl dnl OL_ARG_ENABLE(dmalloc,[ --enable-dmalloc enable debug malloc support], no)dnl
OL_ARG_WITH(fetch,[with fetch(3) URL support], auto)dnl
OL_ARG_WITH(kerberos,[with Kerberos support], auto, OL_ARG_WITH(cyrus_sasl,[ --with-cyrus-sasl with Cyrus SASL support],
[auto k5 k5only k425 kth k4 afs yes no])dnl auto, [auto yes no] )
OL_ARG_WITH(readline,[with readline support], auto)dnl OL_ARG_WITH(fetch,[ --with-fetch with fetch(3) URL support],
OL_ARG_WITH(threads,[with threads], auto, auto, [auto yes no] )
[auto nt posix mach pth lwp yes no manual])dnl OL_ARG_WITH(kerberos,[ --with-kerberos with Kerberos support],
OL_ARG_WITH(tls,[with TLS/SSL support], auto, auto, [auto k5 k5only k425 kth k4 afs yes no])
[auto ssleay openssl yes no])dnl OL_ARG_WITH(readline,[ --with-readline with readline support],
OL_ARG_WITH(yielding_select,[with implicitly yielding select], auto, auto, [auto yes no] )
[auto yes no manual])dnl OL_ARG_WITH(threads,[ --with-threads with threads],
auto, [auto nt posix mach pth lwp yes no manual] )
OL_ARG_WITH(tls,[ --with-tls with TLS/SSL support],
auto, [auto ssleay openssl yes no] )
OL_ARG_WITH(yielding_select,[ --with-yielding-select with implicitly yielding select],
auto, [auto yes no manual] )
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl Server options dnl Server options
dnl ----------------------------------------------------------------
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl SLAPD OPTIONS dnl SLAPD OPTIONS
OL_ARG_ENABLE(slapd,[enable building slapd], yes)dnl AC_ARG_WITH(xxslapdoptions,[
OL_ARG_ENABLE(aci,[enable per-object ACIs (experimental)], no)dnl SLAPD (Standalone LDAP Daemon) Options:])
OL_ARG_ENABLE(cleartext,[enable cleartext passwords], yes)dnl OL_ARG_ENABLE(slapd,[ --enable-slapd enable building slapd], yes)dnl
OL_ARG_ENABLE(crypt,[enable crypt(3) passwords], no)dnl OL_ARG_ENABLE(aci,[ --enable-aci enable per-object ACIs (experimental)], no)dnl
OL_ARG_ENABLE(kpasswd,[enable Kerberos password verification], no)dnl OL_ARG_ENABLE(cleartext,[ --enable-cleartext enable cleartext passwords], yes)dnl
OL_ARG_ENABLE(lmpasswd,[enable LAN Manager passwords], no)dnl OL_ARG_ENABLE(crypt,[ --enable-crypt enable crypt(3) passwords], no)dnl
OL_ARG_ENABLE(spasswd,[enable (Cyrus) SASL password verification], no)dnl OL_ARG_ENABLE(kpasswd,[ --enable-kpasswd enable Kerberos password verification], no)dnl
OL_ARG_ENABLE(modules,[enable dynamic module support], no)dnl OL_ARG_ENABLE(lmpasswd,[ --enable-lmpasswd enable LAN Manager passwords], no)dnl
dnl OL_ARG_ENABLE(multimaster,[enable multimaster replication], no)dnl OL_ARG_ENABLE(spasswd,[ --enable-spasswd enable (Cyrus) SASL password verification], no)dnl
OL_ARG_ENABLE(modules,[ --enable-modules enable dynamic module support], no)dnl
dnl OL_ARG_ENABLE(multimaster,[ --enable-multimaster enable multimaster replication], no)dnl
ol_enable_multimaster=${ol_enable_multimaster-no} ol_enable_multimaster=${ol_enable_multimaster-no}
OL_ARG_ENABLE(phonetic,[enable phonetic/soundex], no)dnl OL_ARG_ENABLE(phonetic,[ --enable-phonetic enable phonetic/soundex], no)dnl
OL_ARG_ENABLE(rewrite,[enable DN rewriting in back-ldap and back-meta], no)dnl OL_ARG_ENABLE(rewrite,[ --enable-rewrite enable DN rewriting in back-ldap and back-meta], no)dnl
OL_ARG_ENABLE(rlookups,[enable reverse lookups of client hostnames], no)dnl OL_ARG_ENABLE(rlookups,[ --enable-rlookups enable reverse lookups of client hostnames], no)dnl
OL_ARG_ENABLE(slapi,[enable installation of slapi library], no)dnl OL_ARG_ENABLE(slapi,[ --enable-slapi enable installation of slapi library], no)dnl
OL_ARG_ENABLE(slp,[enable SLPv2 support], no)dnl OL_ARG_ENABLE(slp,[ --enable-slp enable SLPv2 support], no)dnl
OL_ARG_ENABLE(wrappers,[enable tcp wrapper support], no)dnl OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no)dnl
dnl SLAPD Backend options dnl SLAPD Backend options
OL_ARG_ENABLE(bdb,[enable Berkeley DB backend], yes)dnl OL_ARG_ENABLE(bdb,[ --enable-bdb enable Berkeley DB backend], yes)dnl
OL_ARG_WITH(bdb-module,[module type], static, [static dynamic])dnl OL_ARG_WITH(bdb_module,[ --with-bdb-module module type static|dynamic], static,
OL_ARG_ENABLE(dnssrv,[enable dnssrv backend], no)dnl [static dynamic])
OL_ARG_WITH(dnssrv-module,[module type], static, [static dynamic])dnl OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable dnssrv backend], no)dnl
OL_ARG_ENABLE(ldap,[enable ldap backend], no)dnl OL_ARG_WITH(dnssrv_module,[ --with-dnssrv-module module type static|dynamic], static,
OL_ARG_WITH(ldap-module,[module type], static, [static dynamic])dnl [static dynamic])
OL_ARG_ENABLE(ldbm,[enable ldbm backend], no)dnl OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend], no)dnl
OL_ARG_WITH(ldbm_api,[with LDBM API], auto, [auto berkeley bcompat mdbm gdbm])dnl OL_ARG_WITH(ldap_module,[ --with-ldap-module module type static|dynamic], static,
OL_ARG_WITH(ldbm-module,[module type], static, [static dynamic])dnl [static dynamic])
OL_ARG_WITH(ldbm-type,[use LDBM type], auto, [auto btree hash])dnl OL_ARG_ENABLE(ldbm,[ --enable-ldbm enable ldbm backend], no)dnl
OL_ARG_ENABLE(meta,[enable metadirectory backend], no)dnl OL_ARG_WITH(ldbm_api,[ --with-ldbm-api with LDBM API auto|berkeley|bcompat|mdbm|gdbm], auto,
OL_ARG_WITH(meta-module,[module type], static, [static dynamic])dnl [auto berkeley bcompat mdbm gdbm])
OL_ARG_ENABLE(monitor,[enable monitor backend], no)dnl OL_ARG_WITH(ldbm_module,[ --with-ldbm-module module type static|dynamic], static,
OL_ARG_WITH(monitor-module,[module type], static, [static dynamic])dnl [static dynamic])
OL_ARG_ENABLE(null,[enable null backend], no)dnl OL_ARG_WITH(ldbm_type,[ --with-ldbm-type use LDBM type auto|btree|hash], auto,
OL_ARG_WITH(null-module,[module type], static, [static dynamic])dnl [auto btree hash])
OL_ARG_ENABLE(passwd,[enable passwd backend], no)dnl OL_ARG_ENABLE(meta,[ --enable-meta enable metadirectory backend], no)dnl
OL_ARG_WITH(passwd-module,[module type], static, [static dynamic])dnl OL_ARG_WITH(meta_module,[ --with-meta-module module type static|dynamic], static,
OL_ARG_ENABLE(perl,[enable perl backend], no)dnl [static dynamic])
OL_ARG_WITH(perl-module,[module type], static, [static dynamic])dnl OL_ARG_ENABLE(monitor,[ --enable-monitor enable monitor backend], no)dnl
OL_ARG_ENABLE(shell,[enable shell backend], no)dnl OL_ARG_WITH(monitor_module,[ --with-monitor-module module type static|dynamic], static,
OL_ARG_WITH(shell-module,[module type], static, [static dynamic])dnl [static dynamic])
OL_ARG_ENABLE(sql,[enable sql backend], no)dnl OL_ARG_ENABLE(null,[ --enable-null enable null backend], no)dnl
OL_ARG_WITH(sql-module,[module type], static, [static dynamic])dnl OL_ARG_WITH(null_module,[ --with-null-module module type static|dynamic], static,
OL_ARG_ENABLE(tcl,[enable tcl backend], no)dnl [static dynamic])
OL_ARG_WITH(tcl-module,[module type], static, [static dynamic])dnl OL_ARG_ENABLE(passwd,[ --enable-passwd enable passwd backend], no)dnl
OL_ARG_WITH(passwd_module,[ --with-passwd-module module type static|dynamic], static,
[static dynamic])
OL_ARG_ENABLE(perl,[ --enable-perl enable perl backend], no)dnl
OL_ARG_WITH(perl_module,[ --with-perl-module module type static|dynamic], static,
[static dynamic])
OL_ARG_ENABLE(shell,[ --enable-shell enable shell backend], no)dnl
OL_ARG_WITH(shell_module,[ --with-shell-module module type static|dynamic], static,
[static dynamic])
OL_ARG_ENABLE(sql,[ --enable-sql enable sql backend], no)dnl
OL_ARG_WITH(sql_module,[ --with-sql-module module type static|dynamic], static,
[static dynamic])
OL_ARG_ENABLE(tcl,[ --enable-tcl enable tcl backend], no)dnl
OL_ARG_WITH(tcl_module,[ --with-tcl-module module type static|dynamic], static,
[static dynamic])
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl SLURPD OPTIONS dnl SLURPD OPTIONS
OL_ARG_ENABLE(slurpd,[enable building slurpd], auto)dnl AC_ARG_WITH(xxslurpdoptions,[
SLURPD (Replication Daemon) Options:])
OL_ARG_ENABLE(slurpd,[ --enable-slurpd enable building slurpd], auto)dnl
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl Library Generation & Linking Options AC_ARG_WITH(xxliboptions,[
Library Generation & Linking Options])
AC_ENABLE_STATIC AC_ENABLE_STATIC
AC_ENABLE_SHARED AC_ENABLE_SHARED
@ -534,9 +587,7 @@ SLAPD_SLP_LIBS=
dnl ================================================================ dnl ================================================================
dnl Checks for programs dnl Checks for programs
AC_PROG_MAKE_SET
AC_PROG_INSTALL AC_PROG_INSTALL
dnl AM_GNU_GETTEXT([external])
AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion]) AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion])
@ -655,11 +706,11 @@ dnl AC_ISC_POSIX
dnl AC_MINIX dnl AC_MINIX
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl Checks for system services (now obsolete) dnl Checks for system services
dnl AC_CYGWIN (obsolete) AC_CYGWIN
dnl AC_MINGW32 (obsolete) AC_MINGW32
dnl AC_EXEEXT AC_EXEEXT
dnl AC_OBJEXT AC_OBJEXT
AC_DEFINE_UNQUOTED(EXEEXT, "${EXEEXT}", [defined to be the EXE extension]) AC_DEFINE_UNQUOTED(EXEEXT, "${EXEEXT}", [defined to be the EXE extension])
@ -684,8 +735,7 @@ fi
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl Check for AIX security library dnl Check for AIX security library
AC_CHECK_LIB(s, afopen, AC_CHECK_LIB(s, afopen, [
[
AUTH_LIBS=-ls AUTH_LIBS=-ls
AC_DEFINE(HAVE_AIX_SECURITY,1,[define if you have AIX security lib]) AC_DEFINE(HAVE_AIX_SECURITY,1,[define if you have AIX security lib])
]) ])
@ -771,6 +821,7 @@ AC_CHECK_HEADERS( \
psap.h \ psap.h \
pwd.h \ pwd.h \
process.h \ process.h \
resolv.h \
sgtty.h \ sgtty.h \
shadow.h \ shadow.h \
stddef.h \ stddef.h \
@ -789,6 +840,7 @@ AC_CHECK_HEADERS( \
sys/syslog.h \ sys/syslog.h \
sys/time.h \ sys/time.h \
sys/types.h \ sys/types.h \
sys/ucred.h \
sys/uio.h \ sys/uio.h \
syslog.h \ syslog.h \
termios.h \ termios.h \
@ -797,12 +849,6 @@ AC_CHECK_HEADERS( \
winsock2.h \ winsock2.h \
) )
AC_CHECK_HEADERS(sys/ucred.h,,,[#include <sys/types.h>])
AC_CHECK_HEADERS(resolv.h,,,[
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
])
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl Checks for libraries dnl Checks for libraries
@ -2285,7 +2331,7 @@ if test $ol_enable_proctitle != no ; then
[have_setproctitle=yes [have_setproctitle=yes
LUTIL_LIBS="$LUTIL_LIBS -lutil"], LUTIL_LIBS="$LUTIL_LIBS -lutil"],
[have_setproctitle=no [have_setproctitle=no
AC_LIBOBJ([setproctitle]) LIBOBJS="$LIBOBJS setproctitle.o"
LIBSRCS="$LIBSRCS setproctitle.c"])]) LIBSRCS="$LIBSRCS setproctitle.c"])])
if test $have_setproctitle = yes ; then if test $have_setproctitle = yes ; then
@ -2316,12 +2362,12 @@ dnl Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_MODE_T AC_TYPE_MODE_T
AC_TYPE_OFF_T AC_TYPE_OFF_T
AC_TYPE_PID_T AC_TYPE_PID_T
AC_CHECK_TYPES([ptrdiff_t, uintmax_t]) AM_TYPE_PTRDIFF_T
AC_TYPE_SIGNAL AC_TYPE_SIGNAL
AC_TYPE_SIZE_T AC_TYPE_SIZE_T
AC_CHECK_TYPES([ssize_t, signed int]) AC_CHECK_TYPE(ssize_t, [signed int])
AC_CHECK_TYPES([caddr_t, char *]) AC_CHECK_TYPE(caddr_t, [char *])
OL_TYPE_SOCKLEN_T OL_TYPE_SOCKLEN_T
AC_STRUCT_ST_BLKSIZE AC_STRUCT_ST_BLKSIZE
@ -2345,9 +2391,9 @@ else
AC_C_BIGENDIAN AC_C_BIGENDIAN
fi fi
AC_CHECK_SIZEOF(short) AC_COMPILE_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(int) AC_COMPILE_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long) AC_COMPILE_CHECK_SIZEOF(long)
if test "$ac_cv_sizeof_int" -lt 4 ; then if test "$ac_cv_sizeof_int" -lt 4 ; then
AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.]) AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.])
@ -2848,47 +2894,51 @@ AC_ARG_WITH(xxinstall,[
See INSTALL file for further details.]) See INSTALL file for further details.])
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
AC_CONFIG_FILES(Makefile:build/top.mk:Makefile.in:build/dir.mk) dnl final output
AC_CONFIG_FILES(doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk) dnl
AC_CONFIG_FILES(doc/man/Makefile:build/top.mk:doc/man/Makefile.in:build/dir.mk)
AC_CONFIG_FILES(doc/man/man1/Makefile:build/top.mk:doc/man/man1/Makefile.in:build/man.mk)
AC_CONFIG_FILES(doc/man/man3/Makefile:build/top.mk:doc/man/man3/Makefile.in:build/man.mk)
AC_CONFIG_FILES(doc/man/man5/Makefile:build/top.mk:doc/man/man5/Makefile.in:build/man.mk)
AC_CONFIG_FILES(doc/man/man8/Makefile:build/top.mk:doc/man/man8/Makefile.in:build/man.mk)
AC_CONFIG_FILES(clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk)
AC_CONFIG_FILES(clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk)
AC_CONFIG_FILES(include/Makefile:build/top.mk:include/Makefile.in)
AC_CONFIG_FILES(libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk)
AC_CONFIG_FILES(libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk:build/lib-static.mk)
AC_CONFIG_FILES(libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk)
AC_CONFIG_FILES(libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk)
AC_CONFIG_FILES(libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk)
AC_CONFIG_FILES(libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib.mk:build/lib-static.mk)
AC_CONFIG_FILES(libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk:build/lib-static.mk)
AC_CONFIG_FILES(libraries/liblunicode/Makefile:build/top.mk:libraries/liblunicode/Makefile.in:build/lib.mk:build/lib-static.mk)
AC_CONFIG_FILES(libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk)
AC_CONFIG_FILES(libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk)
AC_CONFIG_FILES(servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk)
AC_CONFIG_FILES(servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk)
AC_CONFIG_FILES(servers/slapd/back-bdb/Makefile:build/top.mk:servers/slapd/back-bdb/Makefile.in:build/mod.mk)
AC_CONFIG_FILES(servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk)
AC_CONFIG_FILES(servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk)
AC_CONFIG_FILES(servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk)
AC_CONFIG_FILES(servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk)
AC_CONFIG_FILES(servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk)
AC_CONFIG_FILES(servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/Makefile.in:build/mod.mk)
AC_CONFIG_FILES(servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk)
AC_CONFIG_FILES(servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk)
AC_CONFIG_FILES(servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/mod.mk)
AC_CONFIG_FILES(servers/slapd/back-sql/Makefile:build/top.mk:servers/slapd/back-sql/Makefile.in:build/mod.mk)
AC_CONFIG_FILES(servers/slapd/back-tcl/Makefile:build/top.mk:servers/slapd/back-tcl/Makefile.in:build/mod.mk)
AC_CONFIG_FILES(servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk)
AC_CONFIG_FILES(servers/slapd/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.mk)
AC_CONFIG_FILES(servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in)
AC_CONFIG_FILES(servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk)
AC_CONFIG_FILES(tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk)
AC_CONFIG_FILES(tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk)
AC_CONFIG_COMMANDS([time-stamp], [date >stamp-h AC_OUTPUT( \
echo Please run \"make depend\" to build dependencies]) Makefile:build/top.mk:Makefile.in:build/dir.mk \
AC_OUTPUT doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk \
doc/man/Makefile:build/top.mk:doc/man/Makefile.in:build/dir.mk \
doc/man/man1/Makefile:build/top.mk:doc/man/man1/Makefile.in:build/man.mk \
doc/man/man3/Makefile:build/top.mk:doc/man/man3/Makefile.in:build/man.mk \
doc/man/man5/Makefile:build/top.mk:doc/man/man5/Makefile.in:build/man.mk \
doc/man/man8/Makefile:build/top.mk:doc/man/man8/Makefile.in:build/man.mk \
clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk \
clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \
include/Makefile:build/top.mk:include/Makefile.in \
libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk \
libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk:build/lib-static.mk \
libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk \
libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk \
libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk \
libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib.mk:build/lib-static.mk \
libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk:build/lib-static.mk \
libraries/liblunicode/Makefile:build/top.mk:libraries/liblunicode/Makefile.in:build/lib.mk:build/lib-static.mk \
libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk \
libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk \
servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk \
servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \
servers/slapd/back-bdb/Makefile:build/top.mk:servers/slapd/back-bdb/Makefile.in:build/mod.mk \
servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk \
servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk \
servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk \
servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk \
servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk \
servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/Makefile.in:build/mod.mk \
servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk \
servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk \
servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/mod.mk \
servers/slapd/back-sql/Makefile:build/top.mk:servers/slapd/back-sql/Makefile.in:build/mod.mk \
servers/slapd/back-tcl/Makefile:build/top.mk:servers/slapd/back-tcl/Makefile.in:build/mod.mk \
servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk \
servers/slapd/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.mk \
servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \
servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \
tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk \
tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk \
,[
date > stamp-h
echo Please run \"make depend\" to build dependencies
])

1
include/portable.h.in
View file

@ -1077,6 +1077,5 @@
#include "ldap_features.h" #include "ldap_features.h"
#include "ac/assert.h" #include "ac/assert.h"
#include "ac/localize.h"
#endif /* _LDAP_PORTABLE_H */ #endif /* _LDAP_PORTABLE_H */