mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-20 22:59:34 -05:00
Add back a few of the autoupdate suggested changes
The diff between 1.586.2.1 and 1.586.2.2 need to be carefully examined.
This commit is contained in:
Kurt Zeilenga
parent
6dcb8b5c04
commit
d003fffd72
2 changed files with 39 additions and 40 deletions
62
configure
vendored
62
configure
vendored
|
|
@ -1551,6 +1551,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
|
||||
|
||||
|
||||
|
||||
# set unset (borrowed from autoconf 2.49c)
|
||||
if (OL_FOO=OL_FOO; unset OL_FOO) >/dev/null 2>&1; then
|
||||
ol_unset=unset
|
||||
|
|
@ -5552,7 +5553,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 5555 "configure"' > conftest.$ac_ext
|
||||
echo '#line 5556 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -7373,7 +7374,7 @@ fi
|
|||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:7376:" \
|
||||
echo "$as_me:7377:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
|
|
@ -8471,11 +8472,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:8474: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8475: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:8478: \$? = $ac_status" >&5
|
||||
echo "$as_me:8479: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -8733,11 +8734,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:8736: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8737: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:8740: \$? = $ac_status" >&5
|
||||
echo "$as_me:8741: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -8795,11 +8796,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:8798: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8799: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:8802: \$? = $ac_status" >&5
|
||||
echo "$as_me:8803: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -11035,7 +11036,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11038 "configure"
|
||||
#line 11039 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -11133,7 +11134,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11136 "configure"
|
||||
#line 11137 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -13381,11 +13382,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13384: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13385: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13388: \$? = $ac_status" >&5
|
||||
echo "$as_me:13389: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -13443,11 +13444,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13446: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13447: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13450: \$? = $ac_status" >&5
|
||||
echo "$as_me:13451: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -14812,7 +14813,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14815 "configure"
|
||||
#line 14816 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -14910,7 +14911,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14913 "configure"
|
||||
#line 14914 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -15795,11 +15796,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15798: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15799: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15802: \$? = $ac_status" >&5
|
||||
echo "$as_me:15803: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -15857,11 +15858,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15860: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15861: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:15864: \$? = $ac_status" >&5
|
||||
echo "$as_me:15865: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -17979,11 +17980,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:17982: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17983: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:17986: \$? = $ac_status" >&5
|
||||
echo "$as_me:17987: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -18241,11 +18242,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:18244: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18245: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:18248: \$? = $ac_status" >&5
|
||||
echo "$as_me:18249: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -18303,11 +18304,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:18306: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18307: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:18310: \$? = $ac_status" >&5
|
||||
echo "$as_me:18311: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -20543,7 +20544,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 20546 "configure"
|
||||
#line 20547 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -20641,7 +20642,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 20644 "configure"
|
||||
#line 20645 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -22921,10 +22922,7 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
|
||||
|
||||
if test "X${am_cv_prog_cc_stdc}" = "Xno" ; then
|
||||
if test "X${ac_cv_prog_cc_stdc}" = "Xno" ; then
|
||||
{ { echo "$as_me:$LINENO: error: OpenLDAP requires compiler to support STDC constructs." >&5
|
||||
echo "$as_me: error: OpenLDAP requires compiler to support STDC constructs." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
|
|
|
|||
17
configure.in
17
configure.in
|
|
@ -46,7 +46,8 @@ define([AC_CACHE_LOAD], )dnl
|
|||
define([AC_CACHE_SAVE], )dnl
|
||||
dnl ================================================================
|
||||
dnl Configure.in for OpenLDAP
|
||||
AC_INIT(build/version.sh)dnl
|
||||
AC_INIT
|
||||
AC_CONFIG_SRCDIR(build/version.sh)dnl
|
||||
|
||||
# set unset (borrowed from autoconf 2.49c)
|
||||
if (OL_FOO=OL_FOO; unset OL_FOO) >/dev/null 2>&1; then
|
||||
|
|
@ -85,7 +86,7 @@ echo "Configuring ${TB}${OL_STRING}${TN} ${OPENLDAP_CVS}..."
|
|||
|
||||
dnl Determine host platform
|
||||
dnl we try not to use this for much
|
||||
AC_CANONICAL_SYSTEM
|
||||
AC_CANONICAL_TARGET([])
|
||||
|
||||
AM_INIT_AUTOMAKE([$OL_PACKAGE],[$OL_VERSION], [no defines])dnl
|
||||
AC_SUBST(PACKAGE)dnl
|
||||
|
|
@ -107,10 +108,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. Later versions like won't work.
|
||||
dnl aclocal.m4 should be built using aclocal from automake 1.4
|
||||
dnl libtool 1.4.3 should be installed.
|
||||
AC_PREREQ(2.13)dnl Required Autoconf version
|
||||
dnl We use autoconf features new to 2.59. Later versions like won't work.
|
||||
dnl aclocal.m4 should be built using aclocal from automake 1.5
|
||||
dnl libtool 1.5 should be installed.
|
||||
AC_PREREQ(2.59)dnl Required Autoconf version
|
||||
|
||||
AC_CONFIG_HEADER(include/portable.h include/ldap_features.h include/lber_types.h)dnl
|
||||
|
||||
|
|
@ -674,8 +675,8 @@ AC_CHECK_LIB(be, be_app, [LIBS="$LIBS -lbe -lroot -lnet"], :, [-lroot -lnet])
|
|||
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl OpenLDAP requires STDC features
|
||||
AM_PROG_CC_STDC
|
||||
if test "X${am_cv_prog_cc_stdc}" = "Xno" ; then
|
||||
AC_PROG_CC
|
||||
if test "X${ac_cv_prog_cc_stdc}" = "Xno" ; then
|
||||
AC_MSG_ERROR([OpenLDAP requires compiler to support STDC constructs.])
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue