X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure;h=f98ae9ef2d16c3ccf1a273ce81b28bb6c839310d;hb=83976a1e980008c257f4045b627b3f46d67f31fb;hp=6477498478552b23a86d443337ec252ec346ec03;hpb=5a9a32e0d70655046ead0db6a07895db81f16d6d;p=openldap diff --git a/configure b/configure index 6477498478..f98ae9ef2d 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh -# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.599 2005/09/01 09:50:14 hyc Exp . +# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.622 2006/01/09 21:36:31 kurt Exp . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # -# Copyright 1998-2005 The OpenLDAP Foundation. All rights reserved. +# Copyright 1998-2006 The OpenLDAP Foundation. All rights reserved. # Restrictions apply, see COPYRIGHT and LICENSE files. # # Copyright (C) 2003 Free Software Foundation, Inc. @@ -289,8 +289,8 @@ if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -465,7 +465,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar OPENLDAP_LIBRELEASE OPENLDAP_LIBVERSION OPENLDAP_RELEASE_DATE top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP LIBTOOL PERLBIN OL_MKDEP OL_MKDEP_FLAGS LTSTATIC LIBOBJS LIBSRCS PLAT WITH_SASL WITH_TLS WITH_MODULES_ENABLED WITH_ACI_ENABLED BUILD_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_LDBM BUILD_META BUILD_MONITOR BUILD_NULL BUILD_PASSWD BUILD_RELAY BUILD_PERL BUILD_SHELL BUILD_SQL BUILD_ACCESSLOG BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT BUILD_SLURPD LDAP_LIBS SLAPD_LIBS SLURPD_LIBS LDBM_LIBS LTHREAD_LIBS LUTIL_LIBS WRAP_LIBS SLAPD_MODULES_CPPFLAGS SLAPD_MODULES_LDFLAGS SLAPD_NO_STATIC SLAPD_STATIC_BACKENDS SLAPD_DYNAMIC_BACKENDS SLAPD_STATIC_OVERLAYS SLAPD_DYNAMIC_OVERLAYS PERL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LIBS TLS_LIBS MODULES_LIBS SLAPI_LIBS LIBSLAPI LIBSLAPITOOLS AUTH_LIBS SLAPD_SLP_LIBS SLAPD_GMP_LIBS SLAPD_SQL_LDFLAGS SLAPD_SQL_LIBS SLAPD_SQL_INCLUDES LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar OPENLDAP_LIBRELEASE OPENLDAP_LIBVERSION OPENLDAP_RELEASE_DATE top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP LIBTOOL PERLBIN OL_MKDEP OL_MKDEP_FLAGS LTSTATIC LIBOBJS LIBSRCS PLAT WITH_SASL WITH_TLS WITH_MODULES_ENABLED WITH_ACI_ENABLED BUILD_THREAD BUILD_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_LDBM BUILD_META BUILD_MONITOR BUILD_NULL BUILD_PASSWD BUILD_RELAY BUILD_PERL BUILD_SHELL BUILD_SQL BUILD_ACCESSLOG BUILD_DDS BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT BUILD_SLURPD LDAP_LIBS SLAPD_LIBS SLURPD_LIBS LDBM_LIBS LTHREAD_LIBS LUTIL_LIBS WRAP_LIBS SLAPD_MODULES_CPPFLAGS SLAPD_MODULES_LDFLAGS SLAPD_NO_STATIC SLAPD_STATIC_BACKENDS SLAPD_DYNAMIC_BACKENDS SLAPD_STATIC_OVERLAYS SLAPD_DYNAMIC_OVERLAYS PERL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LIBS TLS_LIBS MODULES_LIBS SLAPI_LIBS LIBSLAPI LIBSLAPITOOLS AUTH_LIBS ICU_LIBS SLAPD_SLP_LIBS SLAPD_GMP_LIBS SLAPD_SQL_LDFLAGS SLAPD_SQL_LIBS SLAPD_SQL_INCLUDES LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1006,7 +1006,7 @@ if test -n "$ac_init_help"; then Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-debug enable debugging [yes] + --enable-debug enable debugging no|yes|traditional [yes] --enable-dynamic enable linking built binaries with dynamic libs [no] --enable-syslog enable syslog support [auto] --enable-proctitle enable proctitle support [yes] @@ -1015,7 +1015,8 @@ Optional Features: SLAPD (Standalone LDAP Daemon) Options: --enable-slapd enable building slapd [yes] - --enable-aci enable per-object ACIs (experimental) [no] + --enable-dynacl enable run-time loadable ACL support (experimental) [no] + --enable-aci enable per-object ACIs (experimental) no|yes|mod [no] --enable-cleartext enable cleartext passwords [yes] --enable-crypt enable crypt(3) passwords [no] --enable-lmpasswd enable LAN Manager passwords [no] @@ -1048,6 +1049,7 @@ SLAPD Backend Options: SLAPD Overlay Options: --enable-overlays enable all available overlays no|yes|mod --enable-accesslog In-Directory Access Logging overlay no|yes|mod [no] + --enable-dds Dynamic Directory Services overlay no|yes|mod [no] --enable-denyop Deny Operation overlay no|yes|mod [no] --enable-dyngroup Dynamic Group overlay no|yes|mod [no] --enable-dynlist Dynamic List overlay no|yes|mod [no] @@ -1209,7 +1211,7 @@ Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -Copyright 1998-2005 The OpenLDAP Foundation. All rights reserved. +Copyright 1998-2006 The OpenLDAP Foundation. All rights reserved. Restrictions apply, see COPYRIGHT and LICENSE files. _ACEOF exit 0 @@ -1550,6 +1552,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + @@ -1585,7 +1589,7 @@ echo "$as_me: error: could not determine version" >&2;} { (exit 1); exit 1; }; } fi -if test -f "$ac_aux_dir/shtool" -a ! -d $ac_aux_dir/shtool; then +if test -f "$ac_aux_dir/shtool" && test ! -d $ac_aux_dir/shtool; then ac_cv_shtool="$ac_aux_dir/shtool" else { { echo "$as_me:$LINENO: error: no shtool found in $ac_aux_dir" >&5 @@ -2175,7 +2179,7 @@ if test "${enable_debug+set}" = set; then enableval="$enable_debug" ol_arg=invalid - for ol_val in auto yes no ; do + for ol_val in no yes traditional ; do if test "$enableval" = "$ol_val" ; then ol_arg="$ol_val" fi @@ -2386,7 +2390,7 @@ if test "${with_tls+set}" = set; then withval="$with_tls" ol_arg=invalid - for ol_val in auto ssleay openssl yes no ; do + for ol_val in auto openssl yes no ; do if test "$withval" = "$ol_val" ; then ol_arg="$ol_val" fi @@ -2478,6 +2482,29 @@ else ol_enable_slapd=yes fi; # end --enable-slapd +# OpenLDAP --enable-dynacl + + # Check whether --enable-dynacl or --disable-dynacl was given. +if test "${enable_dynacl+set}" = set; then + enableval="$enable_dynacl" + + ol_arg=invalid + for ol_val in auto yes no ; do + if test "$enableval" = "$ol_val" ; then + ol_arg="$ol_val" + fi + done + if test "$ol_arg" = "invalid" ; then + { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-dynacl" >&5 +echo "$as_me: error: bad value $enableval for --enable-dynacl" >&2;} + { (exit 1); exit 1; }; } + fi + ol_enable_dynacl="$ol_arg" + +else + ol_enable_dynacl=no +fi; +# end --enable-dynacl # OpenLDAP --enable-aci # Check whether --enable-aci or --disable-aci was given. @@ -2485,7 +2512,7 @@ if test "${enable_aci+set}" = set; then enableval="$enable_aci" ol_arg=invalid - for ol_val in auto yes no ; do + for ol_val in no yes mod ; do if test "$enableval" = "$ol_val" ; then ol_arg="$ol_val" fi @@ -3141,6 +3168,7 @@ fi; # end --enable-sql Overlays="accesslog \ + dds \ denyop \ dyngroup \ dynlist \ @@ -3206,6 +3234,30 @@ else fi; # end --enable-accesslog +# OpenLDAP --enable-dds + + # Check whether --enable-dds or --disable-dds was given. +if test "${enable_dds+set}" = set; then + enableval="$enable_dds" + + ol_arg=invalid + for ol_val in no yes mod ; do + if test "$enableval" = "$ol_val" ; then + ol_arg="$ol_val" + fi + done + if test "$ol_arg" = "invalid" ; then + { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-dds" >&5 +echo "$as_me: error: bad value $enableval for --enable-dds" >&2;} + { (exit 1); exit 1; }; } + fi + ol_enable_dds="$ol_arg" + +else + ol_enable_dds=${ol_enable_overlays:-no} +fi; +# end --enable-dds + # OpenLDAP --enable-denyop # Check whether --enable-denyop or --disable-denyop was given. @@ -3637,7 +3689,11 @@ echo "$as_me: WARNING: slapd disabled, ignoring --enable-wrappers argument" >&2; { echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-rlookups argument" >&5 echo "$as_me: WARNING: slapd disabled, ignoring --enable-rlookups argument" >&2;} fi - if test $ol_enable_aci = yes ; then + if test $ol_enable_dynacl = yes ; then + { echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-dynacl argument" >&5 +echo "$as_me: WARNING: slapd disabled, ignoring --enable-dynacl argument" >&2;} + fi + if test $ol_enable_aci != no ; then { echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-aci argument" >&5 echo "$as_me: WARNING: slapd disabled, ignoring --enable-aci argument" >&2;} fi @@ -3679,6 +3735,7 @@ echo "$as_me: WARNING: slapd disabled, ignoring --enable-$i argument" >&2;} ol_enable_modules=no ol_enable_multimaster=no ol_enable_rlookups=no + ol_enable_dynacl=no ol_enable_aci=no ol_enable_wrappers=no @@ -3701,19 +3758,19 @@ echo "$as_me: WARNING: LDBM disabled, ignoring --enable-ldbm-api argument" >&2;} echo "$as_me: WARNING: LDBM disabled, ignoring --enable-ldbm-type argument" >&2;} fi - if test $ol_enable_modules != yes -a \ - $ol_enable_bdb = no -a \ - $ol_enable_dnssrv = no -a \ - $ol_enable_hdb = no -a \ - $ol_enable_ldap = no -a \ - $ol_enable_meta = no -a \ - $ol_enable_monitor = no -a \ - $ol_enable_null = no -a \ - $ol_enable_passwd = no -a \ - $ol_enable_perl = no -a \ - $ol_enable_relay = no -a \ - $ol_enable_shell = no -a \ - $ol_enable_sql = no ; then + if test $ol_enable_modules != yes && + test $ol_enable_bdb = no && + test $ol_enable_dnssrv = no && + test $ol_enable_hdb = no && + test $ol_enable_ldap = no && + test $ol_enable_meta = no && + test $ol_enable_monitor = no && + test $ol_enable_null = no && + test $ol_enable_passwd = no && + test $ol_enable_perl = no && + test $ol_enable_relay = no && + test $ol_enable_shell = no && + test $ol_enable_sql = no ; then if test $ol_enable_slapd = yes ; then { { echo "$as_me:$LINENO: error: slapd requires a backend" >&5 @@ -3729,31 +3786,31 @@ echo "$as_me: WARNING: skipping slapd, no backend specified" >&2;} ol_enable_ldbm_api=no ol_enable_ldbm_type=no - if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then + if test $ol_enable_bdb/$ol_enable_hdb != no/no; then ol_enable_ldbm_api=berkeley fi else - if test $ol_enable_ldbm_api = gdbm -a \ - $ol_enable_ldbm_type = btree ; then + if test $ol_enable_ldbm_api = gdbm && + test $ol_enable_ldbm_type = btree ; then { { echo "$as_me:$LINENO: error: GDBM only supports LDBM type hash" >&5 echo "$as_me: error: GDBM only supports LDBM type hash" >&2;} { (exit 1); exit 1; }; } fi - if test $ol_enable_ldbm_api = mdbm -a \ - $ol_enable_ldbm_type = btree ; then + if test $ol_enable_ldbm_api = mdbm && + test $ol_enable_ldbm_type = btree ; then { { echo "$as_me:$LINENO: error: MDBM only supports LDBM type hash" >&5 echo "$as_me: error: MDBM only supports LDBM type hash" >&2;} { (exit 1); exit 1; }; } fi - if test $ol_enable_ldbm_api = ndbm -a \ - $ol_enable_ldbm_type = btree ; then + if test $ol_enable_ldbm_api = ndbm && + test $ol_enable_ldbm_type = btree ; then { { echo "$as_me:$LINENO: error: NDBM only supports LDBM type hash" >&5 echo "$as_me: error: NDBM only supports LDBM type hash" >&2;} { (exit 1); exit 1; }; } fi - if test $ol_enable_bdb != no -o $ol_enable_hdb != no ; then + if test $ol_enable_bdb/$ol_enable_hdb != no/no ; then if test $ol_enable_ldbm_api = auto ; then ol_enable_ldbm_api=berkeley elif test $ol_enable_ldbm_api != berkeley ; then @@ -3764,7 +3821,7 @@ echo "$as_me: error: LDBM API not compatible with BDB/HDB" >&2;} fi fi -if test $ol_enable_meta = yes -a $ol_enable_ldap = no ; then +if test $ol_enable_meta/$ol_enable_ldap = yes/no ; then { { echo "$as_me:$LINENO: error: --enable-meta requires --enable-ldap" >&5 echo "$as_me: error: --enable-meta requires --enable-ldap" >&2;} { (exit 1); exit 1; }; } @@ -3848,6 +3905,7 @@ BUILD_SHELL=no BUILD_SQL=no BUILD_ACCESSLOG=no +BUILD_DDS=no BUILD_DENYOP=no BUILD_DYNGROUP=no BUILD_DYNLIST=no @@ -3888,6 +3946,7 @@ SLAPI_LIBS= LIBSLAPI= LIBSLAPITOOLS= AUTH_LIBS= +ICU_LIBS= SLAPD_SLP_LIBS= SLAPD_GMP_LIBS= @@ -3967,10 +4026,11 @@ echo "$as_me: WARNING: disabling threads, no cc_r on AIX" >&2;} fi fi - if test "${CC}" = "cc_r" -o "${CC}" = "xlc_r" ; then + case ${CC} in cc_r | xlc_r) ol_with_threads=posix ol_cv_pthread_create=yes - fi + ;; + esac fi if test -z "${CC}"; then @@ -5335,7 +5395,7 @@ else if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &6 if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 conftest.$ac_ext + echo '#line 5748 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5728,7 +5788,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - case "`/usr/bin/file conftest.o`" in + case `/usr/bin/file conftest.o` in *32-bit*) case $host in x86_64-*linux*) @@ -6684,9 +6744,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -6764,7 +6824,7 @@ else elif test -x /usr/sbin/sysctl; then lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` else - lt_cv_sys_max_cmd_len=65536 # usable default for *BSD + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs fi # And add a safety zone lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` @@ -7079,7 +7139,7 @@ rm="rm -f" default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except M$VC, +# All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -7400,7 +7460,7 @@ else if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -7462,7 +7522,7 @@ else if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -7611,7 +7671,7 @@ else LDFLAGS="$LDFLAGS $lt_prog_compiler_static" printf "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The compiler can only warn and ignore the option if not recognized + # The linker can only warn and ignore the option if not recognized # So say no if there are warnings if test -s conftest.err; then # Append any errors to the config.log. @@ -7662,14 +7722,14 @@ else # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7668: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7728: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7672: \$? = $ac_status" >&5 + echo "$as_me:7732: \$? = $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. @@ -7752,7 +7812,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -7799,7 +7859,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_wl='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -7829,12 +7889,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; - pgcc* | pgf77* | pgf90*) + pgcc* | pgf77* | pgf90* | pgf95*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-static' + lt_prog_compiler_static='-Bstatic' ;; ccc*) lt_prog_compiler_wl='-Wl,' @@ -7924,14 +7984,14 @@ else # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7930: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7990: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7934: \$? = $ac_status" >&5 + echo "$as_me:7994: \$? = $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. @@ -7958,7 +8018,7 @@ else fi fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= @@ -7986,14 +8046,14 @@ else # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7992: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8052: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7996: \$? = $ac_status" >&5 + echo "$as_me:8056: \$? = $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 @@ -8004,7 +8064,7 @@ else lt_cv_prog_compiler_c_o=yes fi fi - chmod u+w . + chmod u+w . 2>&5 $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -8204,11 +8264,11 @@ EOF tmp_addflag= case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* ) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -8516,7 +8576,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec=' ' archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds it's shared libraries. + # This is similar to how AIX traditionally builds its shared libraries. archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi @@ -8556,7 +8616,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; darwin* | rhapsody*) - case "$host_os" in + case $host_os in rhapsody* | darwin1.[012]) allow_undefined_flag='${wl}-undefined ${wl}suppress' ;; @@ -8585,7 +8645,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi output_verbose_link_cmd='echo' archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else @@ -8594,7 +8654,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi output_verbose_link_cmd='echo' archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; @@ -8660,7 +8720,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; @@ -8669,7 +8729,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac else - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; @@ -8679,7 +8739,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi if test "$with_gnu_ld" = no; then - case "$host_cpu" in + case $host_cpu in hppa*64*) hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld='+b $libdir' @@ -9138,7 +9198,8 @@ cygwin* | mingw* | pw32*) dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -9191,7 +9252,7 @@ darwin* | rhapsody*) soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -9229,7 +9290,14 @@ kfreebsd*-gnu) freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -9274,7 +9342,7 @@ hpux9* | hpux10* | hpux11*) version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -10229,7 +10297,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null + (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; @@ -10327,7 +10395,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null + (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; @@ -10443,7 +10511,7 @@ test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case "$host_os" in +case $host_os in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -12799,7 +12867,7 @@ EOF ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } \ - | egrep '^conftest\.'"${ac_objext}" >/dev/null 2>&1 + | grep '^conftest\.'"${ac_objext}" >/dev/null 2>&1 then if test ! -f conftest."${ac_object}" ; then ol_cv_mkdep=$flag @@ -13043,9 +13111,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -13905,14 +13973,13 @@ fi - for ac_header in \ arpa/inet.h \ - arpa/nameser.h \ + arpa/nameser.h \ assert.h \ - bits/types.h \ + bits/types.h \ conio.h \ crypt.h \ direct.h \ @@ -13925,7 +13992,6 @@ for ac_header in \ libutil.h \ limits.h \ locale.h \ - netinet/tcp.h \ malloc.h \ memory.h \ psap.h \ @@ -13942,11 +14008,11 @@ for ac_header in \ sys/errno.h \ sys/ioctl.h \ sys/param.h \ - sys/resource.h \ - sys/select.h \ - sys/socket.h \ + sys/resource.h \ + sys/select.h \ + sys/socket.h \ sys/stat.h \ - sys/syslog.h \ + sys/syslog.h \ sys/time.h \ sys/types.h \ sys/uio.h \ @@ -14077,9 +14143,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -14171,6 +14237,70 @@ done +for ac_header in netinet/tcp.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include + + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + for ac_header in sys/ucred.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -15243,9 +15373,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -15589,9 +15719,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -15740,9 +15870,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -16443,9 +16573,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -16803,9 +16933,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -17387,7 +17517,7 @@ _ACEOF fi fi -if test "$ol_enable_dnssrv" = yes -o "$ol_enable_dnssrv" = mod ; then +if test "$ol_enable_dnssrv" = yes || test "$ol_enable_dnssrv" = mod ; then if test "$ol_link_dnssrv" = no ; then { { echo "$as_me:$LINENO: error: DNSSRV requires res_query()" >&5 echo "$as_me: error: DNSSRV requires res_query()" >&2;} @@ -17607,7 +17737,7 @@ done ol_link_ipv6=no -if test $ac_cv_func_getaddrinfo = no -o $ac_cv_func_inet_ntop = no ; then +if test $ac_cv_func_getaddrinfo = no || test $ac_cv_func_inet_ntop = no ; then if test $ol_enable_ipv6 = yes ; then { { echo "$as_me:$LINENO: error: IPv6 support requires getaddrinfo() and inet_ntop()" >&5 echo "$as_me: error: IPv6 support requires getaddrinfo() and inet_ntop()" >&2;} @@ -17706,16 +17836,16 @@ fi echo "$as_me:$LINENO: result: $ol_cv_struct_sockaddr_storage" >&5 echo "${ECHO_T}$ol_cv_struct_sockaddr_storage" >&6 - if test $ol_cv_inet6_addrstrlen = yes \ - -a $ol_cv_struct_sockaddr_storage = yes ; then + if test $ol_cv_inet6_addrstrlen = yes && + test $ol_cv_struct_sockaddr_storage = yes ; then ol_link_ipv6=yes - elif test $ol_enable_ipv6 = yes \ - -a $ol_cv_inet6_addrstrlen = no ; then + elif test $ol_enable_ipv6 = yes && + test $ol_cv_inet6_addrstrlen = no ; then { { echo "$as_me:$LINENO: error: IPv6 support requires INET6_ADDRSTRLEN" >&5 echo "$as_me: error: IPv6 support requires INET6_ADDRSTRLEN" >&2;} { (exit 1); exit 1; }; } - elif test $ol_enable_ipv6 = yes \ - -a $ol_cv_struct_sockaddr_storage = no ; then + elif test $ol_enable_ipv6 = yes && + test $ol_cv_struct_sockaddr_storage = no ; then { { echo "$as_me:$LINENO: error: IPv6 support requires struct sockaddr_storage" >&5 echo "$as_me: error: IPv6 support requires struct sockaddr_storage" >&2;} { (exit 1); exit 1; }; } @@ -17845,9 +17975,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -17887,9 +18017,7 @@ ol_link_kbind=no ol_link_krb5=no ol_link_krb4=no -if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \ - -o $ol_with_kerberos = k5 -o $ol_with_kerberos = k5only \ - -o $ol_with_kerberos = k425 ; then +case $ol_with_kerberos in yes | auto | k5 | k5only | k425) for ac_header in krb5.h @@ -18013,9 +18141,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -18165,9 +18293,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -18495,10 +18623,13 @@ echo "$as_me: error: Required Kerberos 5 support not available" >&2;} fi fi -fi + ;; +esac -if test $ol_link_krb5 = yes -a \( $ol_with_kerberos = yes -o \ - $ol_with_kerberos = auto -o $ol_with_kerberos = k425 \) ; then +if test $ol_link_krb5 = yes && + { test $ol_with_kerberos = yes || + test $ol_with_kerberos = auto || + test $ol_with_kerberos = k425; }; then @@ -18623,9 +18754,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -18891,8 +19022,7 @@ if test $ol_link_krb5 = yes ; then ol_with_kerberos=found fi -if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \ - -o $ol_with_kerberos = k4 -o $ol_with_kerberos = kth ; then +case $ol_with_kerberos in yes | auto | k4 | kth) @@ -19018,9 +19148,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -19134,9 +19264,10 @@ _ACEOF fi fi fi -fi + ;; +esac -if test $ol_link_krb4 = yes -a $ol_enable_kbind != no ; then +if test $ol_link_krb4 = yes && test $ol_enable_kbind != no ; then ol_link_kbind=yes elif test $ol_enable_kbind = yes ; then @@ -19145,14 +19276,14 @@ echo "$as_me: error: Kerberos IV detection failed" >&2;} { (exit 1); exit 1; }; } fi -if test $ol_link_krb4 = yes -o $ol_link_krb5 = yes ; then +if test $ol_link_krb4 = yes || test $ol_link_krb5 = yes ; then cat >>confdefs.h <<\_ACEOF #define HAVE_KERBEROS 1 _ACEOF -elif test $ol_with_kerberos != auto -a $ol_with_kerberos != no ; then +elif test $ol_with_kerberos != auto && test $ol_with_kerberos != no ; then { { echo "$as_me:$LINENO: error: Kerberos detection failed" >&5 echo "$as_me: error: Kerberos detection failed" >&2;} { (exit 1); exit 1; }; } @@ -19162,8 +19293,7 @@ fi ol_link_tls=no if test $ol_with_tls != no ; then - -for ac_header in openssl/ssl.h ssl.h +for ac_header in openssl/ssl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -19284,9 +19414,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -19313,82 +19443,8 @@ fi done - if test $ac_cv_header_openssl_ssl_h = yes \ - -o $ac_cv_header_ssl_h = yes ; then - echo "$as_me:$LINENO: checking for SSLeay_add_ssl_algorithms in -lssl" >&5 -echo $ECHO_N "checking for SSLeay_add_ssl_algorithms in -lssl... $ECHO_C" >&6 -if test "${ac_cv_lib_ssl_SSLeay_add_ssl_algorithms+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lssl -lcrypto $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char SSLeay_add_ssl_algorithms (); -int -main () -{ -SSLeay_add_ssl_algorithms (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ssl_SSLeay_add_ssl_algorithms=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ssl_SSLeay_add_ssl_algorithms=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSLeay_add_ssl_algorithms" >&5 -echo "${ECHO_T}$ac_cv_lib_ssl_SSLeay_add_ssl_algorithms" >&6 -if test $ac_cv_lib_ssl_SSLeay_add_ssl_algorithms = yes; then - have_ssleay=yes - need_rsaref=no -else - have_ssleay=no -fi - - - if test $have_ssleay = no ; then - echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5 + if test $ac_cv_header_openssl_ssl_h = yes ; then + echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5 echo $ECHO_N "checking for SSL_library_init in -lssl... $ECHO_C" >&6 if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19453,15 +19509,14 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_library_init" >&5 echo "${ECHO_T}$ac_cv_lib_ssl_SSL_library_init" >&6 if test $ac_cv_lib_ssl_SSL_library_init = yes; then - have_ssleay=yes - need_rsaref=no + have_openssl=yes + need_rsaref=no else - have_ssleay=no + have_openssl=no fi - fi - if test $have_ssleay = no ; then + if test $have_openssl = no ; then echo "$as_me:$LINENO: checking for ssl3_accept in -lssl" >&5 echo $ECHO_N "checking for ssl3_accept in -lssl... $ECHO_C" >&6 if test "${ac_cv_lib_ssl_ssl3_accept+set}" = set; then @@ -19527,21 +19582,21 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_ssl3_accept" >&5 echo "${ECHO_T}$ac_cv_lib_ssl_ssl3_accept" >&6 if test $ac_cv_lib_ssl_ssl3_accept = yes; then - have_ssleay=yes + have_openssl=yes need_rsaref=yes else - have_ssleay=no + have_openssl=no fi fi - if test $have_ssleay = yes ; then + if test $have_openssl = yes ; then ol_with_tls=found ol_link_tls=yes cat >>confdefs.h <<\_ACEOF -#define HAVE_SSLEAY 1 +#define HAVE_OPENSSL 1 _ACEOF @@ -19647,8 +19702,7 @@ fi ol_link_threads=no -if test $ol_with_threads = auto -o $ol_with_threads = yes \ - -o $ol_with_threads = nt ; then +case $ol_with_threads in auto | yes | nt) echo "$as_me:$LINENO: checking for _beginthread" >&5 @@ -19775,10 +19829,10 @@ _ACEOF echo "$as_me: error: could not locate NT Threads" >&2;} { (exit 1); exit 1; }; } fi -fi + ;; +esac -if test $ol_with_threads = auto -o $ol_with_threads = yes \ - -o $ol_with_threads = posix ; then +case $ol_with_threads in auto | yes | posix) for ac_header in pthread.h @@ -19902,9 +19956,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -20273,9 +20327,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -24171,9 +24225,9 @@ fi done - if test $ac_cv_func_sched_yield = no -a \ - $ac_cv_func_pthread_yield = no -a \ - $ac_cv_func_thr_yield = no ; then + if test $ac_cv_func_sched_yield = no && + test $ac_cv_func_pthread_yield = no && + test $ac_cv_func_thr_yield = no ; then echo "$as_me:$LINENO: checking for sched_yield in -lrt" >&5 echo $ECHO_N "checking for sched_yield in -lrt... $ECHO_C" >&6 if test "${ac_cv_lib_rt_sched_yield+set}" = set; then @@ -24251,9 +24305,9 @@ else fi fi - if test $ac_cv_func_sched_yield = no -a \ - $ac_cv_func_pthread_yield = no -a \ - "$ac_cv_func_thr_yield" = no ; then + if test $ac_cv_func_sched_yield = no && + test $ac_cv_func_pthread_yield = no && + test "$ac_cv_func_thr_yield" = no ; then { echo "$as_me:$LINENO: WARNING: could not locate sched_yield() or pthread_yield()" >&5 echo "$as_me: WARNING: could not locate sched_yield() or pthread_yield()" >&2;} fi @@ -24669,11 +24723,11 @@ if test "${ol_cv_linux_threads+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test $ol_cv_header_linux_threads = yes -a \ - $ol_cv_sys_linux_threads = yes; then + if test $ol_cv_header_linux_threads = yes && + test $ol_cv_sys_linux_threads = yes; then ol_cv_linux_threads=yes - elif test $ol_cv_header_linux_threads = no -a \ - $ol_cv_sys_linux_threads = no; then + elif test $ol_cv_header_linux_threads = no && + test $ol_cv_sys_linux_threads = no; then ol_cv_linux_threads=no else ol_cv_linux_threads=error @@ -24806,6 +24860,123 @@ echo "${ECHO_T}$ol_cv_pthread_create_works" >&6 { { echo "$as_me:$LINENO: error: pthread_create is not usable, check environment settings" >&5 echo "$as_me: error: pthread_create is not usable, check environment settings" >&2;} { (exit 1); exit 1; }; } + fi + + ol_replace_broken_yield=no + case "$target" in + *-*-linux*) + +for ac_func in nanosleep +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + ol_replace_broken_yield=yes + ;; + esac + + if test $ol_replace_broken_yield = yes ; then + +cat >>confdefs.h <<\_ACEOF +#define REPLACE_BROKEN_YIELD 1 +_ACEOF + fi if test $ol_with_yielding_select = auto ; then @@ -24950,10 +25121,10 @@ echo "$as_me: error: could not locate usable POSIX Threads" >&2;} echo "$as_me: error: could not locate POSIX Threads" >&2;} { (exit 1); exit 1; }; } fi -fi + ;; +esac -if test $ol_with_threads = auto -o $ol_with_threads = yes \ - -o $ol_with_threads = mach ; then +case $ol_with_threads in auto | yes | mach) @@ -25078,9 +25249,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -25403,10 +25574,10 @@ _ACEOF echo "$as_me: error: could not link with Mach CThreads" >&2;} { (exit 1); exit 1; }; } fi -fi + ;; +esac -if test $ol_with_threads = auto -o $ol_with_threads = yes \ - -o $ol_with_threads = pth ; then +case $ol_with_threads in auto | yes | pth) for ac_header in pth.h @@ -25530,9 +25701,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -25646,10 +25817,10 @@ _ACEOF fi fi fi -fi + ;; +esac -if test $ol_with_threads = auto -o $ol_with_threads = yes \ - -o $ol_with_threads = lwp ; then +case $ol_with_threads in auto | yes | lwp) @@ -25774,9 +25945,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -25802,7 +25973,8 @@ fi done - if test $ac_cv_header_thread_h = yes -a $ac_cv_header_synch_h = yes ; then + if test $ac_cv_header_thread_h = yes && + test $ac_cv_header_synch_h = yes ; then echo "$as_me:$LINENO: checking for thr_create in -lthread" >&5 echo $ECHO_N "checking for thr_create in -lthread... $ECHO_C" >&6 if test "${ac_cv_lib_thread_thr_create+set}" = set; then @@ -26118,9 +26290,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -26232,7 +26404,8 @@ _ACEOF fi fi fi -fi + ;; +esac if test $ol_with_yielding_select = yes ; then @@ -26371,9 +26544,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -26659,9 +26832,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -26809,9 +26982,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -26960,9 +27133,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -26990,7 +27163,7 @@ done fi -if test $ol_link_threads != no -a $ol_link_threads != nt ; then +if test $ol_link_threads != no && test $ol_link_threads != nt ; then cat >>confdefs.h <<\_ACEOF #define REENTRANT 1 _ACEOF @@ -27134,8 +27307,8 @@ fi echo "$as_me:$LINENO: result: $ol_cv_h_errno_thread_specific" >&5 echo "${ECHO_T}$ol_cv_h_errno_thread_specific" >&6 - if test $ol_cv_errno_thread_specific != yes \ - -o $ol_cv_h_errno_thread_specific != yes ; then + if test $ol_cv_errno_thread_specific != yes || + test $ol_cv_h_errno_thread_specific != yes ; then LIBS="$LTHREAD_LIBS $LIBS" LTHREAD_LIBS="" fi @@ -27161,6 +27334,9 @@ cat >>confdefs.h <<\_ACEOF _ACEOF LTHREAD_LIBS="" + BUILD_THREAD=no +else + BUILD_THREAD=yes fi if test $ol_link_threads != no ; then @@ -27379,13 +27555,13 @@ ol_cv_func_ctime_r_nargs2=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - if test $ol_cv_func_ctime_r_nargs3 = yes -a \ - $ol_cv_func_ctime_r_nargs2 = no ; then + if test $ol_cv_func_ctime_r_nargs3 = yes && + test $ol_cv_func_ctime_r_nargs2 = no ; then ol_cv_func_ctime_r_nargs=3 - elif test $ol_cv_func_ctime_r_nargs3 = no -a \ - $ol_cv_func_ctime_r_nargs2 = yes ; then + elif test $ol_cv_func_ctime_r_nargs3 = no && + test $ol_cv_func_ctime_r_nargs2 = yes ; then ol_cv_func_ctime_r_nargs=2 @@ -27520,13 +27696,13 @@ ol_cv_func_gethostbyname_r_nargs6=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - if test $ol_cv_func_gethostbyname_r_nargs5 = yes -a \ - $ol_cv_func_gethostbyname_r_nargs6 = no ; then + if test $ol_cv_func_gethostbyname_r_nargs5 = yes && + test $ol_cv_func_gethostbyname_r_nargs6 = no ; then ol_cv_func_gethostbyname_r_nargs=5 - elif test $ol_cv_func_gethostbyname_r_nargs5 = no -a \ - $ol_cv_func_gethostbyname_r_nargs6 = yes ; then + elif test $ol_cv_func_gethostbyname_r_nargs5 = no && + test $ol_cv_func_gethostbyname_r_nargs6 = yes ; then ol_cv_func_gethostbyname_r_nargs=6 @@ -27667,13 +27843,13 @@ ol_cv_func_gethostbyaddr_r_nargs8=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - if test $ol_cv_func_gethostbyaddr_r_nargs7 = yes -a \ - $ol_cv_func_gethostbyaddr_r_nargs8 = no ; then + if test $ol_cv_func_gethostbyaddr_r_nargs7 = yes && + test $ol_cv_func_gethostbyaddr_r_nargs8 = no ; then ol_cv_func_gethostbyaddr_r_nargs=7 - elif test $ol_cv_func_gethostbyaddr_r_nargs7 = no -a \ - $ol_cv_func_gethostbyaddr_r_nargs8 = yes ; then + elif test $ol_cv_func_gethostbyaddr_r_nargs7 = no && + test $ol_cv_func_gethostbyaddr_r_nargs8 = yes ; then ol_cv_func_gethostbyaddr_r_nargs=8 @@ -27698,9 +27874,7 @@ fi ol_link_ldbm=no -if test $ol_enable_ldbm_api = auto \ - -o $ol_enable_ldbm_api = berkeley \ - -o $ol_enable_ldbm_api = bcompat ; then +case $ol_enable_ldbm_api in auto | berkeley | bcompat) if test $ol_enable_ldbm_api = bcompat; then \ @@ -27826,9 +28000,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -27854,7 +28028,7 @@ fi done -if test $ac_cv_header_db_185_h = yes -o $ac_cv_header_db_h = yes; then +if test $ac_cv_header_db_185_h = yes || test $ac_cv_header_db_h = yes; then echo "$as_me:$LINENO: checking if Berkeley DB header compatibility" >&5 echo $ECHO_N "checking if Berkeley DB header compatibility... $ECHO_C" >&6 if test "${ol_cv_header_db1+set}" = set; then @@ -27898,14 +28072,385 @@ echo "${ECHO_T}$ol_cv_header_db1" >&6 if test $ol_cv_header_db1 = yes ; then ol_cv_lib_db=no -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (default)" >&5 -echo $ECHO_N "checking for Berkeley DB link (default)... $ECHO_C" >&6 -if test "${ol_cv_db_none+set}" = set; then + +echo "$as_me:$LINENO: checking for Berkeley DB major version" >&5 +echo $ECHO_N "checking for Berkeley DB major version... $ECHO_C" >&6 +if test "${ol_cv_bdb_major+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB= + ol_cv_bdb_major=0 + if test $ol_cv_bdb_major = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif +#if DB_VERSION_MAJOR == 4 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_major=4 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_major = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif +#if DB_VERSION_MAJOR == 3 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_major=3 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_major = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif +#if DB_VERSION_MAJOR == 2 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_major=2 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_major = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif +#if DB_VERSION_MAJOR == 1 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_major=1 +else + : +fi +rm -f conftest* + + fi + + if test $ol_cv_bdb_major = 0 ; then + { { echo "$as_me:$LINENO: error: Unknown Berkeley DB major version" >&5 +echo "$as_me: error: Unknown Berkeley DB major version" >&2;} + { (exit 1); exit 1; }; } + fi + +fi +echo "$as_me:$LINENO: result: $ol_cv_bdb_major" >&5 +echo "${ECHO_T}$ol_cv_bdb_major" >&6 + +echo "$as_me:$LINENO: checking for Berkeley DB minor version" >&5 +echo $ECHO_N "checking for Berkeley DB minor version... $ECHO_C" >&6 +if test "${ol_cv_bdb_minor+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ol_cv_bdb_minor=0 + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 9 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=9 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 8 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=8 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 7 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=7 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 6 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=6 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 5 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=5 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 4 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=4 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 3 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=3 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 2 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=2 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 1 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=1 +else + : +fi +rm -f conftest* + + fi + +fi +echo "$as_me:$LINENO: result: $ol_cv_bdb_minor" >&5 +echo "${ECHO_T}$ol_cv_bdb_minor" >&6 + +if test $ol_cv_bdb_major = 4 ; then + if test $ol_cv_bdb_minor = 4 ; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb44)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb44)... $ECHO_C" >&6 +if test "${ol_cv_db_db44+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ol_DB_LIB=-ldb44 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -27986,12 +28531,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_none=yes + ol_cv_db_db44=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_none=no +ol_cv_db_db44=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -27999,22 +28544,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_none" >&5 -echo "${ECHO_T}$ol_cv_db_none" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db44" >&5 +echo "${ECHO_T}$ol_cv_db_db44" >&6 - if test $ol_cv_db_none = yes ; then - ol_cv_lib_db=yes + if test $ol_cv_db_db44 = yes ; then + ol_cv_lib_db=-ldb44 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb43)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb43)... $ECHO_C" >&6 -if test "${ol_cv_db_db43+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-44)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-44)... $ECHO_C" >&6 +if test "${ol_cv_db_db_44+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb43 + ol_DB_LIB=-ldb-44 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -28095,12 +28640,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db43=yes + ol_cv_db_db_44=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db43=no +ol_cv_db_db_44=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -28108,22 +28653,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db43" >&5 -echo "${ECHO_T}$ol_cv_db_db43" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db_44" >&5 +echo "${ECHO_T}$ol_cv_db_db_44" >&6 - if test $ol_cv_db_db43 = yes ; then - ol_cv_lib_db=-ldb43 + if test $ol_cv_db_db_44 = yes ; then + ol_cv_lib_db=-ldb-44 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-43)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb-43)... $ECHO_C" >&6 -if test "${ol_cv_db_db_43+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.4)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-4.4)... $ECHO_C" >&6 +if test "${ol_cv_db_db_4_dot_4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb-43 + ol_DB_LIB=-ldb-4.4 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -28204,12 +28749,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db_43=yes + ol_cv_db_db_4_dot_4=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_43=no +ol_cv_db_db_4_dot_4=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -28217,22 +28762,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db_43" >&5 -echo "${ECHO_T}$ol_cv_db_db_43" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_4" >&5 +echo "${ECHO_T}$ol_cv_db_db_4_dot_4" >&6 - if test $ol_cv_db_db_43 = yes ; then - ol_cv_lib_db=-ldb-43 + if test $ol_cv_db_db_4_dot_4 = yes ; then + ol_cv_lib_db=-ldb-4.4 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.3)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb-4.3)... $ECHO_C" >&6 -if test "${ol_cv_db_db_4_dot_3+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-4)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-4-4)... $ECHO_C" >&6 +if test "${ol_cv_db_db_4_4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb-4.3 + ol_DB_LIB=-ldb-4-4 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -28313,12 +28858,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db_4_dot_3=yes + ol_cv_db_db_4_4=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_4_dot_3=no +ol_cv_db_db_4_4=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -28326,22 +28871,23 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_3" >&5 -echo "${ECHO_T}$ol_cv_db_db_4_dot_3" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db_4_4" >&5 +echo "${ECHO_T}$ol_cv_db_db_4_4" >&6 - if test $ol_cv_db_db_4_dot_3 = yes ; then - ol_cv_lib_db=-ldb-4.3 + if test $ol_cv_db_db_4_4 = yes ; then + ol_cv_lib_db=-ldb-4-4 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-3)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb-4-3)... $ECHO_C" >&6 -if test "${ol_cv_db_db_4_3+set}" = set; then + elif test $ol_cv_bdb_minor = 3 ; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb43)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb43)... $ECHO_C" >&6 +if test "${ol_cv_db_db43+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb-4-3 + ol_DB_LIB=-ldb43 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -28422,12 +28968,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db_4_3=yes + ol_cv_db_db43=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_4_3=no +ol_cv_db_db43=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -28435,22 +28981,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db_4_3" >&5 -echo "${ECHO_T}$ol_cv_db_db_4_3" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db43" >&5 +echo "${ECHO_T}$ol_cv_db_db43" >&6 - if test $ol_cv_db_db_4_3 = yes ; then - ol_cv_lib_db=-ldb-4-3 + if test $ol_cv_db_db43 = yes ; then + ol_cv_lib_db=-ldb43 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb42)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb42)... $ECHO_C" >&6 -if test "${ol_cv_db_db42+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-43)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-43)... $ECHO_C" >&6 +if test "${ol_cv_db_db_43+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb42 + ol_DB_LIB=-ldb-43 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -28531,12 +29077,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db42=yes + ol_cv_db_db_43=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db42=no +ol_cv_db_db_43=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -28544,22 +29090,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db42" >&5 -echo "${ECHO_T}$ol_cv_db_db42" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db_43" >&5 +echo "${ECHO_T}$ol_cv_db_db_43" >&6 - if test $ol_cv_db_db42 = yes ; then - ol_cv_lib_db=-ldb42 + if test $ol_cv_db_db_43 = yes ; then + ol_cv_lib_db=-ldb-43 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-42)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb-42)... $ECHO_C" >&6 -if test "${ol_cv_db_db_42+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.3)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-4.3)... $ECHO_C" >&6 +if test "${ol_cv_db_db_4_dot_3+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb-42 + ol_DB_LIB=-ldb-4.3 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -28640,12 +29186,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db_42=yes + ol_cv_db_db_4_dot_3=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_42=no +ol_cv_db_db_4_dot_3=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -28653,22 +29199,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db_42" >&5 -echo "${ECHO_T}$ol_cv_db_db_42" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_3" >&5 +echo "${ECHO_T}$ol_cv_db_db_4_dot_3" >&6 - if test $ol_cv_db_db_42 = yes ; then - ol_cv_lib_db=-ldb-42 + if test $ol_cv_db_db_4_dot_3 = yes ; then + ol_cv_lib_db=-ldb-4.3 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.2)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb-4.2)... $ECHO_C" >&6 -if test "${ol_cv_db_db_4_dot_2+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-3)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-4-3)... $ECHO_C" >&6 +if test "${ol_cv_db_db_4_3+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb-4.2 + ol_DB_LIB=-ldb-4-3 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -28749,12 +29295,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db_4_dot_2=yes + ol_cv_db_db_4_3=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_4_dot_2=no +ol_cv_db_db_4_3=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -28762,22 +29308,23 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_2" >&5 -echo "${ECHO_T}$ol_cv_db_db_4_dot_2" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db_4_3" >&5 +echo "${ECHO_T}$ol_cv_db_db_4_3" >&6 - if test $ol_cv_db_db_4_dot_2 = yes ; then - ol_cv_lib_db=-ldb-4.2 + if test $ol_cv_db_db_4_3 = yes ; then + ol_cv_lib_db=-ldb-4-3 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-2)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb-4-2)... $ECHO_C" >&6 -if test "${ol_cv_db_db_4_2+set}" = set; then + elif test $ol_cv_bdb_minor = 2 ; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb42)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb42)... $ECHO_C" >&6 +if test "${ol_cv_db_db42+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb-4-2 + ol_DB_LIB=-ldb42 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -28858,12 +29405,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db_4_2=yes + ol_cv_db_db42=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_4_2=no +ol_cv_db_db42=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -28871,22 +29418,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db_4_2" >&5 -echo "${ECHO_T}$ol_cv_db_db_4_2" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db42" >&5 +echo "${ECHO_T}$ol_cv_db_db42" >&6 - if test $ol_cv_db_db_4_2 = yes ; then - ol_cv_lib_db=-ldb-4-2 + if test $ol_cv_db_db42 = yes ; then + ol_cv_lib_db=-ldb42 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb-4)... $ECHO_C" >&6 -if test "${ol_cv_db_db_4+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-42)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-42)... $ECHO_C" >&6 +if test "${ol_cv_db_db_42+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb-4 + ol_DB_LIB=-ldb-42 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -28967,12 +29514,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db_4=yes + ol_cv_db_db_42=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_4=no +ol_cv_db_db_42=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -28980,22 +29527,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db_4" >&5 -echo "${ECHO_T}$ol_cv_db_db_4" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db_42" >&5 +echo "${ECHO_T}$ol_cv_db_db_42" >&6 - if test $ol_cv_db_db_4 = yes ; then - ol_cv_lib_db=-ldb-4 + if test $ol_cv_db_db_42 = yes ; then + ol_cv_lib_db=-ldb-42 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb4)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb4)... $ECHO_C" >&6 -if test "${ol_cv_db_db4+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.2)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-4.2)... $ECHO_C" >&6 +if test "${ol_cv_db_db_4_dot_2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb4 + ol_DB_LIB=-ldb-4.2 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -29076,12 +29623,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db4=yes + ol_cv_db_db_4_dot_2=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db4=no +ol_cv_db_db_4_dot_2=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -29089,22 +29636,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db4" >&5 -echo "${ECHO_T}$ol_cv_db_db4" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_2" >&5 +echo "${ECHO_T}$ol_cv_db_db_4_dot_2" >&6 - if test $ol_cv_db_db4 = yes ; then - ol_cv_lib_db=-ldb4 + if test $ol_cv_db_db_4_dot_2 = yes ; then + ol_cv_lib_db=-ldb-4.2 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb)... $ECHO_C" >&6 -if test "${ol_cv_db_db+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-2)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-4-2)... $ECHO_C" >&6 +if test "${ol_cv_db_db_4_2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb + ol_DB_LIB=-ldb-4-2 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -29185,12 +29732,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db=yes + ol_cv_db_db_4_2=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db=no +ol_cv_db_db_4_2=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -29198,15 +29745,16 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db" >&5 -echo "${ECHO_T}$ol_cv_db_db" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db_4_2" >&5 +echo "${ECHO_T}$ol_cv_db_db_4_2" >&6 - if test $ol_cv_db_db = yes ; then - ol_cv_lib_db=-ldb + if test $ol_cv_db_db_4_2 = yes ; then + ol_cv_lib_db=-ldb-4-2 fi fi -if test $ol_cv_lib_db = no ; then + elif test $ol_cv_bdb_minor = 1 ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb41)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb41)... $ECHO_C" >&6 if test "${ol_cv_db_db41+set}" = set; then @@ -29315,7 +29863,7 @@ echo "${ECHO_T}$ol_cv_db_db41" >&6 fi fi -if test $ol_cv_lib_db = no ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-41)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb-41)... $ECHO_C" >&6 if test "${ol_cv_db_db_41+set}" = set; then @@ -29424,7 +29972,7 @@ echo "${ECHO_T}$ol_cv_db_db_41" >&6 fi fi -if test $ol_cv_lib_db = no ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.1)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb-4.1)... $ECHO_C" >&6 if test "${ol_cv_db_db_4_dot_1+set}" = set; then @@ -29533,7 +30081,7 @@ echo "${ECHO_T}$ol_cv_db_db_4_dot_1" >&6 fi fi -if test $ol_cv_lib_db = no ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-1)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb-4-1)... $ECHO_C" >&6 if test "${ol_cv_db_db_4_1+set}" = set; then @@ -29642,14 +30190,15 @@ echo "${ECHO_T}$ol_cv_db_db_4_1" >&6 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb3)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb3)... $ECHO_C" >&6 -if test "${ol_cv_db_db3+set}" = set; then + fi + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-4)... $ECHO_C" >&6 +if test "${ol_cv_db_db_4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb3 + ol_DB_LIB=-ldb-4 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -29730,12 +30279,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db3=yes + ol_cv_db_db_4=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db3=no +ol_cv_db_db_4=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -29743,22 +30292,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db3" >&5 -echo "${ECHO_T}$ol_cv_db_db3" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db_4" >&5 +echo "${ECHO_T}$ol_cv_db_db_4" >&6 - if test $ol_cv_db_db3 = yes ; then - ol_cv_lib_db=-ldb3 + if test $ol_cv_db_db_4 = yes ; then + ol_cv_lib_db=-ldb-4 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-3)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb-3)... $ECHO_C" >&6 -if test "${ol_cv_db_db_3+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb4)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb4)... $ECHO_C" >&6 +if test "${ol_cv_db_db4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb-3 + ol_DB_LIB=-ldb4 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -29839,12 +30388,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db_3=yes + ol_cv_db_db4=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_3=no +ol_cv_db_db4=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -29852,22 +30401,353 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db_3" >&5 -echo "${ECHO_T}$ol_cv_db_db_3" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db4" >&5 +echo "${ECHO_T}$ol_cv_db_db4" >&6 - if test $ol_cv_db_db_3 = yes ; then - ol_cv_lib_db=-ldb-3 + if test $ol_cv_db_db4 = yes ; then + ol_cv_lib_db=-ldb4 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb2)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb2)... $ECHO_C" >&6 -if test "${ol_cv_db_db2+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb)... $ECHO_C" >&6 +if test "${ol_cv_db_db+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb2 + ol_DB_LIB=-ldb + ol_LIBS=$LIBS + LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef HAVE_DB_185_H +# include +#else +# include +#endif + +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif + +#ifndef NULL +#define NULL ((void*)0) +#endif + +int +main () +{ + +#if DB_VERSION_MAJOR > 1 + { + char *version; + int major, minor, patch; + + version = db_version( &major, &minor, &patch ); + + if( major != DB_VERSION_MAJOR || + minor < DB_VERSION_MINOR ) + { + printf("Berkeley DB version mismatch\n" + "\theader: %s\n\tlibrary: %s\n", + DB_VERSION_STRING, version); + return 1; + } + } +#endif + +#if DB_VERSION_MAJOR > 2 + db_env_create( NULL, 0 ); +#elif DB_VERSION_MAJOR > 1 + db_appexit( NULL ); +#else + (void) dbopen( NULL, 0, 0, 0, NULL); +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ol_cv_db_db=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ol_cv_db_db=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + LIBS="$ol_LIBS" + +fi +echo "$as_me:$LINENO: result: $ol_cv_db_db" >&5 +echo "${ECHO_T}$ol_cv_db_db" >&6 + + if test $ol_cv_db_db = yes ; then + ol_cv_lib_db=-ldb + fi +fi + + +elif test $ol_cv_bdb_major = 3 ; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb3)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb3)... $ECHO_C" >&6 +if test "${ol_cv_db_db3+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ol_DB_LIB=-ldb3 + ol_LIBS=$LIBS + LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef HAVE_DB_185_H +# include +#else +# include +#endif + +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif + +#ifndef NULL +#define NULL ((void*)0) +#endif + +int +main () +{ + +#if DB_VERSION_MAJOR > 1 + { + char *version; + int major, minor, patch; + + version = db_version( &major, &minor, &patch ); + + if( major != DB_VERSION_MAJOR || + minor < DB_VERSION_MINOR ) + { + printf("Berkeley DB version mismatch\n" + "\theader: %s\n\tlibrary: %s\n", + DB_VERSION_STRING, version); + return 1; + } + } +#endif + +#if DB_VERSION_MAJOR > 2 + db_env_create( NULL, 0 ); +#elif DB_VERSION_MAJOR > 1 + db_appexit( NULL ); +#else + (void) dbopen( NULL, 0, 0, 0, NULL); +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ol_cv_db_db3=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ol_cv_db_db3=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + LIBS="$ol_LIBS" + +fi +echo "$as_me:$LINENO: result: $ol_cv_db_db3" >&5 +echo "${ECHO_T}$ol_cv_db_db3" >&6 + + if test $ol_cv_db_db3 = yes ; then + ol_cv_lib_db=-ldb3 + fi +fi + + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-3)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-3)... $ECHO_C" >&6 +if test "${ol_cv_db_db_3+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ol_DB_LIB=-ldb-3 + ol_LIBS=$LIBS + LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef HAVE_DB_185_H +# include +#else +# include +#endif + +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif + +#ifndef NULL +#define NULL ((void*)0) +#endif + +int +main () +{ + +#if DB_VERSION_MAJOR > 1 + { + char *version; + int major, minor, patch; + + version = db_version( &major, &minor, &patch ); + + if( major != DB_VERSION_MAJOR || + minor < DB_VERSION_MINOR ) + { + printf("Berkeley DB version mismatch\n" + "\theader: %s\n\tlibrary: %s\n", + DB_VERSION_STRING, version); + return 1; + } + } +#endif + +#if DB_VERSION_MAJOR > 2 + db_env_create( NULL, 0 ); +#elif DB_VERSION_MAJOR > 1 + db_appexit( NULL ); +#else + (void) dbopen( NULL, 0, 0, 0, NULL); +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ol_cv_db_db_3=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ol_cv_db_db_3=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + LIBS="$ol_LIBS" + +fi +echo "$as_me:$LINENO: result: $ol_cv_db_db_3" >&5 +echo "${ECHO_T}$ol_cv_db_db_3" >&6 + + if test $ol_cv_db_db_3 = yes ; then + ol_cv_lib_db=-ldb-3 + fi +fi + + +elif test $ol_cv_bdb_major = 2 ; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb2)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb2)... $ECHO_C" >&6 +if test "${ol_cv_db_db2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ol_DB_LIB=-ldb2 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -29969,7 +30849,7 @@ echo "${ECHO_T}$ol_cv_db_db2" >&6 fi fi -if test $ol_cv_lib_db = no ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-2)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb-2)... $ECHO_C" >&6 if test "${ol_cv_db_db_2+set}" = set; then @@ -30078,7 +30958,9 @@ echo "${ECHO_T}$ol_cv_db_db_2" >&6 fi fi -if test $ol_cv_lib_db = no ; then + +elif test $ol_cv_bdb_major = 1 ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb1)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb1)... $ECHO_C" >&6 if test "${ol_cv_db_db1+set}" = set; then @@ -30187,7 +31069,7 @@ echo "${ECHO_T}$ol_cv_db_db1" >&6 fi fi -if test $ol_cv_lib_db = no ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-1)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb-1)... $ECHO_C" >&6 if test "${ol_cv_db_db_1+set}" = set; then @@ -30275,12 +31157,763 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db_1=yes + ol_cv_db_db_1=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ol_cv_db_db_1=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + LIBS="$ol_LIBS" + +fi +echo "$as_me:$LINENO: result: $ol_cv_db_db_1" >&5 +echo "${ECHO_T}$ol_cv_db_db_1" >&6 + + if test $ol_cv_db_db_1 = yes ; then + ol_cv_lib_db=-ldb-1 + fi +fi + +fi +if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (default)" >&5 +echo $ECHO_N "checking for Berkeley DB link (default)... $ECHO_C" >&6 +if test "${ol_cv_db_none+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ol_DB_LIB= + ol_LIBS=$LIBS + LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef HAVE_DB_185_H +# include +#else +# include +#endif + +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif + +#ifndef NULL +#define NULL ((void*)0) +#endif + +int +main () +{ + +#if DB_VERSION_MAJOR > 1 + { + char *version; + int major, minor, patch; + + version = db_version( &major, &minor, &patch ); + + if( major != DB_VERSION_MAJOR || + minor < DB_VERSION_MINOR ) + { + printf("Berkeley DB version mismatch\n" + "\theader: %s\n\tlibrary: %s\n", + DB_VERSION_STRING, version); + return 1; + } + } +#endif + +#if DB_VERSION_MAJOR > 2 + db_env_create( NULL, 0 ); +#elif DB_VERSION_MAJOR > 1 + db_appexit( NULL ); +#else + (void) dbopen( NULL, 0, 0, 0, NULL); +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ol_cv_db_none=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ol_cv_db_none=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + LIBS="$ol_LIBS" + +fi +echo "$as_me:$LINENO: result: $ol_cv_db_none" >&5 +echo "${ECHO_T}$ol_cv_db_none" >&6 + + if test $ol_cv_db_none = yes ; then + ol_cv_lib_db=yes + fi +fi + + + if test "$ol_cv_lib_db" != no ; then + ol_cv_berkeley_db=yes + fi + fi +fi + + else + ol_cv_berkeley_db=no + +for ac_header in db.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +if test $ac_cv_header_db_h = yes; then + ol_cv_lib_db=no + +echo "$as_me:$LINENO: checking for Berkeley DB major version" >&5 +echo $ECHO_N "checking for Berkeley DB major version... $ECHO_C" >&6 +if test "${ol_cv_bdb_major+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ol_cv_bdb_major=0 + if test $ol_cv_bdb_major = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif +#if DB_VERSION_MAJOR == 4 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_major=4 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_major = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif +#if DB_VERSION_MAJOR == 3 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_major=3 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_major = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif +#if DB_VERSION_MAJOR == 2 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_major=2 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_major = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif +#if DB_VERSION_MAJOR == 1 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_major=1 +else + : +fi +rm -f conftest* + + fi + + if test $ol_cv_bdb_major = 0 ; then + { { echo "$as_me:$LINENO: error: Unknown Berkeley DB major version" >&5 +echo "$as_me: error: Unknown Berkeley DB major version" >&2;} + { (exit 1); exit 1; }; } + fi + +fi +echo "$as_me:$LINENO: result: $ol_cv_bdb_major" >&5 +echo "${ECHO_T}$ol_cv_bdb_major" >&6 + +echo "$as_me:$LINENO: checking for Berkeley DB minor version" >&5 +echo $ECHO_N "checking for Berkeley DB minor version... $ECHO_C" >&6 +if test "${ol_cv_bdb_minor+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ol_cv_bdb_minor=0 + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 9 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=9 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 8 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=8 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 7 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=7 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 6 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=6 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 5 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=5 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 4 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=4 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 3 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=3 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 2 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=2 +else + : +fi +rm -f conftest* + + fi + if test $ol_cv_bdb_minor = 0 ; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 1 +__db_version +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_minor=1 +else + : +fi +rm -f conftest* + + fi + +fi +echo "$as_me:$LINENO: result: $ol_cv_bdb_minor" >&5 +echo "${ECHO_T}$ol_cv_bdb_minor" >&6 + +if test $ol_cv_bdb_major = 4 ; then + if test $ol_cv_bdb_minor = 4 ; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb44)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb44)... $ECHO_C" >&6 +if test "${ol_cv_db_db44+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ol_DB_LIB=-ldb44 + ol_LIBS=$LIBS + LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef HAVE_DB_185_H +# include +#else +# include +#endif + +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif + +#ifndef NULL +#define NULL ((void*)0) +#endif + +int +main () +{ + +#if DB_VERSION_MAJOR > 1 + { + char *version; + int major, minor, patch; + + version = db_version( &major, &minor, &patch ); + + if( major != DB_VERSION_MAJOR || + minor < DB_VERSION_MINOR ) + { + printf("Berkeley DB version mismatch\n" + "\theader: %s\n\tlibrary: %s\n", + DB_VERSION_STRING, version); + return 1; + } + } +#endif + +#if DB_VERSION_MAJOR > 2 + db_env_create( NULL, 0 ); +#elif DB_VERSION_MAJOR > 1 + db_appexit( NULL ); +#else + (void) dbopen( NULL, 0, 0, 0, NULL); +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ol_cv_db_db44=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_1=no +ol_cv_db_db44=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -30288,51 +31921,83 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db_1" >&5 -echo "${ECHO_T}$ol_cv_db_db_1" >&6 - - if test $ol_cv_db_db_1 = yes ; then - ol_cv_lib_db=-ldb-1 - fi -fi +echo "$as_me:$LINENO: result: $ol_cv_db_db44" >&5 +echo "${ECHO_T}$ol_cv_db_db44" >&6 - - if test "$ol_cv_lib_db" != no ; then - ol_cv_berkeley_db=yes - fi + if test $ol_cv_db_db44 = yes ; then + ol_cv_lib_db=-ldb44 fi fi - else - ol_cv_berkeley_db=no - -for ac_header in db.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-44)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-44)... $ECHO_C" >&6 +if test "${ol_cv_db_db_44+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF + + ol_DB_LIB=-ldb-44 + ol_LIBS=$LIBS + LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> + +#ifdef HAVE_DB_185_H +# include +#else +# include +#endif + +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif + +#ifndef NULL +#define NULL ((void*)0) +#endif + +int +main () +{ + +#if DB_VERSION_MAJOR > 1 + { + char *version; + int major, minor, patch; + + version = db_version( &major, &minor, &patch ); + + if( major != DB_VERSION_MAJOR || + minor < DB_VERSION_MINOR ) + { + printf("Berkeley DB version mismatch\n" + "\theader: %s\n\tlibrary: %s\n", + DB_VERSION_STRING, version); + return 1; + } + } +#endif + +#if DB_VERSION_MAJOR > 2 + db_env_create( NULL, 0 ); +#elif DB_VERSION_MAJOR > 1 + db_appexit( NULL ); +#else + (void) dbopen( NULL, 0, 0, 0, NULL); +#endif + + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -30346,125 +32011,150 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ol_cv_db_db_44=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ol_cv_db_db_44=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF + LIBS="$ol_LIBS" + +fi +echo "$as_me:$LINENO: result: $ol_cv_db_db_44" >&5 +echo "${ECHO_T}$ol_cv_db_db_44" >&6 + + if test $ol_cv_db_db_44 = yes ; then + ol_cv_lib_db=-ldb-44 + fi +fi + + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.4)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-4.4)... $ECHO_C" >&6 +if test "${ol_cv_db_db_4_dot_4+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ol_DB_LIB=-ldb-4.4 + ol_LIBS=$LIBS + LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> + +#ifdef HAVE_DB_185_H +# include +#else +# include +#endif + +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif + +#ifndef NULL +#define NULL ((void*)0) +#endif + +int +main () +{ + +#if DB_VERSION_MAJOR > 1 + { + char *version; + int major, minor, patch; + + version = db_version( &major, &minor, &patch ); + + if( major != DB_VERSION_MAJOR || + minor < DB_VERSION_MINOR ) + { + printf("Berkeley DB version mismatch\n" + "\theader: %s\n\tlibrary: %s\n", + DB_VERSION_STRING, version); + return 1; + } + } +#endif + +#if DB_VERSION_MAJOR > 2 + db_env_create( NULL, 0 ); +#elif DB_VERSION_MAJOR > 1 + db_appexit( NULL ); +#else + (void) dbopen( NULL, 0, 0, 0, NULL); +#endif + + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ol_cv_db_db_4_dot_4=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no +ol_cv_db_db_4_dot_4=no fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + LIBS="$ol_LIBS" fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_4" >&5 +echo "${ECHO_T}$ol_cv_db_db_4_dot_4" >&6 + if test $ol_cv_db_db_4_dot_4 = yes ; then + ol_cv_lib_db=-ldb-4.4 + fi fi -done - -if test $ac_cv_header_db_h = yes; then - ol_cv_lib_db=no -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (default)" >&5 -echo $ECHO_N "checking for Berkeley DB link (default)... $ECHO_C" >&6 -if test "${ol_cv_db_none+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-4)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-4-4)... $ECHO_C" >&6 +if test "${ol_cv_db_db_4_4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB= + ol_DB_LIB=-ldb-4-4 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -30545,12 +32235,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_none=yes + ol_cv_db_db_4_4=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_none=no +ol_cv_db_db_4_4=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -30558,15 +32248,16 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_none" >&5 -echo "${ECHO_T}$ol_cv_db_none" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db_4_4" >&5 +echo "${ECHO_T}$ol_cv_db_db_4_4" >&6 - if test $ol_cv_db_none = yes ; then - ol_cv_lib_db=yes + if test $ol_cv_db_db_4_4 = yes ; then + ol_cv_lib_db=-ldb-4-4 fi fi -if test $ol_cv_lib_db = no ; then + elif test $ol_cv_bdb_minor = 3 ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb43)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb43)... $ECHO_C" >&6 if test "${ol_cv_db_db43+set}" = set; then @@ -30675,7 +32366,7 @@ echo "${ECHO_T}$ol_cv_db_db43" >&6 fi fi -if test $ol_cv_lib_db = no ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-43)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb-43)... $ECHO_C" >&6 if test "${ol_cv_db_db_43+set}" = set; then @@ -30784,7 +32475,7 @@ echo "${ECHO_T}$ol_cv_db_db_43" >&6 fi fi -if test $ol_cv_lib_db = no ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.3)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb-4.3)... $ECHO_C" >&6 if test "${ol_cv_db_db_4_dot_3+set}" = set; then @@ -30893,7 +32584,7 @@ echo "${ECHO_T}$ol_cv_db_db_4_dot_3" >&6 fi fi -if test $ol_cv_lib_db = no ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-3)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb-4-3)... $ECHO_C" >&6 if test "${ol_cv_db_db_4_3+set}" = set; then @@ -31002,7 +32693,8 @@ echo "${ECHO_T}$ol_cv_db_db_4_3" >&6 fi fi -if test $ol_cv_lib_db = no ; then + elif test $ol_cv_bdb_minor = 2 ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb42)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb42)... $ECHO_C" >&6 if test "${ol_cv_db_db42+set}" = set; then @@ -31111,7 +32803,7 @@ echo "${ECHO_T}$ol_cv_db_db42" >&6 fi fi -if test $ol_cv_lib_db = no ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-42)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb-42)... $ECHO_C" >&6 if test "${ol_cv_db_db_42+set}" = set; then @@ -31220,7 +32912,7 @@ echo "${ECHO_T}$ol_cv_db_db_42" >&6 fi fi -if test $ol_cv_lib_db = no ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.2)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb-4.2)... $ECHO_C" >&6 if test "${ol_cv_db_db_4_dot_2+set}" = set; then @@ -31329,7 +33021,7 @@ echo "${ECHO_T}$ol_cv_db_db_4_dot_2" >&6 fi fi -if test $ol_cv_lib_db = no ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-2)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb-4-2)... $ECHO_C" >&6 if test "${ol_cv_db_db_4_2+set}" = set; then @@ -31438,14 +33130,15 @@ echo "${ECHO_T}$ol_cv_db_db_4_2" >&6 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb-4)... $ECHO_C" >&6 -if test "${ol_cv_db_db_4+set}" = set; then + elif test $ol_cv_bdb_minor = 1 ; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb41)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb41)... $ECHO_C" >&6 +if test "${ol_cv_db_db41+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb-4 + ol_DB_LIB=-ldb41 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -31526,12 +33219,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db_4=yes + ol_cv_db_db41=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_4=no +ol_cv_db_db41=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -31539,22 +33232,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db_4" >&5 -echo "${ECHO_T}$ol_cv_db_db_4" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db41" >&5 +echo "${ECHO_T}$ol_cv_db_db41" >&6 - if test $ol_cv_db_db_4 = yes ; then - ol_cv_lib_db=-ldb-4 + if test $ol_cv_db_db41 = yes ; then + ol_cv_lib_db=-ldb41 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb4)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb4)... $ECHO_C" >&6 -if test "${ol_cv_db_db4+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-41)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-41)... $ECHO_C" >&6 +if test "${ol_cv_db_db_41+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb4 + ol_DB_LIB=-ldb-41 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -31635,12 +33328,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db4=yes + ol_cv_db_db_41=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db4=no +ol_cv_db_db_41=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -31648,22 +33341,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db4" >&5 -echo "${ECHO_T}$ol_cv_db_db4" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db_41" >&5 +echo "${ECHO_T}$ol_cv_db_db_41" >&6 - if test $ol_cv_db_db4 = yes ; then - ol_cv_lib_db=-ldb4 + if test $ol_cv_db_db_41 = yes ; then + ol_cv_lib_db=-ldb-41 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb)... $ECHO_C" >&6 -if test "${ol_cv_db_db+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.1)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-4.1)... $ECHO_C" >&6 +if test "${ol_cv_db_db_4_dot_1+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb + ol_DB_LIB=-ldb-4.1 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -31744,12 +33437,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db=yes + ol_cv_db_db_4_dot_1=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db=no +ol_cv_db_db_4_dot_1=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -31757,22 +33450,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db" >&5 -echo "${ECHO_T}$ol_cv_db_db" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_1" >&5 +echo "${ECHO_T}$ol_cv_db_db_4_dot_1" >&6 - if test $ol_cv_db_db = yes ; then - ol_cv_lib_db=-ldb + if test $ol_cv_db_db_4_dot_1 = yes ; then + ol_cv_lib_db=-ldb-4.1 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb41)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb41)... $ECHO_C" >&6 -if test "${ol_cv_db_db41+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-1)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-4-1)... $ECHO_C" >&6 +if test "${ol_cv_db_db_4_1+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb41 + ol_DB_LIB=-ldb-4-1 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -31853,12 +33546,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db41=yes + ol_cv_db_db_4_1=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db41=no +ol_cv_db_db_4_1=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -31866,22 +33559,23 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db41" >&5 -echo "${ECHO_T}$ol_cv_db_db41" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db_4_1" >&5 +echo "${ECHO_T}$ol_cv_db_db_4_1" >&6 - if test $ol_cv_db_db41 = yes ; then - ol_cv_lib_db=-ldb41 + if test $ol_cv_db_db_4_1 = yes ; then + ol_cv_lib_db=-ldb-4-1 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-41)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb-41)... $ECHO_C" >&6 -if test "${ol_cv_db_db_41+set}" = set; then + fi + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb-4)... $ECHO_C" >&6 +if test "${ol_cv_db_db_4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb-41 + ol_DB_LIB=-ldb-4 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -31962,12 +33656,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db_41=yes + ol_cv_db_db_4=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_41=no +ol_cv_db_db_4=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -31975,22 +33669,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db_41" >&5 -echo "${ECHO_T}$ol_cv_db_db_41" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db_4" >&5 +echo "${ECHO_T}$ol_cv_db_db_4" >&6 - if test $ol_cv_db_db_41 = yes ; then - ol_cv_lib_db=-ldb-41 + if test $ol_cv_db_db_4 = yes ; then + ol_cv_lib_db=-ldb-4 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.1)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb-4.1)... $ECHO_C" >&6 -if test "${ol_cv_db_db_4_dot_1+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb4)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb4)... $ECHO_C" >&6 +if test "${ol_cv_db_db4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb-4.1 + ol_DB_LIB=-ldb4 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -32071,12 +33765,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db_4_dot_1=yes + ol_cv_db_db4=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_4_dot_1=no +ol_cv_db_db4=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -32084,22 +33778,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_1" >&5 -echo "${ECHO_T}$ol_cv_db_db_4_dot_1" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db4" >&5 +echo "${ECHO_T}$ol_cv_db_db4" >&6 - if test $ol_cv_db_db_4_dot_1 = yes ; then - ol_cv_lib_db=-ldb-4.1 + if test $ol_cv_db_db4 = yes ; then + ol_cv_lib_db=-ldb4 fi fi -if test $ol_cv_lib_db = no ; then - echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-1)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb-4-1)... $ECHO_C" >&6 -if test "${ol_cv_db_db_4_1+set}" = set; then + if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb)" >&5 +echo $ECHO_N "checking for Berkeley DB link (-ldb)... $ECHO_C" >&6 +if test "${ol_cv_db_db+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb-4-1 + ol_DB_LIB=-ldb ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -32180,12 +33874,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_db_db_4_1=yes + ol_cv_db_db=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_4_1=no +ol_cv_db_db=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -32193,15 +33887,17 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db_4_1" >&5 -echo "${ECHO_T}$ol_cv_db_db_4_1" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db" >&5 +echo "${ECHO_T}$ol_cv_db_db" >&6 - if test $ol_cv_db_db_4_1 = yes ; then - ol_cv_lib_db=-ldb-4-1 + if test $ol_cv_db_db = yes ; then + ol_cv_lib_db=-ldb fi fi -if test $ol_cv_lib_db = no ; then + +elif test $ol_cv_bdb_major = 3 ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb3)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb3)... $ECHO_C" >&6 if test "${ol_cv_db_db3+set}" = set; then @@ -32310,7 +34006,7 @@ echo "${ECHO_T}$ol_cv_db_db3" >&6 fi fi -if test $ol_cv_lib_db = no ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-3)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb-3)... $ECHO_C" >&6 if test "${ol_cv_db_db_3+set}" = set; then @@ -32419,7 +34115,9 @@ echo "${ECHO_T}$ol_cv_db_db_3" >&6 fi fi -if test $ol_cv_lib_db = no ; then + +elif test $ol_cv_bdb_major = 2 ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb2)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb2)... $ECHO_C" >&6 if test "${ol_cv_db_db2+set}" = set; then @@ -32528,7 +34226,7 @@ echo "${ECHO_T}$ol_cv_db_db2" >&6 fi fi -if test $ol_cv_lib_db = no ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-2)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb-2)... $ECHO_C" >&6 if test "${ol_cv_db_db_2+set}" = set; then @@ -32637,7 +34335,9 @@ echo "${ECHO_T}$ol_cv_db_db_2" >&6 fi fi -if test $ol_cv_lib_db = no ; then + +elif test $ol_cv_bdb_major = 1 ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb1)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb1)... $ECHO_C" >&6 if test "${ol_cv_db_db1+set}" = set; then @@ -32746,7 +34446,7 @@ echo "${ECHO_T}$ol_cv_db_db1" >&6 fi fi -if test $ol_cv_lib_db = no ; then + if test $ol_cv_lib_db = no ; then echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-1)" >&5 echo $ECHO_N "checking for Berkeley DB link (-ldb-1)... $ECHO_C" >&6 if test "${ol_cv_db_db_1+set}" = set; then @@ -32855,6 +34555,116 @@ echo "${ECHO_T}$ol_cv_db_db_1" >&6 fi fi +fi +if test $ol_cv_lib_db = no ; then + echo "$as_me:$LINENO: checking for Berkeley DB link (default)" >&5 +echo $ECHO_N "checking for Berkeley DB link (default)... $ECHO_C" >&6 +if test "${ol_cv_db_none+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ol_DB_LIB= + ol_LIBS=$LIBS + LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef HAVE_DB_185_H +# include +#else +# include +#endif + +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif + +#ifndef NULL +#define NULL ((void*)0) +#endif + +int +main () +{ + +#if DB_VERSION_MAJOR > 1 + { + char *version; + int major, minor, patch; + + version = db_version( &major, &minor, &patch ); + + if( major != DB_VERSION_MAJOR || + minor < DB_VERSION_MINOR ) + { + printf("Berkeley DB version mismatch\n" + "\theader: %s\n\tlibrary: %s\n", + DB_VERSION_STRING, version); + return 1; + } + } +#endif + +#if DB_VERSION_MAJOR > 2 + db_env_create( NULL, 0 ); +#elif DB_VERSION_MAJOR > 1 + db_appexit( NULL ); +#else + (void) dbopen( NULL, 0, 0, 0, NULL); +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ol_cv_db_none=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ol_cv_db_none=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + LIBS="$ol_LIBS" + +fi +echo "$as_me:$LINENO: result: $ol_cv_db_none" >&5 +echo "${ECHO_T}$ol_cv_db_none" >&6 + + if test $ol_cv_db_none = yes ; then + ol_cv_lib_db=yes + fi +fi + if test "$ol_cv_lib_db" != no ; then ol_cv_berkeley_db=yes @@ -33104,9 +34914,10 @@ _ACEOF LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_db" fi fi -fi + ;; +esac -if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then +if test $ol_enable_bdb/$ol_enable_hdb != no/no; then if test $ol_link_ldbm != berkeley ; then { { echo "$as_me:$LINENO: error: BDB/HDB: BerkeleyDB not available" >&5 echo "$as_me: error: BDB/HDB: BerkeleyDB not available" >&2;} @@ -33162,13 +34973,13 @@ echo "$as_me: error: BDB/HDB: BerkeleyDB version incompatible" >&2;} fi fi -if test $ol_link_ldbm = no -a $ol_enable_ldbm_type = btree ; then +if test $ol_link_ldbm = no && test $ol_enable_ldbm_type = btree ; then { echo "$as_me:$LINENO: WARNING: Could not find LDBM with BTREE support" >&5 echo "$as_me: WARNING: Could not find LDBM with BTREE support" >&2;} ol_enable_ldbm_api=none fi -if test $ol_enable_ldbm_api = auto -o $ol_enable_ldbm_api = mdbm ; then +if test $ol_enable_ldbm_api = auto || test $ol_enable_ldbm_api = mdbm ; then echo "$as_me:$LINENO: checking for MDBM library" >&5 echo $ECHO_N "checking for MDBM library... $ECHO_C" >&6 if test "${ol_cv_lib_mdbm+set}" = set; then @@ -33471,9 +35282,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -33505,7 +35316,7 @@ if test "${ol_cv_mdbm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test $ol_cv_lib_mdbm = no -o $ac_cv_header_mdbm_h = no ; then + if test $ol_cv_lib_mdbm = no || test $ac_cv_header_mdbm_h = no ; then ol_cv_mdbm=no else ol_cv_mdbm=yes @@ -33532,7 +35343,7 @@ _ACEOF fi fi -if test $ol_enable_ldbm_api = auto -o $ol_enable_ldbm_api = gdbm ; then +if test $ol_enable_ldbm_api = auto || test $ol_enable_ldbm_api = gdbm ; then echo "$as_me:$LINENO: checking for GDBM library" >&5 echo $ECHO_N "checking for GDBM library... $ECHO_C" >&6 if test "${ol_cv_lib_gdbm+set}" = set; then @@ -33835,9 +35646,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -33869,7 +35680,7 @@ if test "${ol_cv_gdbm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test $ol_cv_lib_gdbm = no -o $ac_cv_header_gdbm_h = no ; then + if test $ol_cv_lib_gdbm = no || test $ac_cv_header_gdbm_h = no ; then ol_cv_gdbm=no else ol_cv_gdbm=yes @@ -34270,9 +36081,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -34304,7 +36115,7 @@ if test "${ol_cv_ndbm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test $ol_cv_lib_ndbm = no -o $ac_cv_header_ndbm_h = no ; then + if test $ol_cv_lib_ndbm = no || test $ac_cv_header_ndbm_h = no ; then ol_cv_ndbm=no else ol_cv_ndbm=yes @@ -34332,20 +36143,20 @@ _ACEOF fi fi -if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then +if test $ol_link_ldbm = no && test $ol_enable_ldbm != no ; then { { echo "$as_me:$LINENO: error: could not find suitable LDBM backend" >&5 echo "$as_me: error: could not find suitable LDBM backend" >&2;} { (exit 1); exit 1; }; } fi -if test $ol_enable_bdb = yes -o \ - $ol_enable_hdb = yes -o \ - $ol_enable_ldbm = yes ; then +if test $ol_enable_bdb = yes || + test $ol_enable_hdb = yes || + test $ol_enable_ldbm = yes ; then SLAPD_LIBS="$SLAPD_LIBS \$(LDBM_LIBS)" fi -if test $ol_enable_dynamic = yes -a $enable_shared = yes ; then +if test $ol_enable_dynamic = yes && test $enable_shared = yes ; then BUILD_LIBS_DYNAMIC=shared cat >>confdefs.h <<\_ACEOF @@ -34481,9 +36292,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -34745,7 +36556,7 @@ fi echo "$as_me:$LINENO: result: $ac_cv_func_openlog" >&5 echo "${ECHO_T}$ac_cv_func_openlog" >&6 - if test $ac_cv_func_openlog = no -a $ol_enable_syslog = yes; then + if test $ac_cv_func_openlog = no && test $ol_enable_syslog = yes; then { { echo "$as_me:$LINENO: error: could not find syslog" >&5 echo "$as_me: error: could not find syslog" >&2;} { (exit select appropriate options or disable); exit select appropriate options or disable; }; } @@ -34878,9 +36689,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -34967,115 +36778,349 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_iodbc_SQLDriverConnect=yes + ac_cv_lib_iodbc_SQLDriverConnect=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_iodbc_SQLDriverConnect=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_iodbc_SQLDriverConnect" >&5 +echo "${ECHO_T}$ac_cv_lib_iodbc_SQLDriverConnect" >&6 +if test $ac_cv_lib_iodbc_SQLDriverConnect = yes; then + have_iodbc=yes +else + have_iodbc=no +fi + + if test $have_iodbc = yes ; then + ol_link_sql="-liodbc" + else + echo "$as_me:$LINENO: checking for SQLDriverConnect in -lodbc" >&5 +echo $ECHO_N "checking for SQLDriverConnect in -lodbc... $ECHO_C" >&6 +if test "${ac_cv_lib_odbc_SQLDriverConnect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lodbc $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char SQLDriverConnect (); +int +main () +{ +SQLDriverConnect (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_odbc_SQLDriverConnect=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_odbc_SQLDriverConnect=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLDriverConnect" >&5 +echo "${ECHO_T}$ac_cv_lib_odbc_SQLDriverConnect" >&6 +if test $ac_cv_lib_odbc_SQLDriverConnect = yes; then + have_odbc=yes +else + have_odbc=no +fi + + if test $have_odbc = yes ; then + ol_link_sql="-lodbc" + fi + fi + + LIBS="$sql_LIBS" + + if test $ol_link_sql != no ; then + SLAPD_SQL_LIBS="$ol_link_sql" + + elif test $ol_enable_sql != auto ; then + { { echo "$as_me:$LINENO: error: could not locate suitable ODBC library" >&5 +echo "$as_me: error: could not locate suitable ODBC library" >&2;} + { (exit 1); exit 1; }; } + fi +fi + +ol_icu=no + +for ac_header in unicode/utypes.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +if test $ac_cv_header_unicode_utypes_h = yes ; then + OL_ICULIBS="-licuuc -licudata" + + echo "$as_me:$LINENO: checking for ICU libraries" >&5 +echo $ECHO_N "checking for ICU libraries... $ECHO_C" >&6 +if test "${ol_cv_lib_icu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ol_LIBS="$LIBS" + LIBS="$OL_ICULIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include + +int +main () +{ + +(void) u_errorName(0); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ol_cv_lib_icu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_iodbc_SQLDriverConnect=no +ol_cv_lib_icu=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_iodbc_SQLDriverConnect" >&5 -echo "${ECHO_T}$ac_cv_lib_iodbc_SQLDriverConnect" >&6 -if test $ac_cv_lib_iodbc_SQLDriverConnect = yes; then - have_iodbc=yes -else - have_iodbc=no -fi - - if test $have_iodbc = yes ; then - ol_link_sql="-liodbc" - else - echo "$as_me:$LINENO: checking for SQLDriverConnect in -lodbc" >&5 -echo $ECHO_N "checking for SQLDriverConnect in -lodbc... $ECHO_C" >&6 -if test "${ac_cv_lib_odbc_SQLDriverConnect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lodbc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char SQLDriverConnect (); -int -main () -{ -SQLDriverConnect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_odbc_SQLDriverConnect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + LIBS="$ol_LIBS" -ac_cv_lib_odbc_SQLDriverConnect=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLDriverConnect" >&5 -echo "${ECHO_T}$ac_cv_lib_odbc_SQLDriverConnect" >&6 -if test $ac_cv_lib_odbc_SQLDriverConnect = yes; then - have_odbc=yes -else - have_odbc=no -fi - - if test $have_odbc = yes ; then - ol_link_sql="-lodbc" - fi - fi +echo "$as_me:$LINENO: result: $ol_cv_lib_icu" >&5 +echo "${ECHO_T}$ol_cv_lib_icu" >&6 - LIBS="$sql_LIBS" + if test $ol_cv_lib_icu != no ; then + ol_icu="$OL_ICULIBS" - if test $ol_link_sql != no ; then - SLAPD_SQL_LIBS="$ol_link_sql" +cat >>confdefs.h <<\_ACEOF +#define HAVE_ICU 1 +_ACEOF - elif test $ol_enable_sql != auto ; then - { { echo "$as_me:$LINENO: error: could not locate suitable ODBC library" >&5 -echo "$as_me: error: could not locate suitable ODBC library" >&2;} - { (exit 1); exit 1; }; } fi fi +if test "$ol_icu" = no ; then + { echo "$as_me:$LINENO: WARNING: ICU not available" >&5 +echo "$as_me: WARNING: ICU not available" >&2;} +else + ICU_LIBS="$ol_icu" +fi WITH_SASL=no ol_link_sasl=no ol_link_spasswd=no @@ -35203,9 +37248,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -35232,7 +37277,8 @@ fi done - if test $ac_cv_header_sasl_sasl_h = yes -o $ac_cv_header_sasl_h = yes; then + if test $ac_cv_header_sasl_sasl_h = yes || + test $ac_cv_header_sasl_h = yes; then echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl2" >&5 echo $ECHO_N "checking for sasl_client_init in -lsasl2... $ECHO_C" >&6 if test "${ac_cv_lib_sasl2_sasl_client_init+set}" = set; then @@ -35559,7 +37605,7 @@ echo "$as_me: WARNING: Strong authentication not supported!" >&2;} fi fi -if test $cross_compiling != yes -a "$ac_cv_mingw32" != yes ; then +if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then dev=no if test -r /dev/urandom ; then dev="/dev/urandom"; @@ -36172,9 +38218,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -36415,9 +38461,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -36566,9 +38612,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -36716,9 +38762,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -36749,18 +38795,18 @@ done ol_have_bn_h=no ol_have_crypto_h=no - if test "$ac_cv_header_openssl_bn_h" = "yes" \ - -o "$ac_cv_header_bn_h" = "yes" ; then + if test "$ac_cv_header_openssl_bn_h" = "yes" || + test "$ac_cv_header_bn_h" = "yes" ; then ol_have_bn_h=yes fi - if test "$ac_cv_header_openssl_crypto_h" = "yes" \ - -o "$ac_cv_header_crypto_h" = "yes" ; then + if test "$ac_cv_header_openssl_crypto_h" = "yes" || + test "$ac_cv_header_crypto_h" = "yes" ; then ol_have_crypto_h=yes fi - if test "$ol_have_bn_h" = "yes" \ - -a "$ol_have_crypto_h" = "yes" ; then + if test "$ol_have_bn_h" = "yes" && + test "$ol_have_crypto_h" = "yes" ; then ol_have_bignum=yes fi fi @@ -41322,6 +43368,7 @@ fi + for ac_func in \ @@ -41343,9 +43390,11 @@ for ac_func in \ getspnam \ gettimeofday \ initgroups \ + inet_ntoa_b \ lockf \ memcpy \ memmove \ + memrchr \ mkstemp \ mktemp \ pipe \ @@ -41371,7 +43420,6 @@ for ac_func in \ strtoll \ strspn \ sysconf \ - usleep \ waitpid \ wait4 \ write \ @@ -41597,8 +43645,112 @@ done if test "$ac_cv_func_getopt" != yes; then LIBSRCS="$LIBSRCS getopt.c" fi + if test "$ac_cv_func_getpeereid" != yes; then - echo "$as_me:$LINENO: checking for struct msghdr.msg_accrightslen" >&5 + +for ac_func in getpeerucred +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + if test "$ac_cv_func_getpeerucred" != yes ; then + echo "$as_me:$LINENO: checking for struct msghdr.msg_accrightslen" >&5 echo $ECHO_N "checking for struct msghdr.msg_accrightslen... $ECHO_C" >&6 if test "${ac_cv_member_struct_msghdr_msg_accrightslen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -41716,8 +43868,8 @@ _ACEOF fi - if test "$ac_cv_member_struct_msghdr_msg_accrightslen" != yes; then - echo "$as_me:$LINENO: checking for struct msghdr.msg_control" >&5 + if test "$ac_cv_member_struct_msghdr_msg_accrightslen" != yes; then + echo "$as_me:$LINENO: checking for struct msghdr.msg_control" >&5 echo $ECHO_N "checking for struct msghdr.msg_control... $ECHO_C" >&6 if test "${ac_cv_member_struct_msghdr_msg_control+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -41835,10 +43987,13 @@ _ACEOF fi + fi fi LIBSRCS="$LIBSRCS getpeereid.c" fi -if test "$ac_cv_func_snprintf" != yes -o "$ac_cv_func_vsnprintf" != yes; then + +if test "$ac_cv_func_snprintf" != yes || + test "$ac_cv_func_vsnprintf" != yes; then if test "$ac_cv_func_snprintf" != yes; then cat >>confdefs.h <<\_ACEOF @@ -41979,9 +44134,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## --------------------------------------------- ## +## Report this to ## +## --------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -42103,6 +44258,13 @@ _ACEOF fi if test "$ol_enable_debug" != no ; then + if test "$ol_enable_debug" = traditional; then + +cat >>confdefs.h <<\_ACEOF +#define OLD_DEBUG 1 +_ACEOF + + fi cat >>confdefs.h <<\_ACEOF #define LDAP_DEBUG 1 @@ -42187,15 +44349,35 @@ _ACEOF fi if test "$ol_enable_aci" != no ; then + if test $ol_enable_dynacl = no ; then + ol_enable_dynacl=yes + { echo "$as_me:$LINENO: WARNING: ACIs need dynacl" >&5 +echo "$as_me: WARNING: ACIs need dynacl" >&2;} + fi + if test "$ol_enable_aci" = mod ; then + MFLAG=SLAPD_MOD_DYNAMIC + { { echo "$as_me:$LINENO: error: ACI build as dynamic module not supported (yet)" >&5 +echo "$as_me: error: ACI build as dynamic module not supported (yet)" >&2;} + { (exit 1); exit 1; }; } + else + MFLAG=SLAPD_MOD_STATIC + fi + WITH_ACI_ENABLED=$ol_enable_aci -cat >>confdefs.h <<\_ACEOF -#define SLAPD_ACI_ENABLED 1 +cat >>confdefs.h <<_ACEOF +#define SLAPD_ACI_ENABLED $MFLAG _ACEOF - WITH_ACI_ENABLED=yes else WITH_ACI_ENABLED=no fi +if test "$ol_enable_dynacl" != no ; then + +cat >>confdefs.h <<\_ACEOF +#define SLAP_DYNACL 1 +_ACEOF + +fi if test "$ol_link_modules" != no ; then @@ -42286,7 +44468,7 @@ _ACEOF fi -if test "$ol_link_ldbm" != no -a $ol_enable_ldbm != no; then +if test "$ol_link_ldbm" != no && test $ol_enable_ldbm != no; then BUILD_SLAPD=yes BUILD_LDBM=$ol_enable_ldbm if test "$ol_enable_ldbm" = mod ; then @@ -42460,6 +44642,22 @@ _ACEOF fi +if test "$ol_enable_dds" != no ; then + BUILD_DDS=$ol_enable_dds + if test "$ol_enable_dds" = mod ; then + MFLAG=SLAPD_MOD_DYNAMIC + SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS dds.la" + else + MFLAG=SLAPD_MOD_STATIC + SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS dds.o" + fi + +cat >>confdefs.h <<_ACEOF +#define SLAPD_OVER_DDS $MFLAG +_ACEOF + +fi + if test "$ol_enable_denyop" != no ; then BUILD_DENYOP=$ol_enable_denyop if test "$ol_enable_denyop" = mod ; then @@ -42669,8 +44867,9 @@ _ACEOF fi -if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \ - $BUILD_SLAPD = yes ; then +if test "$ol_enable_slurpd" != no && + test "$ol_link_threads" != no && + test $BUILD_SLAPD = yes ; then BUILD_SLURPD=yes fi @@ -42777,6 +44976,9 @@ fi + + + @@ -43286,7 +45488,10 @@ cat >>$CONFIG_STATUS <<_ACEOF # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS" +STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS" + _ACEOF @@ -43508,6 +45713,7 @@ s,@WITH_SASL@,$WITH_SASL,;t t s,@WITH_TLS@,$WITH_TLS,;t t s,@WITH_MODULES_ENABLED@,$WITH_MODULES_ENABLED,;t t s,@WITH_ACI_ENABLED@,$WITH_ACI_ENABLED,;t t +s,@BUILD_THREAD@,$BUILD_THREAD,;t t s,@BUILD_LIBS_DYNAMIC@,$BUILD_LIBS_DYNAMIC,;t t s,@BUILD_SLAPD@,$BUILD_SLAPD,;t t s,@BUILD_SLAPI@,$BUILD_SLAPI,;t t @@ -43526,6 +45732,7 @@ s,@BUILD_PERL@,$BUILD_PERL,;t t s,@BUILD_SHELL@,$BUILD_SHELL,;t t s,@BUILD_SQL@,$BUILD_SQL,;t t s,@BUILD_ACCESSLOG@,$BUILD_ACCESSLOG,;t t +s,@BUILD_DDS@,$BUILD_DDS,;t t s,@BUILD_DENYOP@,$BUILD_DENYOP,;t t s,@BUILD_DYNGROUP@,$BUILD_DYNGROUP,;t t s,@BUILD_DYNLIST@,$BUILD_DYNLIST,;t t @@ -43566,6 +45773,7 @@ s,@SLAPI_LIBS@,$SLAPI_LIBS,;t t s,@LIBSLAPI@,$LIBSLAPI,;t t s,@LIBSLAPITOOLS@,$LIBSLAPITOOLS,;t t s,@AUTH_LIBS@,$AUTH_LIBS,;t t +s,@ICU_LIBS@,$ICU_LIBS,;t t s,@SLAPD_SLP_LIBS@,$SLAPD_SLP_LIBS,;t t s,@SLAPD_GMP_LIBS@,$SLAPD_GMP_LIBS,;t t s,@SLAPD_SQL_LDFLAGS@,$SLAPD_SQL_LDFLAGS,;t t @@ -44263,7 +46471,7 @@ rm -f $BACKENDSC cat > $BACKENDSC << ENDX /* This work is part of OpenLDAP Software . * - * Copyright 1998-2005 The OpenLDAP Foundation. + * Copyright 1998-2006 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44308,6 +46516,59 @@ ENDX /* end of generated file */ ENDX fi +OVERLAYSC="servers/slapd/overlays/statover.c" +echo "Making $OVERLAYSC" +rm -f $OVERLAYSC +cat > $OVERLAYSC << ENDX +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2006 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 in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ +/* This file is automatically generated by configure; please do not edit. */ + +#include "portable.h" +#include "slap.h" + +ENDX +if test "${STATIC_OVERLAYS}"; then + for o in ${STATIC_OVERLAYS}; do + oo=`echo "${o}" | sed -e 's/.o$//' -e 's/_x$//'` + cat >> $OVERLAYSC << ENDX +extern OV_init ${oo}_initialize; +ENDX + done +fi + +cat >> $OVERLAYSC << ENDX + +OverlayInit slap_oinfo[] = { +ENDX + +if test "${STATIC_OVERLAYS}"; then + for o in ${STATIC_OVERLAYS}; do + oo=`echo "${o}" | sed -e 's/.o$//' -e 's/_x$//'` + echo " Add ${oo} ..." + cat >> $OVERLAYSC << ENDX + { "${oo}", ${oo}_initialize }, +ENDX + done +fi + + cat >> $OVERLAYSC << ENDX + { NULL, NULL }, +}; + +/* end of generated file */ +ENDX echo Please run \"make depend\" to build dependencies ;;