mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-11-27 02:22:00 +08:00
Autoconf upgrade (partial)
This commit is contained in:
Kurt Zeilenga
parent
103f70c3bf
commit
814ef183d5
@ -117,5 +117,6 @@
|
||||
#include "ldap_features.h"
|
||||
|
||||
#include "ac/assert.h"
|
||||
#include "ac/localize.h"
|
||||
|
||||
#endif /* _LDAP_PORTABLE_H */
|
||||
|
||||
324
aclocal.m4
vendored
324
aclocal.m4
vendored
@ -1,14 +1,15 @@
|
||||
dnl aclocal.m4 generated automatically by aclocal 1.4a
|
||||
# generated automatically by aclocal 1.7.3 -*- Autoconf -*-
|
||||
|
||||
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
|
||||
# Free Software Foundation, Inc.
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
||||
dnl This program is distributed in the hope that it will be useful,
|
||||
dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
||||
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
dnl PARTICULAR PURPOSE.
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
||||
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
# PARTICULAR PURPOSE.
|
||||
|
||||
dnl
|
||||
dnl Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
|
||||
@ -25,120 +26,6 @@ dnl
|
||||
divert(-1)
|
||||
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.
|
||||
|
||||
# serial 1
|
||||
|
||||
dnl Usage:
|
||||
dnl AM_INIT_AUTOMAKE(package,version, [no-define])
|
||||
|
||||
AC_DEFUN(AM_INIT_AUTOMAKE,
|
||||
[AC_REQUIRE([AC_PROG_INSTALL])
|
||||
dnl We require 2.13 because we rely on SHELL being computed by configure.
|
||||
AC_PREREQ([2.13])
|
||||
PACKAGE=[$1]
|
||||
AC_SUBST(PACKAGE)
|
||||
VERSION=[$2]
|
||||
AC_SUBST(VERSION)
|
||||
dnl test to see if srcdir already configured
|
||||
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
|
||||
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
|
||||
fi
|
||||
ifelse([$3],,
|
||||
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
|
||||
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
|
||||
AC_REQUIRE([AM_SANITY_CHECK])
|
||||
AC_REQUIRE([AC_ARG_PROGRAM])
|
||||
dnl FIXME This is truly gross.
|
||||
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
|
||||
AC_SUBST(AMTARFLAGS)
|
||||
AC_REQUIRE([AC_PROG_MAKE_SET])])
|
||||
|
||||
#
|
||||
# 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-*-
|
||||
|
||||
# serial 46 AC_PROG_LIBTOOL
|
||||
@ -933,8 +820,6 @@ fi
|
||||
set dummy $CC
|
||||
compiler="[$]2"
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
AC_MSG_CHECKING([for objdir])
|
||||
rm -f .libs 2>/dev/null
|
||||
mkdir .libs 2>/dev/null
|
||||
@ -946,12 +831,8 @@ else
|
||||
fi
|
||||
rmdir .libs 2>/dev/null
|
||||
AC_MSG_RESULT($objdir)
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
AC_ARG_WITH(pic,
|
||||
[ --with-pic try to use only PIC/non-PIC objects [default=use both]],
|
||||
pic_mode="$withval", pic_mode=default)
|
||||
@ -1138,8 +1019,6 @@ else
|
||||
|
||||
AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
|
||||
fi
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
# Check for any special shared library compilation flags.
|
||||
if test -n "$lt_cv_prog_cc_shlib"; then
|
||||
@ -1151,8 +1030,6 @@ if test -n "$lt_cv_prog_cc_shlib"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
|
||||
AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
|
||||
lt_cv_prog_cc_static_works=no
|
||||
@ -1172,12 +1049,8 @@ wl="$lt_cv_prog_cc_wl"
|
||||
link_static_flag="$lt_cv_prog_cc_static"
|
||||
no_builtin_flag="$lt_cv_prog_cc_no_builtin"
|
||||
can_build_shared="$lt_cv_prog_cc_can_build_shared"
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
# Check to see if options -o and -c are simultaneously supported by compiler
|
||||
AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
|
||||
AC_CACHE_VAL([lt_cv_compiler_c_o], [
|
||||
@ -1245,11 +1118,7 @@ if test x"$compiler_c_o" = x"yes"; then
|
||||
else
|
||||
compiler_o_lo=no
|
||||
fi
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
# Check to see if we can do hard links to lock some files if needed
|
||||
hard_links="nottested"
|
||||
if test "$compiler_c_o" = no && test "$need_locks" != no; then
|
||||
@ -1269,11 +1138,7 @@ if test "$compiler_c_o" = no && test "$need_locks" != no; then
|
||||
else
|
||||
need_locks=no
|
||||
fi
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
if test "$GCC" = yes; then
|
||||
# Check to see if options -fno-rtti -fno-exceptions are supported by compiler
|
||||
AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
|
||||
@ -1299,11 +1164,7 @@ if test "$GCC" = yes; then
|
||||
no_builtin_flag=' -fno-builtin'
|
||||
fi
|
||||
fi
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
# See if the linker supports building shared libraries.
|
||||
AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
|
||||
|
||||
@ -2001,11 +1862,7 @@ EOF
|
||||
fi
|
||||
AC_MSG_RESULT([$ld_shlibs])
|
||||
test "$ld_shlibs" = no && can_build_shared=no
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
# Check hardcoding attributes.
|
||||
AC_MSG_CHECKING([how to hardcode library paths into programs])
|
||||
hardcode_action=
|
||||
@ -2031,11 +1888,7 @@ else
|
||||
hardcode_action=unsupported
|
||||
fi
|
||||
AC_MSG_RESULT([$hardcode_action])
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
striplib=
|
||||
old_striplib=
|
||||
AC_MSG_CHECKING([whether stripping libraries is possible])
|
||||
@ -2046,14 +1899,10 @@ if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
||||
test -z "$deplibs_check_method" && deplibs_check_method=unknown
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
# PORTME Fill in your ld.so characteristics
|
||||
AC_MSG_CHECKING([dynamic linker characteristics])
|
||||
library_names_spec=
|
||||
@ -2463,19 +2312,11 @@ sysv4*MP*)
|
||||
esac
|
||||
AC_MSG_RESULT([$dynamic_linker])
|
||||
test "$dynamic_linker" = no && can_build_shared=no
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
# Report the final consequences.
|
||||
AC_MSG_CHECKING([if libtool supports shared libraries])
|
||||
AC_MSG_RESULT([$can_build_shared])
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
AC_MSG_CHECKING([whether to build shared libraries])
|
||||
test "$can_build_shared" = "no" && enable_shared=no
|
||||
|
||||
@ -2497,17 +2338,11 @@ aix4*)
|
||||
;;
|
||||
esac
|
||||
AC_MSG_RESULT([$enable_shared])
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
AC_MSG_CHECKING([whether to build static libraries])
|
||||
# Make sure either enable_shared or enable_static is yes.
|
||||
test "$enable_shared" = yes || enable_static=yes
|
||||
AC_MSG_RESULT([$enable_static])
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
if test "$hardcode_action" = relink; then
|
||||
# Fast installation is not supported
|
||||
@ -2525,8 +2360,6 @@ fi
|
||||
|
||||
AC_LIBTOOL_DLOPEN_SELF
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
if test "$enable_shared" = yes && test "$GCC" = yes; then
|
||||
case $archive_cmds in
|
||||
*'~'*)
|
||||
@ -2569,11 +2402,7 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then
|
||||
esac
|
||||
fi
|
||||
need_lc=${lt_cv_archive_cmds_need_lc-yes}
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
# The second clause should only fire when bootstrapping the
|
||||
# libtool distribution, otherwise you forgot to ship ltmain.sh
|
||||
# with your package, and you will get complaints that there are
|
||||
@ -3126,8 +2955,6 @@ EOF
|
||||
(rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
|
||||
chmod +x "$ofile"
|
||||
fi
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
])# _LT_AC_LTCONFIG_HACK
|
||||
|
||||
@ -3731,12 +3558,10 @@ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
|
||||
# This is just to silence aclocal about the macro not being used
|
||||
ifelse([AC_DISABLE_FAST_INSTALL])
|
||||
|
||||
############################################################
|
||||
# NOTE: This macro has been submitted for inclusion into #
|
||||
# GNU Autoconf as AC_PROG_SED. When it is available in #
|
||||
# a released version of Autoconf we should remove this #
|
||||
# macro and use it instead. #
|
||||
############################################################
|
||||
# LT_AC_PROG_SED
|
||||
# --------------
|
||||
# Check for a fully-functional sed program, that truncates
|
||||
@ -3822,7 +3647,25 @@ fi
|
||||
AC_MSG_RESULT([$SED])
|
||||
])
|
||||
|
||||
# serial 1
|
||||
|
||||
# Copyright 1996, 1997, 1999, 2000, 2001, 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 2
|
||||
|
||||
# @defmac AC_PROG_CC_STDC
|
||||
# @maindex PROG_CC_STDC
|
||||
@ -3839,7 +3682,7 @@ AC_MSG_RESULT([$SED])
|
||||
# program @code{ansi2knr}, which comes with Ghostscript.
|
||||
# @end defmac
|
||||
|
||||
AC_DEFUN(AM_PROG_CC_STDC,
|
||||
AC_DEFUN([AM_PROG_CC_STDC],
|
||||
[AC_REQUIRE([AC_PROG_CC])
|
||||
AC_BEFORE([$0], [AC_C_INLINE])
|
||||
AC_BEFORE([$0], [AC_C_CONST])
|
||||
@ -3849,7 +3692,7 @@ dnl like #elif.
|
||||
dnl FIXME: can't do this because then AC_AIX won't work due to a
|
||||
dnl circular dependency.
|
||||
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,
|
||||
[am_cv_prog_cc_stdc=no
|
||||
ac_save_CC="$CC"
|
||||
@ -3902,7 +3745,7 @@ CC="$ac_save_CC"
|
||||
if test -z "$am_cv_prog_cc_stdc"; then
|
||||
AC_MSG_RESULT([none needed])
|
||||
else
|
||||
AC_MSG_RESULT($am_cv_prog_cc_stdc)
|
||||
AC_MSG_RESULT([$am_cv_prog_cc_stdc])
|
||||
fi
|
||||
case "x$am_cv_prog_cc_stdc" in
|
||||
x|xno) ;;
|
||||
@ -3910,68 +3753,55 @@ case "x$am_cv_prog_cc_stdc" in
|
||||
esac
|
||||
])
|
||||
|
||||
dnl From Jim Meyering.
|
||||
AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC])
|
||||
|
||||
# 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
|
||||
|
||||
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
|
||||
# Obsolete Automake macros.
|
||||
|
||||
gwinsz_in_termios_h=no
|
||||
if test $am_cv_sys_posix_termios = yes; then
|
||||
AC_EGREP_CPP([yes],
|
||||
[#include <sys/types.h>
|
||||
# include <termios.h>
|
||||
# ifdef TIOCGWINSZ
|
||||
yes
|
||||
# endif
|
||||
], gwinsz_in_termios_h=yes)
|
||||
fi
|
||||
# We put here only the macros whose substitution is not an Automake
|
||||
# macro; otherwise including this file would trigger dependencies for
|
||||
# all the subsitutions. Generally, obsolete Automake macros are
|
||||
# better AU_DEFUNed in the same file as their replacement, or alone in
|
||||
# a separate file (see obsol-gt.m4 or obsol-lt.m4 for instance).
|
||||
|
||||
if test $gwinsz_in_termios_h = no; then
|
||||
AC_EGREP_CPP([yes],
|
||||
[#include <sys/types.h>
|
||||
# include <sys/ioctl.h>
|
||||
# ifdef TIOCGWINSZ
|
||||
yes
|
||||
# endif
|
||||
], am_cv_sys_tiocgwinsz_needs_sys_ioctl_h=yes)
|
||||
fi
|
||||
])
|
||||
if test $am_cv_sys_tiocgwinsz_needs_sys_ioctl_h = yes; then
|
||||
AC_DEFINE(GWINSZ_IN_SYS_IOCTL,1,
|
||||
[Define if TIOCGWINSZ requires sys/ioctl.h])
|
||||
fi
|
||||
])
|
||||
AU_DEFUN([AC_FEATURE_CTYPE], [AC_HEADER_STDC])
|
||||
AU_DEFUN([AC_FEATURE_ERRNO], [AC_REPLACE_FUNCS([strerror])])
|
||||
AU_DEFUN([AM_CYGWIN32], [AC_CYGWIN])
|
||||
AU_DEFUN([AM_EXEEXT], [AC_EXEEXT])
|
||||
AU_DEFUN([AM_FUNC_MKTIME], [AC_FUNC_MKTIME])
|
||||
AU_DEFUN([AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
|
||||
[AC_HEADER_TIOCGWINSZ])
|
||||
AU_DEFUN([AM_MINGW32], [AC_MINGW32])
|
||||
AU_DEFUN([AM_PROG_INSTALL], [AC_PROG_INSTALL])
|
||||
AU_DEFUN([AM_SANITY_CHECK_CC], [AC_PROG_CC])
|
||||
AU_DEFUN([AM_SYS_POSIX_TERMIOS], [AC_SYS_POSIX_TERMIOS])
|
||||
AU_DEFUN([fp_FUNC_FNMATCH], [AC_FUNC_FNMATCH])
|
||||
AU_DEFUN([fp_PROG_INSTALL], [AC_PROG_INSTALL])
|
||||
AU_DEFUN([md_TYPE_PTRDIFF_T], [AC_CHECK_TYPES([ptrdiff_t])])
|
||||
|
||||
dnl From Jim Meyering.
|
||||
|
||||
# serial 1
|
||||
|
||||
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
|
||||
])
|
||||
# Don't know how to translate these.
|
||||
# If used, Autoconf will complain that they are possibly unexpended;
|
||||
# this seems a good enough error message.
|
||||
# AC_FEATURE_EXIT
|
||||
# AC_SYSTEM_HEADER
|
||||
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
## http://www.OpenLDAP.org/license.html or in file LICENSE in the
|
||||
## top-level directory of the distribution.
|
||||
##
|
||||
PACKAGE= @PACKAGE@
|
||||
VERSION= @VERSION@
|
||||
PACKAGE= @OPENLDAP_PACKAGE@
|
||||
VERSION= @OPENLDAP_VERSION@
|
||||
RELEASEDATE= @OPENLDAP_RELEASE_DATE@
|
||||
|
||||
@SET_MAKE@
|
||||
@ -37,6 +37,7 @@ sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@$(ldap_subdir)
|
||||
schemadir = $(sysconfdir)/schema
|
||||
localedir = @datadir@/locale
|
||||
|
||||
PLAT = @PLAT@
|
||||
EXEEXT = @EXEEXT@
|
||||
|
||||
176
configure.in
176
configure.in
@ -9,42 +9,21 @@ dnl http://www.OpenLDAP.org/license.html or in file LICENSE in the
|
||||
dnl top-level directory of the distribution.
|
||||
dnl
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl Redefine AC_INIT_BINSH to provide RCS IDs and copyright notice
|
||||
dnl at top of generated configure script. Prints simple copyright.
|
||||
define([AC_INIT_BINSH],
|
||||
[[#! /bin/sh
|
||||
# $]OpenLDAP[$
|
||||
# from] translit([$OpenLDAP$], $")] [
|
||||
AC_COPYRIGHT(
|
||||
[Copyright 1998-2003 The OpenLDAP Foundation. All Rights Reserved.
|
||||
|
||||
# Copyright 1998-2003 The OpenLDAP Foundation. All Rights Reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted only as authorized by the OpenLDAP
|
||||
# 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."
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted only as authorized by the OpenLDAP
|
||||
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.
|
||||
])dnl
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl Disable config.cache!
|
||||
define([AC_CACHE_LOAD], )dnl
|
||||
define([AC_CACHE_SAVE], )dnl
|
||||
dnl ================================================================
|
||||
dnl Configure.in for OpenLDAP
|
||||
AC_INIT(build/version.sh)dnl
|
||||
|
||||
# set unset (borrowed from autoconf 2.49c)
|
||||
if (OL_FOO=OL_FOO; unset OL_FOO) >/dev/null 2>&1; then
|
||||
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
|
||||
AC_INIT([OpenLDAP],,[<http://www.openldap.org/its/>])
|
||||
AC_CONFIG_SRCDIR([include/ldap.h])dnl
|
||||
AC_CONFIG_AUX_DIR([build])dnl
|
||||
|
||||
eval `$ac_aux_dir/version.sh`
|
||||
if test -z "$OL_STRING"; then
|
||||
@ -74,16 +53,19 @@ dnl Determine host platform
|
||||
dnl we try not to use this for much
|
||||
AC_CANONICAL_SYSTEM
|
||||
|
||||
AM_INIT_AUTOMAKE([$OL_PACKAGE],[$OL_VERSION], [no defines])dnl
|
||||
AC_SUBST(PACKAGE)dnl
|
||||
AC_SUBST(VERSION)dnl
|
||||
AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)
|
||||
AC_DEFINE_UNQUOTED(OPENLDAP_VERSION,"$VERSION",Version)
|
||||
OPENLDAP_PACKAGE=$OL_PACKAGE
|
||||
OPENLDAP_VERSION=$OL_VERSION
|
||||
|
||||
AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION,$OL_API_INC,Version)
|
||||
AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_MAJOR,$OL_MAJOR,Major)
|
||||
AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_MINOR,$OL_MINOR,Minor)
|
||||
AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_PATCH,$OL_PATCH,Patch)
|
||||
AC_SUBST(OPENLDAP_PACKAGE)
|
||||
AC_SUBST(OPENLDAP_VERSION)
|
||||
|
||||
AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,$OL_PACKAGE,OpenLDAP Package)
|
||||
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
|
||||
AC_SUBST(OPENLDAP_LIBVERSION)dnl
|
||||
@ -91,10 +73,10 @@ AC_SUBST(OPENLDAP_LIBVERSION)dnl
|
||||
OPENLDAP_RELEASE_DATE="$OL_RELEASE_DATE"
|
||||
AC_SUBST(OPENLDAP_RELEASE_DATE)dnl
|
||||
|
||||
dnl We use autoconf features new to 2.13.
|
||||
dnl aclocal.m4 should be built using aclocal from automake 1.4
|
||||
dnl libtool 1.4.2 should be installed.
|
||||
AC_PREREQ(2.13)dnl Required Autoconf version
|
||||
dnl We use autoconf features new to 2.57.
|
||||
dnl aclocal.m4 should be built using aclocal from automake 1.7.3
|
||||
dnl libtool 1.4.3 should be installed.
|
||||
AC_PREREQ(2.57)dnl Required Autoconf version
|
||||
|
||||
AC_CONFIG_HEADER(include/portable.h include/ldap_features.h include/lber_types.h)dnl
|
||||
|
||||
@ -587,6 +569,7 @@ SLAPD_SLP_LIBS=
|
||||
dnl ================================================================
|
||||
dnl Checks for programs
|
||||
|
||||
AC_PROG_MAKE_SET
|
||||
AC_PROG_INSTALL
|
||||
|
||||
AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion])
|
||||
@ -821,7 +804,6 @@ AC_CHECK_HEADERS( \
|
||||
psap.h \
|
||||
pwd.h \
|
||||
process.h \
|
||||
resolv.h \
|
||||
sgtty.h \
|
||||
shadow.h \
|
||||
stddef.h \
|
||||
@ -840,7 +822,6 @@ AC_CHECK_HEADERS( \
|
||||
sys/syslog.h \
|
||||
sys/time.h \
|
||||
sys/types.h \
|
||||
sys/ucred.h \
|
||||
sys/uio.h \
|
||||
syslog.h \
|
||||
termios.h \
|
||||
@ -849,6 +830,12 @@ AC_CHECK_HEADERS( \
|
||||
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 Checks for libraries
|
||||
@ -2331,7 +2318,7 @@ if test $ol_enable_proctitle != no ; then
|
||||
[have_setproctitle=yes
|
||||
LUTIL_LIBS="$LUTIL_LIBS -lutil"],
|
||||
[have_setproctitle=no
|
||||
LIBOBJS="$LIBOBJS setproctitle.o"
|
||||
AC_LIBOBJ([setproctitle])
|
||||
LIBSRCS="$LIBSRCS setproctitle.c"])])
|
||||
|
||||
if test $have_setproctitle = yes ; then
|
||||
@ -2362,12 +2349,12 @@ dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_TYPE_MODE_T
|
||||
AC_TYPE_OFF_T
|
||||
AC_TYPE_PID_T
|
||||
AM_TYPE_PTRDIFF_T
|
||||
AC_CHECK_TYPES([ptrdiff_t, uintmax_t])
|
||||
AC_TYPE_SIGNAL
|
||||
AC_TYPE_SIZE_T
|
||||
|
||||
AC_CHECK_TYPE(ssize_t, [signed int])
|
||||
AC_CHECK_TYPE(caddr_t, [char *])
|
||||
AC_CHECK_TYPES([ssize_t, signed int])
|
||||
AC_CHECK_TYPES([caddr_t, char *])
|
||||
|
||||
OL_TYPE_SOCKLEN_T
|
||||
AC_STRUCT_ST_BLKSIZE
|
||||
@ -2897,48 +2884,47 @@ dnl ----------------------------------------------------------------
|
||||
dnl final output
|
||||
dnl
|
||||
|
||||
AC_OUTPUT( \
|
||||
Makefile:build/top.mk:Makefile.in:build/dir.mk \
|
||||
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
|
||||
])
|
||||
AC_CONFIG_FILES(Makefile:build/top.mk:Makefile.in:build/dir.mk)
|
||||
AC_CONFIG_FILES(doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk)
|
||||
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 >time-stamp
|
||||
echo Please run \"make depend\" to build dependencies])
|
||||
AC_OUTPUT
|
||||
|
||||
Loading…
Reference in New Issue
Block a user