X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure;h=368ed224816fb2a579aaa000018822a0331f9295;hb=d7ad32ec4f6d9f1a9f58cfa117956f9ba9c9226c;hp=6477498478552b23a86d443337ec252ec346ec03;hpb=5a9a32e0d70655046ead0db6a07895db81f16d6d;p=openldap diff --git a/configure b/configure index 6477498478..368ed22481 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.636 2006/09/05 23:54:54 ando 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_META BUILD_MONITOR BUILD_NULL BUILD_PASSWD BUILD_RELAY BUILD_PERL BUILD_SHELL BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_CONSTRAINT BUILD_DDS BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SEQMOD BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT BUILD_SLURPD LDAP_LIBS SLAPD_LIBS SLURPD_LIBS BDB_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] @@ -1033,9 +1034,6 @@ SLAPD Backend Options: --enable-dnssrv enable dnssrv backend no|yes|mod [no] --enable-hdb enable Hierarchical DB backend no|yes|mod [yes] --enable-ldap enable ldap backend no|yes|mod [no] - --enable-ldbm enable ldbm backend no|yes|mod [no] - --enable-ldbm-api use LDBM API auto|berkeley|bcompat|mdbm|gdbm [auto] - --enable-ldbm-type use LDBM type auto|btree|hash [auto] --enable-meta enable metadirectory backend no|yes|mod [no] --enable-monitor enable monitor backend no|yes|mod [yes] --enable-null enable null backend no|yes|mod [no] @@ -1048,6 +1046,9 @@ 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-auditlog Audit Logging overlay no|yes|mod [no] + --enable-constraint Attribute Constraint 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] @@ -1057,6 +1058,7 @@ SLAPD Overlay Options: --enable-refint Referential Integrity overlay no|yes|mod [no] --enable-retcode Return Code testing overlay no|yes|mod [no] --enable-rwm Rewrite/Remap overlay no|yes|mod [no] + --enable-seqmod Sequential Modify overlay no|yes|mod [yes] --enable-syncprov Syncrepl Provider overlay no|yes|mod [yes] --enable-translucent Translucent Proxy overlay no|yes|mod [no] --enable-unique Attribute Uniqueness overlay no|yes|mod [no] @@ -1085,10 +1087,7 @@ Optional Packages: --with-threads with threads [auto] --with-tls with TLS/SSL support [auto] --with-yielding-select with implicitly yielding select [auto] - --with-multiple-precision - multiple precision support for statistics - auto|bignum|gmp [auto] - + --with-mp with multiple precision statistics auto|longlong|long|bignum|gmp [auto] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] @@ -1209,7 +1208,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 +1549,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + @@ -1585,7 +1586,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 +2176,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 +2387,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 @@ -2425,28 +2426,28 @@ else ol_with_yielding_select="auto" fi; # end --with-yielding_select -# OpenLDAP --with-multiple_precision +# OpenLDAP --with-mp -# Check whether --with-multiple_precision or --without-multiple_precision was given. -if test "${with_multiple_precision+set}" = set; then - withval="$with_multiple_precision" +# Check whether --with-mp or --without-mp was given. +if test "${with_mp+set}" = set; then + withval="$with_mp" ol_arg=invalid - for ol_val in auto bignum gmp yes no ; do + for ol_val in auto longlong long bignum gmp yes no ; do if test "$withval" = "$ol_val" ; then ol_arg="$ol_val" fi done if test "$ol_arg" = "invalid" ; then - { { echo "$as_me:$LINENO: error: bad value $withval for --with-multiple_precision" >&5 -echo "$as_me: error: bad value $withval for --with-multiple_precision" >&2;} + { { echo "$as_me:$LINENO: error: bad value $withval for --with-mp" >&5 +echo "$as_me: error: bad value $withval for --with-mp" >&2;} { (exit 1); exit 1; }; } fi - ol_with_multiple_precision="$ol_arg" + ol_with_mp="$ol_arg" else - ol_with_multiple_precision="auto" -fi; # end --with-multiple_precision + ol_with_mp="auto" +fi; # end --with-mp @@ -2478,6 +2479,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 +2509,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 @@ -2616,7 +2640,6 @@ else ol_enable_modules=no fi; # end --enable-modules -ol_enable_multimaster=${ol_enable_multimaster-no} # OpenLDAP --enable-rewrite # Check whether --enable-rewrite or --disable-rewrite was given. @@ -2737,7 +2760,6 @@ Backends="bdb \ dnssrv \ hdb \ ldap \ - ldbm \ meta \ monitor \ null \ @@ -2866,95 +2888,6 @@ else ol_enable_ldap=${ol_enable_backends:-no} fi; # end --enable-ldap -# OpenLDAP --enable-ldbm - - # Check whether --enable-ldbm or --disable-ldbm was given. -if test "${enable_ldbm+set}" = set; then - enableval="$enable_ldbm" - - 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-ldbm" >&5 -echo "$as_me: error: bad value $enableval for --enable-ldbm" >&2;} - { (exit 1); exit 1; }; } - fi - ol_enable_ldbm="$ol_arg" - -else - ol_enable_ldbm=${ol_enable_backends:-no} -fi; -# end --enable-ldbm - -# Check whether --with-ldbm_api or --without-ldbm_api was given. -if test "${with_ldbm_api+set}" = set; then - withval="$with_ldbm_api" - - { echo "$as_me:$LINENO: WARNING: Please use --enable-ldbm-api instead of --with-ldbm-api" >&5 -echo "$as_me: WARNING: Please use --enable-ldbm-api instead of --with-ldbm-api" >&2;} - enable_ldbm_api="$with_ldbm_api" -fi; -# OpenLDAP --enable-ldbm_api - - # Check whether --enable-ldbm_api or --disable-ldbm_api was given. -if test "${enable_ldbm_api+set}" = set; then - enableval="$enable_ldbm_api" - - ol_arg=invalid - for ol_val in auto berkeley bcompat mdbm gdbm ; 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-ldbm_api" >&5 -echo "$as_me: error: bad value $enableval for --enable-ldbm_api" >&2;} - { (exit 1); exit 1; }; } - fi - ol_enable_ldbm_api="$ol_arg" - -else - ol_enable_ldbm_api=auto -fi; -# end --enable-ldbm_api - - -# Check whether --with-ldbm_type or --without-ldbm_type was given. -if test "${with_ldbm_type+set}" = set; then - withval="$with_ldbm_type" - - { echo "$as_me:$LINENO: WARNING: Please use --enable-ldbm-type instead of --with-ldbm-type" >&5 -echo "$as_me: WARNING: Please use --enable-ldbm-type instead of --with-ldbm-type" >&2;} - enable_ldbm_type="$with_ldbm_type" -fi; -# OpenLDAP --enable-ldbm_type - - # Check whether --enable-ldbm_type or --disable-ldbm_type was given. -if test "${enable_ldbm_type+set}" = set; then - enableval="$enable_ldbm_type" - - ol_arg=invalid - for ol_val in auto btree hash ; 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-ldbm_type" >&5 -echo "$as_me: error: bad value $enableval for --enable-ldbm_type" >&2;} - { (exit 1); exit 1; }; } - fi - ol_enable_ldbm_type="$ol_arg" - -else - ol_enable_ldbm_type=auto -fi; -# end --enable-ldbm_type - # OpenLDAP --enable-meta # Check whether --enable-meta or --disable-meta was given. @@ -3141,6 +3074,9 @@ fi; # end --enable-sql Overlays="accesslog \ + auditlog \ + constraint \ + dds \ denyop \ dyngroup \ dynlist \ @@ -3150,6 +3086,7 @@ Overlays="accesslog \ refint \ retcode \ rwm \ + seqmod \ syncprov \ translucent \ unique \ @@ -3206,6 +3143,78 @@ else fi; # end --enable-accesslog +# OpenLDAP --enable-auditlog + + # Check whether --enable-auditlog or --disable-auditlog was given. +if test "${enable_auditlog+set}" = set; then + enableval="$enable_auditlog" + + 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-auditlog" >&5 +echo "$as_me: error: bad value $enableval for --enable-auditlog" >&2;} + { (exit 1); exit 1; }; } + fi + ol_enable_auditlog="$ol_arg" + +else + ol_enable_auditlog=${ol_enable_overlays:-no} +fi; +# end --enable-auditlog + +# OpenLDAP --enable-constraint + + # Check whether --enable-constraint or --disable-constraint was given. +if test "${enable_constraint+set}" = set; then + enableval="$enable_constraint" + + 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-constraint" >&5 +echo "$as_me: error: bad value $enableval for --enable-constraint" >&2;} + { (exit 1); exit 1; }; } + fi + ol_enable_constraint="$ol_arg" + +else + ol_enable_constraint=${ol_enable_overlays:-no} +fi; +# end --enable-constraint + +# 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. @@ -3422,6 +3431,30 @@ else fi; # end --enable-rwm +# OpenLDAP --enable-seqmod + + # Check whether --enable-seqmod or --disable-seqmod was given. +if test "${enable_seqmod+set}" = set; then + enableval="$enable_seqmod" + + 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-seqmod" >&5 +echo "$as_me: error: bad value $enableval for --enable-seqmod" >&2;} + { (exit 1); exit 1; }; } + fi + ol_enable_seqmod="$ol_arg" + +else + ol_enable_seqmod=${ol_enable_overlays:-yes} +fi; +# end --enable-seqmod + # OpenLDAP --enable-syncprov # Check whether --enable-syncprov or --disable-syncprov was given. @@ -3624,10 +3657,6 @@ echo "$as_me: WARNING: slapd disabled, ignoring --enable-$i argument" >&2;} if test $ol_enable_modules = yes ; then { echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-modules argument" >&5 echo "$as_me: WARNING: slapd disabled, ignoring --enable-modules argument" >&2;} - fi - if test $ol_enable_multimaster = yes ; then - { echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-multimaster argument" >&5 -echo "$as_me: WARNING: slapd disabled, ignoring --enable-multimaster argument" >&2;} fi if test $ol_enable_wrappers = yes ; then { echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-wrappers argument" >&5 @@ -3637,17 +3666,13 @@ 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 - if test $ol_enable_ldbm_api != auto ; then - { echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-ldbm-api argument" >&5 -echo "$as_me: WARNING: slapd disabled, ignoring --enable-ldbm-api argument" >&2;} - fi - if test $ol_enable_ldbm_type != auto ; then - { echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-ldbm-type argument" >&5 -echo "$as_me: WARNING: slapd disabled, ignoring --enable-ldbm-type argument" >&2;} fi if test $ol_enable_slurpd = yes ; then { { echo "$as_me:$LINENO: error: slurpd requires slapd" >&5 @@ -3677,94 +3702,41 @@ echo "$as_me: WARNING: slapd disabled, ignoring --enable-$i argument" >&2;} ol_enable_backends= ol_enable_overlays= ol_enable_modules=no - ol_enable_multimaster=no ol_enable_rlookups=no + ol_enable_dynacl=no ol_enable_aci=no ol_enable_wrappers=no - ol_enable_ldbm_api=no - ol_enable_ldbm_type=no - ol_enable_slurpd=no ol_enable_rewrite=no -elif test $ol_enable_ldbm = no ; then - - if test $ol_enable_ldbm_api != auto ; then - { echo "$as_me:$LINENO: WARNING: LDBM disabled, ignoring --enable-ldbm-api argument" >&5 -echo "$as_me: WARNING: LDBM disabled, ignoring --enable-ldbm-api argument" >&2;} - fi - - if test $ol_enable_ldbm_type != auto ; then - { echo "$as_me:$LINENO: WARNING: LDBM disabled, ignoring --enable-ldbm-type argument" >&5 -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_slapd = yes ; then - { { echo "$as_me:$LINENO: error: slapd requires a backend" >&5 +elif 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 echo "$as_me: error: slapd requires a backend" >&2;} { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: WARNING: skipping slapd, no backend specified" >&5 + else + { echo "$as_me:$LINENO: WARNING: skipping slapd, no backend specified" >&5 echo "$as_me: WARNING: skipping slapd, no backend specified" >&2;} - ol_enable_slapd=no - fi - fi - - ol_enable_ldbm_api=no - ol_enable_ldbm_type=no - - if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then - ol_enable_ldbm_api=berkeley - fi - -else - if test $ol_enable_ldbm_api = gdbm -a \ - $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 - { { 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 - { { 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_ldbm_api = auto ; then - ol_enable_ldbm_api=berkeley - elif test $ol_enable_ldbm_api != berkeley ; then - { { echo "$as_me:$LINENO: error: LDBM API not compatible with BDB/HDB" >&5 -echo "$as_me: error: LDBM API not compatible with BDB/HDB" >&2;} - { (exit 1); exit 1; }; } - fi + ol_enable_slapd=no 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; }; } @@ -3818,7 +3790,7 @@ echo "$as_me:$LINENO: result: done" >&5 echo "${ECHO_T}done" >&6 LDAP_LIBS= -LDBM_LIBS= +BDB_LIBS= LTHREAD_LIBS= LUTIL_LIBS= @@ -3837,7 +3809,6 @@ BUILD_BDB=no BUILD_DNSSRV=no BUILD_HDB=no BUILD_LDAP=no -BUILD_LDBM=no BUILD_META=no BUILD_MONITOR=no BUILD_NULL=no @@ -3848,6 +3819,9 @@ BUILD_SHELL=no BUILD_SQL=no BUILD_ACCESSLOG=no +BUILD_AUDITLOG=no +BUILD_CONSTRAINT=no +BUILD_DDS=no BUILD_DENYOP=no BUILD_DYNGROUP=no BUILD_DYNLIST=no @@ -3857,6 +3831,7 @@ BUILD_PROXYCACHE=no BUILD_REFINT=no BUILD_RETCODE=no BUILD_RWM=no +BUILD_SEQMOD=no BUILD_SYNCPROV=no BUILD_TRANSLUCENT=no BUILD_UNIQUE=no @@ -3888,6 +3863,7 @@ SLAPI_LIBS= LIBSLAPI= LIBSLAPITOOLS= AUTH_LIBS= +ICU_LIBS= SLAPD_SLP_LIBS= SLAPD_GMP_LIBS= @@ -3967,10 +3943,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 +5312,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 5665 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5728,7 +5705,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 +6661,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 +6741,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 +7056,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 +7377,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 +7439,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 +7588,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 +7639,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:7645: $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:7649: \$? = $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 +7729,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 +7776,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 +7806,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 +7901,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:7907: $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:7911: \$? = $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 +7935,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 +7963,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:7969: $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:7973: \$? = $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 +7981,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 +8181,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 +8493,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 +8533,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 +8562,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 +8571,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 +8637,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 +8646,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 +8656,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 +9115,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 +9169,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 +9207,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 +9259,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 +10214,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 +10312,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 +10428,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 +12784,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 +13028,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 @@ -13901,18 +13886,15 @@ 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 +13907,6 @@ for ac_header in \ libutil.h \ limits.h \ locale.h \ - netinet/tcp.h \ malloc.h \ memory.h \ psap.h \ @@ -13942,11 +13923,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 \ @@ -13954,8 +13935,6 @@ for ac_header in \ termios.h \ unistd.h \ utime.h \ - winsock.h \ - winsock2.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -14077,9 +14056,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 @@ -14106,25 +14085,31 @@ fi done +if test "$ac_cv_mingw32" = yes ; then + -for ac_header in resolv.h +for ac_header in winsock.h winsock2.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 +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 - cat >conftest.$ac_ext <<_ACEOF + # 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 - - #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -14149,17 +14134,100 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" +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 @@ -14169,9 +14237,10 @@ fi done +fi -for ac_header in sys/ucred.h +for ac_header in resolv.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -14186,9 +14255,137 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#ifdef HAVE_SYS_PARAM_H -#include -#endif +#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 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` +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 +#ifdef HAVE_SYS_PARAM_H +#include +#endif #include <$ac_header> @@ -14418,7 +14615,7 @@ fi fi -if test "$ac_cv_cygwin" != yes && test "$ac_cv_header_winsock_h" = yes; then +if test "$ac_cv_header_winsock_h" = yes; then echo "$as_me:$LINENO: checking for winsock" >&5 echo $ECHO_N "checking for winsock... $ECHO_C" >&6 if test "${ol_cv_winsock+set}" = set; then @@ -15243,9 +15440,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 +15786,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 +15937,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 @@ -15769,9 +15966,9 @@ fi done if test "${ac_cv_header_sys_epoll_h}" = yes; then -echo "$as_me:$LINENO: checking for epoll system call" >&5 + echo "$as_me:$LINENO: checking for epoll system call" >&5 echo $ECHO_N "checking for epoll system call... $ECHO_C" >&6 -if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 else @@ -15781,7 +15978,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -int main(int argc, char *argv) +int main(int argc, char **argv) { int epfd = epoll_create(256); exit (epfd == -1 ? 1 : 0); @@ -15818,6 +16015,208 @@ rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftes fi fi + +for ac_header in sys/devpoll.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_sys_devpoll_h}" = yes \ + -a "${ac_cv_header_poll_h}" = yes ; \ +then + echo "$as_me:$LINENO: checking for /dev/poll" >&5 +echo $ECHO_N "checking for /dev/poll... $ECHO_C" >&6 + if test "$cross_compiling" = yes; then + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int main(int argc, char **argv) +{ + int devpollfd = open("/dev/poll", /* O_RDWR */ 2); + exit (devpollfd == -1 ? 1 : 0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./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 + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_DEVPOLL 1 +_ACEOF + +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi + # strerror checks echo "$as_me:$LINENO: checking declaration of sys_errlist" >&5 echo $ECHO_N "checking declaration of sys_errlist... $ECHO_C" >&6 @@ -15835,7 +16234,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include #include -#ifdef WINNT +#ifdef _WIN32 #include #endif int @@ -16200,7 +16599,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include #include -#ifdef WINNT +#ifdef _WIN32 #include #endif int @@ -16443,9 +16842,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 +17202,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 +17786,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 +18006,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 +18105,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 +18244,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 +18286,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 +18410,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 +18562,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 +18892,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 +19023,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 +19291,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 +19417,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 +19533,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,25 +19545,28 @@ 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; }; } fi -ol_link_tls=no -if test $ol_with_tls != no ; then +if test $ol_with_tls = yes ; then + ol_with_tls=auto +fi +ol_link_tls=no +if test $ol_with_tls = openssl || test $ol_with_tls = auto ; 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 +19687,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 +19716,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 +19782,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 +19855,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 - ol_with_tls=found + if test $have_openssl = yes ; then + ol_with_tls=openssl ol_link_tls=yes cat >>confdefs.h <<\_ACEOF -#define HAVE_SSLEAY 1 +#define HAVE_OPENSSL 1 _ACEOF @@ -19556,14 +19884,14 @@ _ACEOF else TLS_LIBS="-lssl -lcrypto" fi - fi - echo "$as_me:$LINENO: checking OpenSSL library version (CRL checking capability)" >&5 + + echo "$as_me:$LINENO: checking OpenSSL library version (CRL checking capability)" >&5 echo $ECHO_N "checking OpenSSL library version (CRL checking capability)... $ECHO_C" >&6 if test "${ol_cv_ssl_crl_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19572,8 +19900,6 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_OPENSSL_SSL_H #include -#else -#include #endif /* Require 0.9.7d+ */ @@ -19594,20 +19920,15 @@ fi echo "$as_me:$LINENO: result: $ol_cv_ssl_crl_compat" >&5 echo "${ECHO_T}$ol_cv_ssl_crl_compat" >&6 - if test $ol_cv_ssl_crl_compat = no ; then - ol_link_ssl=no - else + if test $ol_cv_ssl_crl_compat = yes ; then cat >>confdefs.h <<\_ACEOF #define HAVE_OPENSSL_CRL 1 _ACEOF + fi fi fi - -else - { echo "$as_me:$LINENO: WARNING: TLS data protection not supported!" >&5 -echo "$as_me: WARNING: TLS data protection not supported!" >&2;} fi WITH_TLS=no @@ -19618,17 +19939,18 @@ cat >>confdefs.h <<\_ACEOF _ACEOF WITH_TLS=yes - elif test $ol_with_tls = auto ; then { echo "$as_me:$LINENO: WARNING: Could not locate TLS/SSL package" >&5 echo "$as_me: WARNING: Could not locate TLS/SSL package" >&2;} { echo "$as_me:$LINENO: WARNING: TLS data protection not supported!" >&5 echo "$as_me: WARNING: TLS data protection not supported!" >&2;} - elif test $ol_with_tls != no ; then { { echo "$as_me:$LINENO: error: Could not locate TLS/SSL package" >&5 echo "$as_me: error: Could not locate TLS/SSL package" >&2;} { (exit 1); exit 1; }; } +else + { echo "$as_me:$LINENO: WARNING: TLS data protection not supported!" >&5 +echo "$as_me: WARNING: TLS data protection not supported!" >&2;} fi if test $ol_enable_lmpasswd != no; then @@ -19647,8 +19969,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 +20096,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 +20223,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 +20594,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 +24492,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 +24572,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 +24990,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 +25127,16 @@ 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 + + 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 +25281,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 +25409,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 +25734,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 +25861,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 +25977,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 +26105,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 +26133,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 +26450,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 +26564,8 @@ _ACEOF fi fi fi -fi + ;; +esac if test $ol_with_yielding_select = yes ; then @@ -26371,9 +26704,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 +26992,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 +27142,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 +27293,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 +27323,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 +27467,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 +27494,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 +27715,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 +27856,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 +28003,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 @@ -27696,16 +28032,12 @@ else ol_cv_func_gethostbyaddr_r_nargs=0 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 - - if test $ol_enable_ldbm_api = bcompat; then \ +ol_link_bdb=no +if test $ol_enable_bdb/$ol_enable_hdb != no/no; then + ol_cv_berkeley_db=no -for ac_header in db_185.h db.h +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 @@ -27826,9 +28158,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,13 +28186,17 @@ fi done -if test $ac_cv_header_db_185_h = yes -o $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 +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 @@ -27868,44 +28204,369 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#if HAVE_DB_185_H -# include -#else -# include +#include +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif +#if DB_VERSION_MAJOR == 4 +__db_version #endif - /* this check could be improved */ +_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_1 +__db_version #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "__db_version_1" >/dev/null 2>&1; then - ol_cv_header_db1=yes + $EGREP "__db_version" >/dev/null 2>&1; then + ol_cv_bdb_major=1 else - ol_cv_header_db1=no + : 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_header_db1" >&5 -echo "${ECHO_T}$ol_cv_header_db1" >&6 +echo "$as_me:$LINENO: result: $ol_cv_bdb_major" >&5 +echo "${ECHO_T}$ol_cv_bdb_major" >&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 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_DB_LIB= + 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 +28647,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 +28660,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 +28756,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 +28769,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 +28865,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 +28878,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 +28974,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 +28987,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 +29084,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 +29097,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 +29193,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 +29206,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 +29302,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 +29315,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 +29411,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 +29424,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 +29521,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 +29534,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 +29630,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 +29643,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 +29739,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 +29752,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 +29848,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 +29861,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 +29979,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 +30088,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 +30197,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 +30306,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 +30395,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 +30408,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 +30504,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 +30517,22 @@ 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" @@ -29948,12 +30613,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_db2=yes + ol_cv_db_db=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db2=no +ol_cv_db_db=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -29961,22 +30626,24 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db2" >&5 -echo "${ECHO_T}$ol_cv_db_db2" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db" >&5 +echo "${ECHO_T}$ol_cv_db_db" >&6 - if test $ol_cv_db_db2 = yes ; then - ol_cv_lib_db=-ldb2 + if test $ol_cv_db_db = yes ; then + ol_cv_lib_db=-ldb fi fi -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 + +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=-ldb-2 + ol_DB_LIB=-ldb3 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -30057,12 +30724,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_2=yes + ol_cv_db_db3=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_2=no +ol_cv_db_db3=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -30070,22 +30737,22 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db_2" >&5 -echo "${ECHO_T}$ol_cv_db_db_2" >&6 +echo "$as_me:$LINENO: result: $ol_cv_db_db3" >&5 +echo "${ECHO_T}$ol_cv_db_db3" >&6 - if test $ol_cv_db_db_2 = yes ; then - ol_cv_lib_db=-ldb-2 + 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 (-ldb1)" >&5 -echo $ECHO_N "checking for Berkeley DB link (-ldb1)... $ECHO_C" >&6 -if test "${ol_cv_db_db1+set}" = set; 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 echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb1 + ol_DB_LIB=-ldb-3 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -30166,12 +30833,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_db1=yes + ol_cv_db_db_3=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db1=no +ol_cv_db_db_3=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -30179,22 +30846,24 @@ rm -f conftest.err conftest.$ac_objext \ LIBS="$ol_LIBS" fi -echo "$as_me:$LINENO: result: $ol_cv_db_db1" >&5 -echo "${ECHO_T}$ol_cv_db_db1" >&6 +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_db1 = yes ; then - ol_cv_lib_db=-ldb1 + if test $ol_cv_db_db_3 = yes ; then + ol_cv_lib_db=-ldb-3 fi fi -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 + +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=-ldb-1 + ol_DB_LIB=-ldb2 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -30275,12 +30944,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_1=yes + ol_cv_db_db2=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_1=no +ol_cv_db_db2=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -30288,183 +30957,22 @@ 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_db2" >&5 +echo "${ECHO_T}$ol_cv_db_db2" >&6 - if test "$ol_cv_lib_db" != no ; then - ol_cv_berkeley_db=yes - fi + if test $ol_cv_db_db2 = yes ; then + ol_cv_lib_db=-ldb2 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 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 - -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 -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-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 echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB= + ol_DB_LIB=-ldb-2 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -30545,12 +31053,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_2=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_none=no +ol_cv_db_db_2=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -30558,22 +31066,24 @@ 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_2" >&5 +echo "${ECHO_T}$ol_cv_db_db_2" >&6 - if test $ol_cv_db_none = yes ; then - ol_cv_lib_db=yes + if test $ol_cv_db_db_2 = yes ; then + ol_cv_lib_db=-ldb-2 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 + +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 echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb43 + ol_DB_LIB=-ldb1 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -30654,12 +31164,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_db1=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db43=no +ol_cv_db_db1=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -30667,22 +31177,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_db1" >&5 +echo "${ECHO_T}$ol_cv_db_db1" >&6 - if test $ol_cv_db_db43 = yes ; then - ol_cv_lib_db=-ldb43 + if test $ol_cv_db_db1 = yes ; then + ol_cv_lib_db=-ldb1 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-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 echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb-43 + ol_DB_LIB=-ldb-1 ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -30763,12 +31273,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_1=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_1=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -30776,22 +31286,23 @@ 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_1" >&5 +echo "${ECHO_T}$ol_cv_db_db_1" >&6 - if test $ol_cv_db_db_43 = yes ; then - ol_cv_lib_db=-ldb-43 + 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 (-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 "$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=-ldb-4.3 + ol_DB_LIB= ol_LIBS=$LIBS LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" @@ -30872,12 +31383,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_none=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_none=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -30885,26 +31396,33 @@ 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_none" >&5 +echo "${ECHO_T}$ol_cv_db_none" >&6 - if test $ol_cv_db_db_4_dot_3 = yes ; then - ol_cv_lib_db=-ldb-4.3 + if test $ol_cv_db_none = yes ; then + ol_cv_lib_db=yes 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 + + if test "$ol_cv_lib_db" != no ; then + ol_cv_berkeley_db=yes + echo "$as_me:$LINENO: checking for Berkeley DB version match" >&5 +echo $ECHO_N "checking for Berkeley DB version match... $ECHO_C" >&6 +if test "${ol_cv_berkeley_db_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb-4-3 - ol_LIBS=$LIBS - LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" + ol_LIBS="$LIBS" + LIBS="$LTHREAD_LIBS $LIBS" + if test $ol_cv_lib_db != yes ; then + LIBS="$ol_cv_lib_db $LIBS" + fi - cat >conftest.$ac_ext <<_ACEOF + if test "$cross_compiling" = yes; then + ol_cv_berkeley_db_version=cross +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -30912,108 +31430,89 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #ifdef HAVE_DB_185_H -# include + choke me; #else -# include +#include #endif - #ifndef DB_VERSION_MAJOR # define DB_VERSION_MAJOR 1 #endif - #ifndef NULL -#define NULL ((void*)0) +#define NULL ((void *)0) #endif - -int -main () +main() { - #if DB_VERSION_MAJOR > 1 - { - char *version; - int major, minor, patch; + char *version; + int major, minor, patch; - version = db_version( &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; - } + if( major != DB_VERSION_MAJOR || + minor != DB_VERSION_MINOR || + patch != DB_VERSION_PATCH ) + { + 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; + return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +rm -f 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 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + (exit $ac_status); } && { ac_try='./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_3=yes + ol_cv_berkeley_db_version=yes else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_4_3=no +( exit $ac_status ) +ol_cv_berkeley_db_version=no +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 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_4_3" >&5 -echo "${ECHO_T}$ol_cv_db_db_4_3" >&6 +echo "$as_me:$LINENO: result: $ol_cv_berkeley_db_version" >&5 +echo "${ECHO_T}$ol_cv_berkeley_db_version" >&6 - if test $ol_cv_db_db_4_3 = yes ; then - ol_cv_lib_db=-ldb-4-3 + if test $ol_cv_berkeley_db_version = no ; then + { { echo "$as_me:$LINENO: error: Berkeley DB version mismatch" >&5 +echo "$as_me: error: Berkeley DB version mismatch" >&2;} + { (exit 1); exit 1; }; } 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 + echo "$as_me:$LINENO: checking for Berkeley DB thread support" >&5 +echo $ECHO_N "checking for Berkeley DB thread support... $ECHO_C" >&6 +if test "${ol_cv_berkeley_db_thread+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb42 - ol_LIBS=$LIBS - LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" + ol_LIBS="$LIBS" + LIBS="$LTHREAD_LIBS $LIBS" + if test $ol_cv_lib_db != yes ; then + LIBS="$ol_cv_lib_db $LIBS" + fi - cat >conftest.$ac_ext <<_ACEOF + if test "$cross_compiling" = yes; then + ol_cv_berkeley_db_thread=cross +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -31021,107 +31520,132 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #ifdef HAVE_DB_185_H -# include + choke me; #else -# include -#endif - -#ifndef DB_VERSION_MAJOR -# define DB_VERSION_MAJOR 1 +#include #endif - #ifndef NULL -#define NULL ((void*)0) +#define NULL ((void *)0) #endif - -int -main () +main() { + int rc; + u_int32_t flags = DB_CREATE | +#ifdef DB_PRIVATE + DB_PRIVATE | +#endif + DB_THREAD; -#if DB_VERSION_MAJOR > 1 - { - char *version; - int major, minor, patch; +#if DB_VERSION_MAJOR > 2 + DB_ENV *env = NULL; - version = db_version( &major, &minor, &patch ); + rc = db_env_create( &env, 0 ); - 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; - } + flags |= DB_INIT_MPOOL; +#ifdef DB_MPOOL_PRIVATE + flags |= DB_MPOOL_PRIVATE; +#endif + + if( rc ) { + printf("BerkeleyDB: %s\n", db_strerror(rc) ); + return rc; } + +#if (DB_VERSION_MAJOR > 3) || (DB_VERSION_MINOR >= 1) + rc = env->open( env, NULL, flags, 0 ); +#else + rc = env->open( env, NULL, NULL, flags, 0 ); #endif -#if DB_VERSION_MAJOR > 2 - db_env_create( NULL, 0 ); -#elif DB_VERSION_MAJOR > 1 - db_appexit( NULL ); + if ( rc == 0 ) { + rc = env->close( env, 0 ); + } + + if( rc ) { + printf("BerkeleyDB: %s\n", db_strerror(rc) ); + return rc; + } + #else - (void) dbopen( NULL, 0, 0, 0, NULL); + DB_ENV env; + memset( &env, '\0', sizeof(env) ); + + rc = db_appinit( NULL, NULL, &env, flags ); + + if( rc == 0 ) { + db_appexit( &env ); + } + + unlink("__db_mpool.share"); + unlink("__db_lock.share"); #endif - ; - return 0; + return rc; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +rm -f 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 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + (exit $ac_status); } && { ac_try='./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_db42=yes + ol_cv_berkeley_db_thread=yes else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db42=no +( exit $ac_status ) +ol_cv_berkeley_db_thread=no +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 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_db42" >&5 -echo "${ECHO_T}$ol_cv_db_db42" >&6 +echo "$as_me:$LINENO: result: $ol_cv_berkeley_db_thread" >&5 +echo "${ECHO_T}$ol_cv_berkeley_db_thread" >&6 + + if test $ol_cv_berkeley_db_thread != no ; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BERKELEY_DB_THREAD 1 +_ACEOF + + fi - 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-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_berkeley_db = no ; then + { { echo "$as_me:$LINENO: error: BDB/HDB: BerkeleyDB not available" >&5 +echo "$as_me: error: BDB/HDB: BerkeleyDB not available" >&2;} + { (exit 1); exit 1; }; } + fi + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BERKELEY_DB 1 +_ACEOF + + + if test $ol_cv_lib_db != yes ; then + BDB_LIBS="$BDB_LIBS $ol_cv_lib_db" + fi + + echo "$as_me:$LINENO: checking Berkeley DB version for BDB/HDB backends" >&5 +echo $ECHO_N "checking Berkeley DB version for BDB/HDB backends... $ECHO_C" >&6 +if test "${ol_cv_bdb_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ol_DB_LIB=-ldb-42 - ol_LIBS=$LIBS - LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -31129,57 +31653,89 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#ifdef HAVE_DB_185_H -# include -#else -# include -#endif +#include + /* this check could be improved */ #ifndef DB_VERSION_MAJOR -# define DB_VERSION_MAJOR 1 +# define DB_VERSION_MAJOR 1 +#endif +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 #endif -#ifndef NULL -#define NULL ((void*)0) +/* require 4.2 or later */ +#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 2) + __db_version_compat #endif -int -main () -{ +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__db_version_compat" >/dev/null 2>&1; then + ol_cv_bdb_compat=yes +else + ol_cv_bdb_compat=no +fi +rm -f conftest* -#if DB_VERSION_MAJOR > 1 - { - char *version; - int major, minor, patch; +fi +echo "$as_me:$LINENO: result: $ol_cv_bdb_compat" >&5 +echo "${ECHO_T}$ol_cv_bdb_compat" >&6 - 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 test $ol_cv_bdb_compat != yes ; then + { { echo "$as_me:$LINENO: error: BDB/HDB: BerkeleyDB version incompatible" >&5 +echo "$as_me: error: BDB/HDB: BerkeleyDB version incompatible" >&2;} + { (exit 1); exit 1; }; } + fi -#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 + SLAPD_LIBS="$SLAPD_LIBS \$(BDB_LIBS)" - ; - return 0; -} + ol_link_bdb=yes +fi + + +if test $ol_enable_dynamic = yes && test $enable_shared = yes ; then + BUILD_LIBS_DYNAMIC=shared + +cat >>confdefs.h <<\_ACEOF +#define LDAP_LIBS_DYNAMIC 1 _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + + LTSTATIC="" +else + BUILD_LIBS_DYNAMIC=static + LTSTATIC="-static" +fi + +if test $ol_enable_wrappers != no ; then + +for ac_header in tcpd.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 @@ -31193,203 +31749,133 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { 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 - ol_cv_db_db_42=yes + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_42=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_42" >&5 -echo "${ECHO_T}$ol_cv_db_db_42" >&6 - - if test $ol_cv_db_db_42 = yes ; then - ol_cv_lib_db=-ldb-42 - fi +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 -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=-ldb-4.2 - ol_LIBS=$LIBS - LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" - - cat >conftest.$ac_ext <<_ACEOF +# 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 -#ifdef HAVE_DB_185_H -# include -#else -# include -#endif - -#ifndef DB_VERSION_MAJOR -# define DB_VERSION_MAJOR 1 -#endif + 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 -#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_4_dot_2=yes +# 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 - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ol_cv_db_db_4_dot_2=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - LIBS="$ol_LIBS" - + eval "$as_ac_Header=\$ac_header_preproc" 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: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - if test $ol_cv_db_db_4_dot_2 = yes ; then - ol_cv_lib_db=-ldb-4.2 - fi fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -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-4-2 - ol_LIBS=$LIBS - LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" - - cat >conftest.$ac_ext <<_ACEOF + echo "$as_me:$LINENO: checking for TCP wrappers library" >&5 +echo $ECHO_N "checking for TCP wrappers library... $ECHO_C" >&6 + save_LIBS="$LIBS" + LIBS="$LIBS -lwrap" + 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 +#include +int allow_severity = 0; +int deny_severity = 0; -#ifndef NULL -#define NULL ((void*)0) -#endif +struct request_info *req; 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 +hosts_access(req) ; return 0; @@ -31417,88 +31903,34 @@ 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 + echo "$as_me:$LINENO: result: -lwrap" >&5 +echo "${ECHO_T}-lwrap" >&6 + have_wrappers=yes + LIBS="$save_LIBS" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_4_2=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_4_2" >&5 -echo "${ECHO_T}$ol_cv_db_db_4_2" >&6 - - 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 - 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-4 - ol_LIBS=$LIBS - LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF + LIBS="$LIBS -lnsl" + 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 +#include +int allow_severity = 0; +int deny_severity = 0; -#ifndef NULL -#define NULL ((void*)0) -#endif +struct request_info *req; 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 +hosts_access(req) ; return 0; @@ -31526,1774 +31958,103 @@ 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 + echo "$as_me:$LINENO: result: -lwrap -lnsl" >&5 +echo "${ECHO_T}-lwrap -lnsl" >&6 + have_wrappers=yes + LIBS="$save_LIBS -lnsl" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_db_db_4=no + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + have_wrappers=no + LIBS=$save_LIBS 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_4" >&5 -echo "${ECHO_T}$ol_cv_db_db_4" >&6 - - 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 (-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=-ldb4 - 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_db4=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ol_cv_db_db4=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_db4" >&5 -echo "${ECHO_T}$ol_cv_db_db4" >&6 - - 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)" >&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 + have_wrappers=no +fi - 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 ); +done - 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 + if test $have_wrappers = yes ; then - ; - return 0; -} +cat >>confdefs.h <<\_ACEOF +#define HAVE_TCPD 1 _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 + WRAP_LIBS="-lwrap" + elif test $ol_enable_wrappers = yes ; then + { { echo "$as_me:$LINENO: error: could not find TCP wrappers, select apppropriate options or disable" >&5 +echo "$as_me: error: could not find TCP wrappers, select apppropriate options or disable" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: could not find TCP wrappers, support disabled" >&5 +echo "$as_me: WARNING: could not find TCP wrappers, support disabled" >&2;} + WRAP_LIBS="" 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_enable_syslog != no ; then + echo "$as_me:$LINENO: checking for openlog" >&5 +echo $ECHO_N "checking for openlog... $ECHO_C" >&6 +if test "${ac_cv_func_openlog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ol_DB_LIB=-ldb41 - 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_db41=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ol_cv_db_db41=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_db41" >&5 -echo "${ECHO_T}$ol_cv_db_db41" >&6 - - 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 (-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=-ldb-41 - 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_41=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ol_cv_db_db_41=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_41" >&5 -echo "${ECHO_T}$ol_cv_db_db_41" >&6 - - 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-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-4.1 - 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_4_dot_1=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ol_cv_db_db_4_dot_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_4_dot_1" >&5 -echo "${ECHO_T}$ol_cv_db_db_4_dot_1" >&6 - - 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 (-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=-ldb-4-1 - 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_4_1=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ol_cv_db_db_4_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_4_1" >&5 -echo "${ECHO_T}$ol_cv_db_db_4_1" >&6 - - 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 (-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 - -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" - - 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_db2=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ol_cv_db_db2=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_db2" >&5 -echo "${ECHO_T}$ol_cv_db_db2" >&6 - - if test $ol_cv_db_db2 = yes ; then - ol_cv_lib_db=-ldb2 - fi -fi - -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 - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - ol_DB_LIB=-ldb-2 - 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_2=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ol_cv_db_db_2=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_2" >&5 -echo "${ECHO_T}$ol_cv_db_db_2" >&6 - - if test $ol_cv_db_db_2 = yes ; then - ol_cv_lib_db=-ldb-2 - fi -fi - -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 - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - ol_DB_LIB=-ldb1 - 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_db1=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ol_cv_db_db1=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_db1" >&5 -echo "${ECHO_T}$ol_cv_db_db1" >&6 - - if test $ol_cv_db_db1 = yes ; then - ol_cv_lib_db=-ldb1 - fi -fi - -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 - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - ol_DB_LIB=-ldb-1 - 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_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 - - - if test "$ol_cv_lib_db" != no ; then - ol_cv_berkeley_db=yes - echo "$as_me:$LINENO: checking for Berkeley DB version match" >&5 -echo $ECHO_N "checking for Berkeley DB version match... $ECHO_C" >&6 -if test "${ol_cv_berkeley_db_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - ol_LIBS="$LIBS" - LIBS="$LTHREAD_LIBS $LIBS" - if test $ol_cv_lib_db != yes ; then - LIBS="$ol_cv_lib_db $LIBS" - fi - - if test "$cross_compiling" = yes; then - ol_cv_berkeley_db_version=cross -else - 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 - choke me; -#else -#include -#endif -#ifndef DB_VERSION_MAJOR -# define DB_VERSION_MAJOR 1 -#endif -#ifndef NULL -#define NULL ((void *)0) -#endif -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 || - patch != DB_VERSION_PATCH ) - { - printf("Berkeley DB version mismatch\n" - "\theader: %s\n\tlibrary: %s\n", - DB_VERSION_STRING, version); - return 1; - } -#endif - - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./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_berkeley_db_version=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ol_cv_berkeley_db_version=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - LIBS="$ol_LIBS" - -fi -echo "$as_me:$LINENO: result: $ol_cv_berkeley_db_version" >&5 -echo "${ECHO_T}$ol_cv_berkeley_db_version" >&6 - - if test $ol_cv_berkeley_db_version = no ; then - { { echo "$as_me:$LINENO: error: Berkeley DB version mismatch" >&5 -echo "$as_me: error: Berkeley DB version mismatch" >&2;} - { (exit 1); exit 1; }; } - fi - - echo "$as_me:$LINENO: checking for Berkeley DB thread support" >&5 -echo $ECHO_N "checking for Berkeley DB thread support... $ECHO_C" >&6 -if test "${ol_cv_berkeley_db_thread+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - ol_LIBS="$LIBS" - LIBS="$LTHREAD_LIBS $LIBS" - if test $ol_cv_lib_db != yes ; then - LIBS="$ol_cv_lib_db $LIBS" - fi - - if test "$cross_compiling" = yes; then - ol_cv_berkeley_db_thread=cross -else - 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 - choke me; -#else -#include -#endif -#ifndef NULL -#define NULL ((void *)0) -#endif -main() -{ - int rc; - u_int32_t flags = DB_CREATE | -#ifdef DB_PRIVATE - DB_PRIVATE | -#endif - DB_THREAD; - -#if DB_VERSION_MAJOR > 2 - DB_ENV *env = NULL; - - rc = db_env_create( &env, 0 ); - - flags |= DB_INIT_MPOOL; -#ifdef DB_MPOOL_PRIVATE - flags |= DB_MPOOL_PRIVATE; -#endif - - if( rc ) { - printf("BerkeleyDB: %s\n", db_strerror(rc) ); - return rc; - } - -#if (DB_VERSION_MAJOR > 3) || (DB_VERSION_MINOR >= 1) - rc = env->open( env, NULL, flags, 0 ); -#else - rc = env->open( env, NULL, NULL, flags, 0 ); -#endif - - if ( rc == 0 ) { - rc = env->close( env, 0 ); - } - - if( rc ) { - printf("BerkeleyDB: %s\n", db_strerror(rc) ); - return rc; - } - -#else - DB_ENV env; - memset( &env, '\0', sizeof(env) ); - - rc = db_appinit( NULL, NULL, &env, flags ); - - if( rc == 0 ) { - db_appexit( &env ); - } - - unlink("__db_mpool.share"); - unlink("__db_lock.share"); -#endif - - return rc; -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./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_berkeley_db_thread=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ol_cv_berkeley_db_thread=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - LIBS="$ol_LIBS" - -fi -echo "$as_me:$LINENO: result: $ol_cv_berkeley_db_thread" >&5 -echo "${ECHO_T}$ol_cv_berkeley_db_thread" >&6 - - if test $ol_cv_berkeley_db_thread != no ; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_BERKELEY_DB_THREAD 1 -_ACEOF - - fi - - fi -fi - - fi - - if test $ol_cv_berkeley_db != no ; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_BERKELEY_DB 1 -_ACEOF - - - ol_link_ldbm=berkeley - ol_enable_ldbm_api=berkeley - - if test $ol_enable_ldbm_type = hash ; then - -cat >>confdefs.h <<\_ACEOF -#define LDBM_USE_DBHASH 1 -_ACEOF - - else - -cat >>confdefs.h <<\_ACEOF -#define LDBM_USE_DBBTREE 1 -_ACEOF - - fi - - if test $ol_cv_lib_db != yes ; then - LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_db" - fi - fi -fi - -if test $ol_enable_bdb != no -o $ol_enable_hdb != 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;} - { (exit 1); exit 1; }; } - else - echo "$as_me:$LINENO: checking Berkeley DB version for BDB/HDB backends" >&5 -echo $ECHO_N "checking Berkeley DB version for BDB/HDB backends... $ECHO_C" >&6 -if test "${ol_cv_bdb_compat+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. */ - -#include - - /* this check could be improved */ -#ifndef DB_VERSION_MAJOR -# define DB_VERSION_MAJOR 1 -#endif -#ifndef DB_VERSION_MINOR -# define DB_VERSION_MINOR 0 -#endif - -/* require 4.2 or later */ -#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 2) - __db_version_compat -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "__db_version_compat" >/dev/null 2>&1; then - ol_cv_bdb_compat=yes -else - ol_cv_bdb_compat=no -fi -rm -f conftest* - -fi -echo "$as_me:$LINENO: result: $ol_cv_bdb_compat" >&5 -echo "${ECHO_T}$ol_cv_bdb_compat" >&6 - - - if test $ol_cv_bdb_compat != yes ; then - { { echo "$as_me:$LINENO: error: BDB/HDB: BerkeleyDB version incompatible" >&5 -echo "$as_me: error: BDB/HDB: BerkeleyDB version incompatible" >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi - -if test $ol_link_ldbm = no -a $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 - 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 - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ol_LIBS="$LIBS" - echo "$as_me:$LINENO: checking for mdbm_set_chain" >&5 -echo $ECHO_N "checking for mdbm_set_chain... $ECHO_C" >&6 -if test "${ac_cv_func_mdbm_set_chain+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 mdbm_set_chain to an innocuous variant, in case declares mdbm_set_chain. - For example, HP-UX 11i declares gettimeofday. */ -#define mdbm_set_chain innocuous_mdbm_set_chain - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char mdbm_set_chain (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef mdbm_set_chain - -/* 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 mdbm_set_chain (); -/* 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_mdbm_set_chain) || defined (__stub___mdbm_set_chain) -choke me -#else -char (*f) () = mdbm_set_chain; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != mdbm_set_chain; - ; - 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_func_mdbm_set_chain=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_mdbm_set_chain=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_mdbm_set_chain" >&5 -echo "${ECHO_T}$ac_cv_func_mdbm_set_chain" >&6 -if test $ac_cv_func_mdbm_set_chain = yes; then - ol_cv_lib_mdbm=yes -else - - echo "$as_me:$LINENO: checking for mdbm_set_chain in -lmdbm" >&5 -echo $ECHO_N "checking for mdbm_set_chain in -lmdbm... $ECHO_C" >&6 -if test "${ac_cv_lib_mdbm_mdbm_set_chain+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmdbm $LIBS" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define openlog to an innocuous variant, in case declares openlog. + For example, HP-UX 11i declares gettimeofday. */ +#define openlog innocuous_openlog + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char openlog (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef openlog /* 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 mdbm_set_chain (); +char openlog (); +/* 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_openlog) || defined (__stub___openlog) +choke me +#else +char (*f) () = openlog; +#endif +#ifdef __cplusplus +} +#endif + int main () { -mdbm_set_chain (); +return f != openlog; ; return 0; } @@ -33320,37 +32081,32 @@ 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_mdbm_mdbm_set_chain=yes + ac_cv_func_openlog=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_mdbm_mdbm_set_chain=no +ac_cv_func_openlog=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_mdbm_mdbm_set_chain" >&5 -echo "${ECHO_T}$ac_cv_lib_mdbm_mdbm_set_chain" >&6 -if test $ac_cv_lib_mdbm_mdbm_set_chain = yes; then - ol_cv_lib_mdbm=-lmdbm -else - ol_cv_lib_mdbm=no -fi - - fi +echo "$as_me:$LINENO: result: $ac_cv_func_openlog" >&5 +echo "${ECHO_T}$ac_cv_func_openlog" >&6 - LIBS="$ol_LIBS" - + 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; }; } + fi + ol_enable_syslog=$ac_cv_func_openlog fi -echo "$as_me:$LINENO: result: $ol_cv_lib_mdbm" >&5 -echo "${ECHO_T}$ol_cv_lib_mdbm" >&6 +ol_link_sql=no +if test $ol_enable_sql != no ; then -for ac_header in mdbm.h +for ac_header in sql.h sqlext.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -33471,9 +32227,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 @@ -33495,102 +32251,45 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -fi - -done - - echo "$as_me:$LINENO: checking for db" >&5 -echo $ECHO_N "checking for db... $ECHO_C" >&6 -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 - ol_cv_mdbm=no - else - ol_cv_mdbm=yes - fi + { { echo "$as_me:$LINENO: error: could not locate SQL headers" >&5 +echo "$as_me: error: could not locate SQL headers" >&2;} + { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ol_cv_mdbm" >&5 -echo "${ECHO_T}$ol_cv_mdbm" >&6 - if test $ol_cv_mdbm = yes ; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_MDBM 1 -_ACEOF - fi +done - if test $ol_cv_mdbm = yes ; then - ol_link_ldbm=mdbm - ol_enable_ldbm_api=mdbm - if test $ol_cv_lib_mdbm != yes ; then - LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_mdbm" - fi - fi -fi + sql_LIBS="$LIBS" + LIBS="$LTHREAD_LIBS" -if test $ol_enable_ldbm_api = auto -o $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 - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ol_LIBS="$LIBS" - echo "$as_me:$LINENO: checking for gdbm_open" >&5 -echo $ECHO_N "checking for gdbm_open... $ECHO_C" >&6 -if test "${ac_cv_func_gdbm_open+set}" = set; then + echo "$as_me:$LINENO: checking for SQLDriverConnect in -liodbc" >&5 +echo $ECHO_N "checking for SQLDriverConnect in -liodbc... $ECHO_C" >&6 +if test "${ac_cv_lib_iodbc_SQLDriverConnect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-liodbc $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define gdbm_open to an innocuous variant, in case declares gdbm_open. - For example, HP-UX 11i declares gettimeofday. */ -#define gdbm_open innocuous_gdbm_open - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gdbm_open (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef gdbm_open /* 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 gdbm_open (); -/* 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_gdbm_open) || defined (__stub___gdbm_open) -choke me -#else -char (*f) () = gdbm_open; -#endif -#ifdef __cplusplus -} -#endif - +char SQLDriverConnect (); int main () { -return f != gdbm_open; +SQLDriverConnect (); ; return 0; } @@ -33617,29 +32316,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_gdbm_open=yes + ac_cv_lib_iodbc_SQLDriverConnect=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_gdbm_open=no +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_func_gdbm_open" >&5 -echo "${ECHO_T}$ac_cv_func_gdbm_open" >&6 -if test $ac_cv_func_gdbm_open = yes; then - ol_cv_lib_gdbm=yes +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 - echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5 -echo $ECHO_N "checking for gdbm_open in -lgdbm... $ECHO_C" >&6 -if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then + 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="-lgdbm $LIBS" +LIBS="-lodbc $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -33653,11 +32358,11 @@ 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 gdbm_open (); +char SQLDriverConnect (); int main () { -gdbm_open (); +SQLDriverConnect (); ; return 0; } @@ -33684,37 +32389,45 @@ 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_gdbm_gdbm_open=yes + ac_cv_lib_odbc_SQLDriverConnect=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_gdbm_gdbm_open=no +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_gdbm_gdbm_open" >&5 -echo "${ECHO_T}$ac_cv_lib_gdbm_gdbm_open" >&6 -if test $ac_cv_lib_gdbm_gdbm_open = yes; then - ol_cv_lib_gdbm=-lgdbm +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 - ol_cv_lib_gdbm=no + have_odbc=no fi + if test $have_odbc = yes ; then + ol_link_sql="-lodbc" + fi + fi -fi + LIBS="$sql_LIBS" - LIBS="$ol_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 -echo "$as_me:$LINENO: result: $ol_cv_lib_gdbm" >&5 -echo "${ECHO_T}$ol_cv_lib_gdbm" >&6 +ol_icu=no - -for ac_header in gdbm.h +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 @@ -33835,9 +32548,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 @@ -33863,166 +32576,32 @@ fi done - echo "$as_me:$LINENO: checking for db" >&5 -echo $ECHO_N "checking for db... $ECHO_C" >&6 -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 - ol_cv_gdbm=no - else - ol_cv_gdbm=yes - fi - -fi -echo "$as_me:$LINENO: result: $ol_cv_gdbm" >&5 -echo "${ECHO_T}$ol_cv_gdbm" >&6 - if test $ol_cv_gdbm = yes ; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GDBM 1 -_ACEOF - - fi - - - if test $ol_cv_gdbm = yes ; then - ol_link_ldbm=gdbm - ol_enable_ldbm_api=gdbm - - if test $ol_cv_lib_gdbm != yes ; then - LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_gdbm" - fi - fi -fi +if test $ac_cv_header_unicode_utypes_h = yes ; then + OL_ICULIBS="-licuuc -licudata" -if test $ol_enable_ldbm_api = ndbm ; then - echo "$as_me:$LINENO: checking for NDBM library" >&5 -echo $ECHO_N "checking for NDBM library... $ECHO_C" >&6 -if test "${ol_cv_lib_ndbm+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ol_LIBS="$LIBS" - echo "$as_me:$LINENO: checking for dbm_open" >&5 -echo $ECHO_N "checking for dbm_open... $ECHO_C" >&6 -if test "${ac_cv_func_dbm_open+set}" = set; then + 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 - cat >conftest.$ac_ext <<_ACEOF + + 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. */ -/* Define dbm_open to an innocuous variant, in case declares dbm_open. - For example, HP-UX 11i declares gettimeofday. */ -#define dbm_open innocuous_dbm_open - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dbm_open (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dbm_open -/* 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 dbm_open (); -/* 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_dbm_open) || defined (__stub___dbm_open) -choke me -#else -char (*f) () = dbm_open; -#endif -#ifdef __cplusplus -} -#endif +#include int main () { -return f != dbm_open; - ; - 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_func_dbm_open=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_dbm_open=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_dbm_open" >&5 -echo "${ECHO_T}$ac_cv_func_dbm_open" >&6 -if test $ac_cv_func_dbm_open = yes; then - ol_cv_lib_ndbm=yes -else - echo "$as_me:$LINENO: checking for dbm_open in -lndbm" >&5 -echo $ECHO_N "checking for dbm_open in -lndbm... $ECHO_C" >&6 -if test "${ac_cv_lib_ndbm_dbm_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lndbm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +(void) u_errorName(0); -/* 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 dbm_open (); -int -main () -{ -dbm_open (); ; return 0; } @@ -34049,107 +32628,44 @@ 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_ndbm_dbm_open=yes + ol_cv_lib_icu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ndbm_dbm_open=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_ndbm_dbm_open" >&5 -echo "${ECHO_T}$ac_cv_lib_ndbm_dbm_open" >&6 -if test $ac_cv_lib_ndbm_dbm_open = yes; then - ol_cv_lib_ndbm=-lndbm -else - - echo "$as_me:$LINENO: checking for dbm_open in -ldbm" >&5 -echo $ECHO_N "checking for dbm_open in -ldbm... $ECHO_C" >&6 -if test "${ac_cv_lib_dbm_dbm_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldbm $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 dbm_open (); -int -main () -{ -dbm_open (); - ; - 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_dbm_dbm_open=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + LIBS="$ol_LIBS" -ac_cv_lib_dbm_dbm_open=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_dbm_dbm_open" >&5 -echo "${ECHO_T}$ac_cv_lib_dbm_dbm_open" >&6 -if test $ac_cv_lib_dbm_dbm_open = yes; then - ol_cv_lib_ndbm=-ldbm -else - ol_cv_lib_ndbm=no fi +echo "$as_me:$LINENO: result: $ol_cv_lib_icu" >&5 +echo "${ECHO_T}$ol_cv_lib_icu" >&6 -fi + if test $ol_cv_lib_icu != no ; then + ol_icu="$OL_ICULIBS" +cat >>confdefs.h <<\_ACEOF +#define HAVE_ICU 1 +_ACEOF + fi fi - LIBS="$ol_LIBS" - +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 -echo "$as_me:$LINENO: result: $ol_cv_lib_ndbm" >&5 -echo "${ECHO_T}$ol_cv_lib_ndbm" >&6 - +WITH_SASL=no +ol_link_sasl=no +ol_link_spasswd=no +if test $ol_with_cyrus_sasl != no ; then -for ac_header in ndbm.h +for ac_header in sasl/sasl.h sasl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -34270,9 +32786,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 @@ -34298,95 +32814,41 @@ fi done - echo "$as_me:$LINENO: checking for db" >&5 -echo $ECHO_N "checking for db... $ECHO_C" >&6 -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 - ol_cv_ndbm=no - else - ol_cv_ndbm=yes - fi - -fi -echo "$as_me:$LINENO: result: $ol_cv_ndbm" >&5 -echo "${ECHO_T}$ol_cv_ndbm" >&6 - if test $ol_cv_ndbm = yes ; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_NDBM 1 -_ACEOF - - fi - - - if test $ol_cv_ndbm = yes ; then - ol_link_ldbm=ndbm - ol_enable_ldbm_api=ndbm - - if test $ol_cv_lib_ndbm != yes ; then - LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_ndbm" - fi - fi -fi - -if test $ol_link_ldbm = no -a $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 - SLAPD_LIBS="$SLAPD_LIBS \$(LDBM_LIBS)" -fi - - -if test $ol_enable_dynamic = yes -a $enable_shared = yes ; then - BUILD_LIBS_DYNAMIC=shared - -cat >>confdefs.h <<\_ACEOF -#define LDAP_LIBS_DYNAMIC 1 -_ACEOF - - LTSTATIC="" -else - BUILD_LIBS_DYNAMIC=static - LTSTATIC="-static" -fi - -if test $ol_enable_wrappers != no ; then -for ac_header in tcpd.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 $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 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 + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsasl2 $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> + +/* 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 sasl_client_init (); +int +main () +{ +sasl_client_init (); + ; + 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 @@ -34400,134 +32862,227 @@ 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 + ac_cv_lib_sasl2_sasl_client_init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_lib_sasl2_sasl_client_init=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 +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_sasl2_sasl_client_init" >&5 +echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_client_init" >&6 +if test $ac_cv_lib_sasl2_sasl_client_init = yes; then + ol_link_sasl="-lsasl2" +else + echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl" >&5 +echo $ECHO_N "checking for sasl_client_init in -lsasl... $ECHO_C" >&6 +if test "${ac_cv_lib_sasl_sasl_client_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsasl $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> + +/* 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 sasl_client_init (); +int +main () +{ +sasl_client_init (); + ; + 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 + (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_sasl_sasl_client_init=yes else - ac_cpp_err=yes + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_sasl_sasl_client_init=no fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes +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_sasl_sasl_client_init" >&5 +echo "${ECHO_T}$ac_cv_lib_sasl_sasl_client_init" >&6 +if test $ac_cv_lib_sasl_sasl_client_init = yes; then + ol_link_sasl="-lsasl" +fi + +fi + + fi + + if test $ol_link_sasl = no ; then + if test $ol_with_cyrus_sasl != auto ; then + { { echo "$as_me:$LINENO: error: Could not locate Cyrus SASL" >&5 +echo "$as_me: error: Could not locate Cyrus SASL" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: Could not locate Cyrus SASL" >&5 +echo "$as_me: WARNING: Could not locate Cyrus SASL" >&2;} + { echo "$as_me:$LINENO: WARNING: SASL authentication not supported!" >&5 +echo "$as_me: WARNING: SASL authentication not supported!" >&2;} + if test $ol_link_tls = no ; then + { echo "$as_me:$LINENO: WARNING: Strong authentication not supported!" >&5 +echo "$as_me: WARNING: Strong authentication not supported!" >&2;} + fi + fi + else + echo "$as_me:$LINENO: checking Cyrus SASL library version" >&5 +echo $ECHO_N "checking Cyrus SASL library version... $ECHO_C" >&6 +if test "${ol_cv_sasl_compat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 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 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -# 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 +#ifdef HAVE_SASL_SASL_H +#include +#else +#include +#endif + +/* Require 2.1.15+ */ +#if SASL_VERSION_MAJOR == 2 && SASL_VERSION_MINOR > 1 + char *__sasl_compat = "2.2+ or better okay (we guess)"; +#elif SASL_VERSION_MAJOR == 2 && SASL_VERSION_MINOR == 1 \ + && SASL_VERSION_STEP >=15 + char *__sasl_compat = "2.1.15+ or better okay"; +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "__sasl_compat" >/dev/null 2>&1; then + ol_cv_sasl_compat=yes else - eval "$as_ac_Header=\$ac_header_preproc" + ol_cv_sasl_compat=no fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +rm -f conftest* fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +echo "$as_me:$LINENO: result: $ol_cv_sasl_compat" >&5 +echo "${ECHO_T}$ol_cv_sasl_compat" >&6 + + if test $ol_cv_sasl_compat = no ; then + ol_link_sasl=no + { { echo "$as_me:$LINENO: error: Cyrus SASL library located but is incompatible" >&5 +echo "$as_me: error: Cyrus SASL library located but is incompatible" >&2;} + { (exit 1); exit 1; }; } + fi + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_CYRUS_SASL 1 _ACEOF - echo "$as_me:$LINENO: checking for TCP wrappers library" >&5 -echo $ECHO_N "checking for TCP wrappers library... $ECHO_C" >&6 - save_LIBS="$LIBS" - LIBS="$LIBS -lwrap" - cat >conftest.$ac_ext <<_ACEOF + SASL_LIBS="$ol_link_sasl" + if test $ol_enable_spasswd != no ; then + ol_link_spasswd=yes + fi + + ac_save_LIBS="$LIBS" + LIBS="$LIBS $ol_link_sasl" + echo "$as_me:$LINENO: checking for sasl_version" >&5 +echo $ECHO_N "checking for sasl_version... $ECHO_C" >&6 +if test "${ac_cv_func_sasl_version+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 sasl_version to an innocuous variant, in case declares sasl_version. + For example, HP-UX 11i declares gettimeofday. */ +#define sasl_version innocuous_sasl_version -#include -int allow_severity = 0; -int deny_severity = 0; +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char sasl_version (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -struct request_info *req; +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef sasl_version + +/* 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 sasl_version (); +/* 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_sasl_version) || defined (__stub___sasl_version) +choke me +#else +char (*f) () = sasl_version; +#endif +#ifdef __cplusplus +} +#endif int main () { - -hosts_access(req) - +return f != sasl_version; ; return 0; } @@ -34554,35 +33109,87 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: -lwrap" >&5 -echo "${ECHO_T}-lwrap" >&6 - have_wrappers=yes - LIBS="$save_LIBS" + ac_cv_func_sasl_version=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_func_sasl_version=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_sasl_version" >&5 +echo "${ECHO_T}$ac_cv_func_sasl_version" >&6 +if test $ac_cv_func_sasl_version = yes; then - LIBS="$LIBS -lnsl" - cat >conftest.$ac_ext <<_ACEOF +cat >>confdefs.h <<\_ACEOF +#define HAVE_SASL_VERSION 1 +_ACEOF + +fi + + LIBS="$ac_save_LIBS" + + WITH_SASL=yes + fi + +else + { echo "$as_me:$LINENO: WARNING: SASL authentication not supported!" >&5 +echo "$as_me: WARNING: SASL authentication not supported!" >&2;} + if test $ol_link_tls = no ; then + { echo "$as_me:$LINENO: WARNING: Strong authentication not supported!" >&5 +echo "$as_me: WARNING: Strong authentication not supported!" >&2;} + fi +fi + +if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then + dev=no + if test -r /dev/urandom ; then + dev="/dev/urandom"; + elif test -r /idev/urandom ; then + dev="/idev/urandom"; + elif test -r /dev/srandom ; then + dev="/dev/srandom"; + elif test -r /dev/random ; then + dev="/dev/random"; + elif test -r /idev/random ; then + dev="/idev/random"; + fi + + if test $dev != no ; then + +cat >>confdefs.h <<_ACEOF +#define URANDOM_DEVICE "$dev" +_ACEOF + + fi +fi + +ol_link_fetch=no +if test $ol_with_fetch != no ; then + ol_LIBS=$LIBS +LIBS="-lfetch -lcom_err $LIBS" +echo "$as_me:$LINENO: checking fetch(3) library" >&5 +echo $ECHO_N "checking fetch(3) library... $ECHO_C" >&6 +if test "${ol_cv_lib_fetch+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. */ -#include -int allow_severity = 0; -int deny_severity = 0; - -struct request_info *req; - +#include +#include +#include int main () { - -hosts_access(req) - +struct url *u = fetchParseURL("file:///"); ; return 0; } @@ -34609,54 +33216,47 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: -lwrap -lnsl" >&5 -echo "${ECHO_T}-lwrap -lnsl" >&6 - have_wrappers=yes - LIBS="$save_LIBS -lnsl" + ol_cv_lib_fetch=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - have_wrappers=no - LIBS=$save_LIBS -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +ol_cv_lib_fetch=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -else - have_wrappers=no fi +echo "$as_me:$LINENO: result: $ol_cv_lib_fetch" >&5 +echo "${ECHO_T}$ol_cv_lib_fetch" >&6 +LIBS=$ol_LIBS +if test $ol_cv_lib_fetch != no ; then + ol_link_fetch="-lfetch -lcom_err" -done +cat >>confdefs.h <<\_ACEOF +#define HAVE_FETCH 1 +_ACEOF +fi - if test $have_wrappers = yes ; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_TCPD 1 -_ACEOF + if test $ol_cv_lib_fetch != no ; then + LUTIL_LIBS="$LUTIL_LIBS $ol_link_fetch" + ol_link_fetch=freebsd - WRAP_LIBS="-lwrap" - elif test $ol_enable_wrappers = yes ; then - { { echo "$as_me:$LINENO: error: could not find TCP wrappers, select apppropriate options or disable" >&5 -echo "$as_me: error: could not find TCP wrappers, select apppropriate options or disable" >&2;} + elif test $ol_with_fetch != auto ; then + { { echo "$as_me:$LINENO: error: no suitable API for --with-fetch=$ol_with_fetch" >&5 +echo "$as_me: error: no suitable API for --with-fetch=$ol_with_fetch" >&2;} { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: WARNING: could not find TCP wrappers, support disabled" >&5 -echo "$as_me: WARNING: could not find TCP wrappers, support disabled" >&2;} - WRAP_LIBS="" fi fi -if test $ol_enable_syslog != no ; then - echo "$as_me:$LINENO: checking for openlog" >&5 -echo $ECHO_N "checking for openlog... $ECHO_C" >&6 -if test "${ac_cv_func_openlog+set}" = set; then +if test $ol_enable_crypt != no ; then + save_LIBS="$LIBS" + LIBS="$TLS_LIBS $LIBS" + + echo "$as_me:$LINENO: checking for crypt" >&5 +echo $ECHO_N "checking for crypt... $ECHO_C" >&6 +if test "${ac_cv_func_crypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -34665,12 +33265,12 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define openlog to an innocuous variant, in case declares openlog. +/* Define crypt to an innocuous variant, in case declares crypt. For example, HP-UX 11i declares gettimeofday. */ -#define openlog innocuous_openlog +#define crypt innocuous_crypt /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char openlog (); below. + which can conflict with char crypt (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ @@ -34680,7 +33280,7 @@ cat >>conftest.$ac_ext <<_ACEOF # include #endif -#undef openlog +#undef crypt /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -34689,14 +33289,14 @@ 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 openlog (); +char crypt (); /* 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_openlog) || defined (__stub___openlog) +#if defined (__stub_crypt) || defined (__stub___crypt) choke me #else -char (*f) () = openlog; +char (*f) () = crypt; #endif #ifdef __cplusplus } @@ -34705,7 +33305,7 @@ char (*f) () = openlog; int main () { -return f != openlog; +return f != crypt; ; return 0; } @@ -34732,58 +33332,55 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_openlog=yes + ac_cv_func_crypt=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_openlog=no +ac_cv_func_crypt=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext 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 - { { 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; }; } - fi - ol_enable_syslog=$ac_cv_func_openlog -fi - -ol_link_sql=no -if test $ol_enable_sql != no ; then - +echo "$as_me:$LINENO: result: $ac_cv_func_crypt" >&5 +echo "${ECHO_T}$ac_cv_func_crypt" >&6 +if test $ac_cv_func_crypt = yes; then + have_crypt=yes +else -for ac_header in sql.h sqlext.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 + LIBS="$save_LIBS" + echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 +echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 +if test "${ac_cv_lib_crypt_crypt+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 + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcrypt $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> + +/* 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 crypt (); +int +main () +{ +crypt (); + ; + 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 @@ -34797,150 +33394,111 @@ 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 + ac_cv_lib_crypt_crypt=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 +ac_cv_lib_crypt_crypt=no 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 +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS 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 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 +echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 +echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 +if test $ac_cv_lib_crypt_crypt = yes; then + LUTIL_LIBS="$LUTIL_LIBS -lcrypt" + have_crypt=yes else - eval "$as_ac_Header=\$ac_header_preproc" + have_crypt=no 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 -else - { { echo "$as_me:$LINENO: error: could not locate SQL headers" >&5 -echo "$as_me: error: could not locate SQL headers" >&2;} - { (exit 1); exit 1; }; } + LIBS="$save_LIBS" -fi + if test $have_crypt = yes ; then -done +cat >>confdefs.h <<\_ACEOF +#define HAVE_CRYPT 1 +_ACEOF + else + { echo "$as_me:$LINENO: WARNING: could not find crypt" >&5 +echo "$as_me: WARNING: could not find crypt" >&2;} + if test $ol_enable_crypt = yes ; then + { { echo "$as_me:$LINENO: error: could not find crypt, select appropriate options or disable" >&5 +echo "$as_me: error: could not find crypt, select appropriate options or disable" >&2;} + { (exit 1); exit 1; }; } + fi - sql_LIBS="$LIBS" - LIBS="$LTHREAD_LIBS" + { echo "$as_me:$LINENO: WARNING: disabling crypt support" >&5 +echo "$as_me: WARNING: disabling crypt support" >&2;} + ol_enable_crypt=no + fi +fi - echo "$as_me:$LINENO: checking for SQLDriverConnect in -liodbc" >&5 -echo $ECHO_N "checking for SQLDriverConnect in -liodbc... $ECHO_C" >&6 -if test "${ac_cv_lib_iodbc_SQLDriverConnect+set}" = set; then +if test $ol_enable_proctitle != no ; then + echo "$as_me:$LINENO: checking for setproctitle" >&5 +echo $ECHO_N "checking for setproctitle... $ECHO_C" >&6 +if test "${ac_cv_func_setproctitle+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-liodbc $LIBS" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define setproctitle to an innocuous variant, in case declares setproctitle. + For example, HP-UX 11i declares gettimeofday. */ +#define setproctitle innocuous_setproctitle + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char setproctitle (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef setproctitle /* 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 (); +char setproctitle (); +/* 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_setproctitle) || defined (__stub___setproctitle) +choke me +#else +char (*f) () = setproctitle; +#endif +#ifdef __cplusplus +} +#endif + int main () { -SQLDriverConnect (); +return f != setproctitle; ; return 0; } @@ -34967,35 +33525,29 @@ 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_func_setproctitle=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_iodbc_SQLDriverConnect=no +ac_cv_func_setproctitle=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 +echo "$as_me:$LINENO: result: $ac_cv_func_setproctitle" >&5 +echo "${ECHO_T}$ac_cv_func_setproctitle" >&6 +if test $ac_cv_func_setproctitle = yes; then + have_setproctitle=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 "$as_me:$LINENO: checking for setproctitle in -lutil" >&5 +echo $ECHO_N "checking for setproctitle in -lutil... $ECHO_C" >&6 +if test "${ac_cv_lib_util_setproctitle+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lodbc $LIBS" +LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -35009,11 +33561,11 @@ 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 (); +char setproctitle (); int main () { -SQLDriverConnect (); +setproctitle (); ; return 0; } @@ -35040,49 +33592,50 @@ 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_odbc_SQLDriverConnect=yes + ac_cv_lib_util_setproctitle=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_odbc_SQLDriverConnect=no +ac_cv_lib_util_setproctitle=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 +echo "$as_me:$LINENO: result: $ac_cv_lib_util_setproctitle" >&5 +echo "${ECHO_T}$ac_cv_lib_util_setproctitle" >&6 +if test $ac_cv_lib_util_setproctitle = yes; then + have_setproctitle=yes + LUTIL_LIBS="$LUTIL_LIBS -lutil" else - have_odbc=no + have_setproctitle=no + case $LIBOBJS in + "setproctitle.$ac_objext" | \ + *" setproctitle.$ac_objext" | \ + "setproctitle.$ac_objext "* | \ + *" setproctitle.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS setproctitle.$ac_objext" ;; +esac + + LIBSRCS="$LIBSRCS setproctitle.c" fi - if test $have_odbc = yes ; then - ol_link_sql="-lodbc" - fi - fi +fi - LIBS="$sql_LIBS" - if test $ol_link_sql != no ; then - SLAPD_SQL_LIBS="$ol_link_sql" + if test $have_setproctitle = yes ; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SETPROCTITLE 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 -WITH_SASL=no -ol_link_sasl=no -ol_link_spasswd=no -if test $ol_with_cyrus_sasl != no ; then - +if test $ol_enable_slp != no ; then -for ac_header in sasl/sasl.h sasl.h +for ac_header in slp.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -35203,9 +33756,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,81 +33785,14 @@ fi done - if test $ac_cv_header_sasl_sasl_h = yes -o $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 - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsasl2 $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 sasl_client_init (); -int -main () -{ -sasl_client_init (); - ; - 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_sasl2_sasl_client_init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_sasl2_sasl_client_init=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_sasl2_sasl_client_init" >&5 -echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_client_init" >&6 -if test $ac_cv_lib_sasl2_sasl_client_init = yes; then - ol_link_sasl="-lsasl2" -else - echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl" >&5 -echo $ECHO_N "checking for sasl_client_init in -lsasl... $ECHO_C" >&6 -if test "${ac_cv_lib_sasl_sasl_client_init+set}" = set; then + if test $ac_cv_header_slp_h = yes ; then + echo "$as_me:$LINENO: checking for SLPOpen in -lslp" >&5 +echo $ECHO_N "checking for SLPOpen in -lslp... $ECHO_C" >&6 +if test "${ac_cv_lib_slp_SLPOpen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsasl $LIBS" +LIBS="-lslp $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -35320,11 +33806,11 @@ 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 sasl_client_init (); +char SLPOpen (); int main () { -sasl_client_init (); +SLPOpen (); ; return 0; } @@ -35351,268 +33837,68 @@ 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_sasl_sasl_client_init=yes + ac_cv_lib_slp_SLPOpen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_sasl_sasl_client_init=no +ac_cv_lib_slp_SLPOpen=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_sasl_sasl_client_init" >&5 -echo "${ECHO_T}$ac_cv_lib_sasl_sasl_client_init" >&6 -if test $ac_cv_lib_sasl_sasl_client_init = yes; then - ol_link_sasl="-lsasl" -fi - -fi - - fi - - if test $ol_link_sasl = no ; then - if test $ol_with_cyrus_sasl != auto ; then - { { echo "$as_me:$LINENO: error: Could not locate Cyrus SASL" >&5 -echo "$as_me: error: Could not locate Cyrus SASL" >&2;} - { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: WARNING: Could not locate Cyrus SASL" >&5 -echo "$as_me: WARNING: Could not locate Cyrus SASL" >&2;} - { echo "$as_me:$LINENO: WARNING: SASL authentication not supported!" >&5 -echo "$as_me: WARNING: SASL authentication not supported!" >&2;} - if test $ol_link_tls = no ; then - { echo "$as_me:$LINENO: WARNING: Strong authentication not supported!" >&5 -echo "$as_me: WARNING: Strong authentication not supported!" >&2;} - fi - fi - else - echo "$as_me:$LINENO: checking Cyrus SASL library version" >&5 -echo $ECHO_N "checking Cyrus SASL library version... $ECHO_C" >&6 -if test "${ol_cv_sasl_compat+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. */ - -#ifdef HAVE_SASL_SASL_H -#include -#else -#include -#endif - -/* Require 2.1.15+ */ -#if SASL_VERSION_MAJOR == 2 && SASL_VERSION_MINOR > 1 - char *__sasl_compat = "2.2+ or better okay (we guess)"; -#elif SASL_VERSION_MAJOR == 2 && SASL_VERSION_MINOR == 1 \ - && SASL_VERSION_STEP >=15 - char *__sasl_compat = "2.1.15+ or better okay"; -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "__sasl_compat" >/dev/null 2>&1; then - ol_cv_sasl_compat=yes +echo "$as_me:$LINENO: result: $ac_cv_lib_slp_SLPOpen" >&5 +echo "${ECHO_T}$ac_cv_lib_slp_SLPOpen" >&6 +if test $ac_cv_lib_slp_SLPOpen = yes; then + have_slp=yes else - ol_cv_sasl_compat=no -fi -rm -f conftest* - + have_slp=no fi -echo "$as_me:$LINENO: result: $ol_cv_sasl_compat" >&5 -echo "${ECHO_T}$ol_cv_sasl_compat" >&6 - - if test $ol_cv_sasl_compat = no ; then - ol_link_sasl=no - { { echo "$as_me:$LINENO: error: Cyrus SASL library located but is incompatible" >&5 -echo "$as_me: error: Cyrus SASL library located but is incompatible" >&2;} - { (exit 1); exit 1; }; } - fi + if test $have_slp = yes ; then cat >>confdefs.h <<\_ACEOF -#define HAVE_CYRUS_SASL 1 +#define HAVE_SLP 1 _ACEOF - SASL_LIBS="$ol_link_sasl" - if test $ol_enable_spasswd != no ; then - ol_link_spasswd=yes + SLAPD_SLP_LIBS=-lslp fi - ac_save_LIBS="$LIBS" - LIBS="$LIBS $ol_link_sasl" - echo "$as_me:$LINENO: checking for sasl_version" >&5 -echo $ECHO_N "checking for sasl_version... $ECHO_C" >&6 -if test "${ac_cv_func_sasl_version+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 sasl_version to an innocuous variant, in case declares sasl_version. - For example, HP-UX 11i declares gettimeofday. */ -#define sasl_version innocuous_sasl_version - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char sasl_version (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef sasl_version - -/* 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 sasl_version (); -/* 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_sasl_version) || defined (__stub___sasl_version) -choke me -#else -char (*f) () = sasl_version; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != sasl_version; - ; - 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_func_sasl_version=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_sasl_version=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_sasl_version" >&5 -echo "${ECHO_T}$ac_cv_func_sasl_version" >&6 -if test $ac_cv_func_sasl_version = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SASL_VERSION 1 -_ACEOF - -fi - - LIBS="$ac_save_LIBS" - - WITH_SASL=yes - fi - -else - { echo "$as_me:$LINENO: WARNING: SASL authentication not supported!" >&5 -echo "$as_me: WARNING: SASL authentication not supported!" >&2;} - if test $ol_link_tls = no ; then - { echo "$as_me:$LINENO: WARNING: Strong authentication not supported!" >&5 -echo "$as_me: WARNING: Strong authentication not supported!" >&2;} + elif test $ol_enable_slp = yes ; then + { { echo "$as_me:$LINENO: error: SLP not found" >&5 +echo "$as_me: error: SLP not found" >&2;} + { (exit 1); exit 1; }; } fi fi -if test $cross_compiling != yes -a "$ac_cv_mingw32" != yes ; then - dev=no - if test -r /dev/urandom ; then - dev="/dev/urandom"; - elif test -r /idev/urandom ; then - dev="/idev/urandom"; - elif test -r /dev/srandom ; then - dev="/dev/srandom"; - elif test -r /dev/random ; then - dev="/dev/random"; - elif test -r /idev/random ; then - dev="/idev/random"; - fi - - if test $dev != no ; then - -cat >>confdefs.h <<_ACEOF -#define URANDOM_DEVICE "$dev" -_ACEOF - - fi -fi -ol_link_fetch=no -if test $ol_with_fetch != no ; then - ol_LIBS=$LIBS -LIBS="-lfetch -lcom_err $LIBS" -echo "$as_me:$LINENO: checking fetch(3) library" >&5 -echo $ECHO_N "checking fetch(3) library... $ECHO_C" >&6 -if test "${ol_cv_lib_fetch+set}" = set; then +echo "$as_me:$LINENO: checking for mode_t" >&5 +echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 +if test "${ac_cv_type_mode_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -#include -#include -#include +$ac_includes_default int main () { -struct url *u = fetchParseURL("file:///"); +if ((mode_t *) 0) + return 0; +if (sizeof (mode_t)) + return 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 +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 @@ -35626,53 +33912,36 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { 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 - ol_cv_lib_fetch=yes + ac_cv_type_mode_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_lib_fetch=no +ac_cv_type_mode_t=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ol_cv_lib_fetch" >&5 -echo "${ECHO_T}$ol_cv_lib_fetch" >&6 -LIBS=$ol_LIBS -if test $ol_cv_lib_fetch != no ; then - ol_link_fetch="-lfetch -lcom_err" +echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 +echo "${ECHO_T}$ac_cv_type_mode_t" >&6 +if test $ac_cv_type_mode_t = yes; then + : +else -cat >>confdefs.h <<\_ACEOF -#define HAVE_FETCH 1 +cat >>confdefs.h <<_ACEOF +#define mode_t int _ACEOF fi - - if test $ol_cv_lib_fetch != no ; then - LUTIL_LIBS="$LUTIL_LIBS $ol_link_fetch" - ol_link_fetch=freebsd - - elif test $ol_with_fetch != auto ; then - { { echo "$as_me:$LINENO: error: no suitable API for --with-fetch=$ol_with_fetch" >&5 -echo "$as_me: error: no suitable API for --with-fetch=$ol_with_fetch" >&2;} - { (exit 1); exit 1; }; } - fi -fi - -if test $ol_enable_crypt != no ; then - save_LIBS="$LIBS" - LIBS="$TLS_LIBS $LIBS" - - echo "$as_me:$LINENO: checking for crypt" >&5 -echo $ECHO_N "checking for crypt... $ECHO_C" >&6 -if test "${ac_cv_func_crypt+set}" = set; then +echo "$as_me:$LINENO: checking for off_t" >&5 +echo $ECHO_N "checking for off_t... $ECHO_C" >&6 +if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -35681,54 +33950,21 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define crypt to an innocuous variant, in case declares crypt. - For example, HP-UX 11i declares gettimeofday. */ -#define crypt innocuous_crypt - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char crypt (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef crypt - -/* 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 crypt (); -/* 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_crypt) || defined (__stub___crypt) -choke me -#else -char (*f) () = crypt; -#endif -#ifdef __cplusplus -} -#endif - +$ac_includes_default int main () { -return f != crypt; +if ((off_t *) 0) + return 0; +if (sizeof (off_t)) + return 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 +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 @@ -35742,61 +33978,59 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { 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_cv_func_crypt=yes + ac_cv_type_off_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_crypt=no +ac_cv_type_off_t=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_crypt" >&5 -echo "${ECHO_T}$ac_cv_func_crypt" >&6 -if test $ac_cv_func_crypt = yes; then - have_crypt=yes +echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 +echo "${ECHO_T}$ac_cv_type_off_t" >&6 +if test $ac_cv_type_off_t = yes; then + : else - LIBS="$save_LIBS" - echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 -echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 -if test "${ac_cv_lib_crypt_crypt+set}" = set; then +cat >>confdefs.h <<_ACEOF +#define off_t long +_ACEOF + +fi + +echo "$as_me:$LINENO: checking for pid_t" >&5 +echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 +if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcrypt $LIBS" -cat >conftest.$ac_ext <<_ACEOF + 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 crypt (); +$ac_includes_default int main () { -crypt (); +if ((pid_t *) 0) + return 0; +if (sizeof (pid_t)) + return 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 +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 @@ -35810,62 +34044,36 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { 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_cv_lib_crypt_crypt=yes + ac_cv_type_pid_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_crypt_crypt=no +ac_cv_type_pid_t=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 -echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 -if test $ac_cv_lib_crypt_crypt = yes; then - LUTIL_LIBS="$LUTIL_LIBS -lcrypt" - have_crypt=yes +echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 +echo "${ECHO_T}$ac_cv_type_pid_t" >&6 +if test $ac_cv_type_pid_t = yes; then + : else - have_crypt=no -fi - -fi - - - LIBS="$save_LIBS" - - if test $have_crypt = yes ; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_CRYPT 1 +cat >>confdefs.h <<_ACEOF +#define pid_t int _ACEOF - else - { echo "$as_me:$LINENO: WARNING: could not find crypt" >&5 -echo "$as_me: WARNING: could not find crypt" >&2;} - if test $ol_enable_crypt = yes ; then - { { echo "$as_me:$LINENO: error: could not find crypt, select appropriate options or disable" >&5 -echo "$as_me: error: could not find crypt, select appropriate options or disable" >&2;} - { (exit 1); exit 1; }; } - fi - - { echo "$as_me:$LINENO: WARNING: disabling crypt support" >&5 -echo "$as_me: WARNING: disabling crypt support" >&2;} - ol_enable_crypt=no - fi fi -if test $ol_enable_proctitle != no ; then - echo "$as_me:$LINENO: checking for setproctitle" >&5 -echo $ECHO_N "checking for setproctitle... $ECHO_C" >&6 -if test "${ac_cv_func_setproctitle+set}" = set; then +echo "$as_me:$LINENO: checking for ssize_t" >&5 +echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 +if test "${ac_cv_type_ssize_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -35874,54 +34082,21 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define setproctitle to an innocuous variant, in case declares setproctitle. - For example, HP-UX 11i declares gettimeofday. */ -#define setproctitle innocuous_setproctitle - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char setproctitle (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef setproctitle - -/* 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 setproctitle (); -/* 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_setproctitle) || defined (__stub___setproctitle) -choke me -#else -char (*f) () = setproctitle; -#endif -#ifdef __cplusplus -} -#endif - +$ac_includes_default int main () { -return f != setproctitle; +if ((ssize_t *) 0) + return 0; +if (sizeof (ssize_t)) + return 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 +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 @@ -35935,60 +34110,59 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { 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_cv_func_setproctitle=yes + ac_cv_type_ssize_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_setproctitle=no +ac_cv_type_ssize_t=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_setproctitle" >&5 -echo "${ECHO_T}$ac_cv_func_setproctitle" >&6 -if test $ac_cv_func_setproctitle = yes; then - have_setproctitle=yes +echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 +echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 +if test $ac_cv_type_ssize_t = yes; then + : else - echo "$as_me:$LINENO: checking for setproctitle in -lutil" >&5 -echo $ECHO_N "checking for setproctitle in -lutil... $ECHO_C" >&6 -if test "${ac_cv_lib_util_setproctitle+set}" = set; then +cat >>confdefs.h <<_ACEOF +#define ssize_t signed int +_ACEOF + +fi + +echo "$as_me:$LINENO: checking for caddr_t" >&5 +echo $ECHO_N "checking for caddr_t... $ECHO_C" >&6 +if test "${ac_cv_type_caddr_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lutil $LIBS" -cat >conftest.$ac_ext <<_ACEOF + 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 setproctitle (); +$ac_includes_default int main () { -setproctitle (); +if ((caddr_t *) 0) + return 0; +if (sizeof (caddr_t)) + return 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 +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 @@ -36002,78 +34176,55 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { 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_cv_lib_util_setproctitle=yes + ac_cv_type_caddr_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_util_setproctitle=no +ac_cv_type_caddr_t=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_lib_util_setproctitle" >&5 -echo "${ECHO_T}$ac_cv_lib_util_setproctitle" >&6 -if test $ac_cv_lib_util_setproctitle = yes; then - have_setproctitle=yes - LUTIL_LIBS="$LUTIL_LIBS -lutil" +echo "$as_me:$LINENO: result: $ac_cv_type_caddr_t" >&5 +echo "${ECHO_T}$ac_cv_type_caddr_t" >&6 +if test $ac_cv_type_caddr_t = yes; then + : else - have_setproctitle=no - case $LIBOBJS in - "setproctitle.$ac_objext" | \ - *" setproctitle.$ac_objext" | \ - "setproctitle.$ac_objext "* | \ - *" setproctitle.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS setproctitle.$ac_objext" ;; -esac - - LIBSRCS="$LIBSRCS setproctitle.c" -fi - -fi - - - if test $have_setproctitle = yes ; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_SETPROCTITLE 1 +cat >>confdefs.h <<_ACEOF +#define caddr_t char * _ACEOF - fi fi -if test $ol_enable_slp != no ; then - -for ac_header in slp.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 "$as_me:$LINENO: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +if test "${ac_cv_type_size_t+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 + 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> +int +main () +{ +if ((size_t *) 0) + return 0; +if (sizeof (size_t)) + return 0; + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -36097,143 +34248,119 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_type_size_t=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 +fi +echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6 +if test $ac_cv_type_size_t = yes; then + : +else -# 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 +cat >>confdefs.h <<_ACEOF +#define size_t unsigned +_ACEOF + +fi + + +echo "$as_me:$LINENO: checking for long long" >&5 +echo $ECHO_N "checking for long long... $ECHO_C" >&6 +if test "${ac_cv_type_long_long+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. */ -#include <$ac_header> +$ac_includes_default +int +main () +{ +if ((long long *) 0) + return 0; +if (sizeof (long long)) + return 0; + ; + 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 +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); } >/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_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_cv_type_long_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no +ac_cv_type_long_long=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 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" +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 +echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 +echo "${ECHO_T}$ac_cv_type_long_long" >&6 +if test $ac_cv_type_long_long = yes; then -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_LONG_LONG 1 _ACEOF -fi - -done +fi - if test $ac_cv_header_slp_h = yes ; then - echo "$as_me:$LINENO: checking for SLPOpen in -lslp" >&5 -echo $ECHO_N "checking for SLPOpen in -lslp... $ECHO_C" >&6 -if test "${ac_cv_lib_slp_SLPOpen+set}" = set; then +echo "$as_me:$LINENO: checking for ptrdiff_t" >&5 +echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6 +if test "${ac_cv_type_ptrdiff_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lslp $LIBS" -cat >conftest.$ac_ext <<_ACEOF + 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 SLPOpen (); +$ac_includes_default int main () { -SLPOpen (); +if ((ptrdiff_t *) 0) + return 0; +if (sizeof (ptrdiff_t)) + return 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 +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 @@ -36247,76 +34374,60 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { 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_cv_lib_slp_SLPOpen=yes + ac_cv_type_ptrdiff_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_slp_SLPOpen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +ac_cv_type_ptrdiff_t=no fi -echo "$as_me:$LINENO: result: $ac_cv_lib_slp_SLPOpen" >&5 -echo "${ECHO_T}$ac_cv_lib_slp_SLPOpen" >&6 -if test $ac_cv_lib_slp_SLPOpen = yes; then - have_slp=yes -else - have_slp=no +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5 +echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6 +if test $ac_cv_type_ptrdiff_t = yes; then - if test $have_slp = yes ; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SLP 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_PTRDIFF_T 1 _ACEOF - SLAPD_SLP_LIBS=-lslp - fi - elif test $ol_enable_slp = yes ; then - { { echo "$as_me:$LINENO: error: SLP not found" >&5 -echo "$as_me: error: SLP not found" >&2;} - { (exit 1); exit 1; }; } - fi fi -if test "$ol_with_multiple_precision" != "no" ; then - ol_have_bignum=no - ol_have_gmp=no - - -for ac_header in openssl/bn.h bn.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 "$as_me:$LINENO: checking for socklen_t" >&5 +echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 +if test "${ac_cv_type_socklen_t+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 + 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_SYS_SOCKET_H +#include +#endif + + +int +main () +{ +if ((socklen_t *) 0) + return 0; +if (sizeof (socklen_t)) + return 0; + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -36340,134 +34451,123 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_type_socklen_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_type_socklen_t=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 +fi +echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5 +echo "${ECHO_T}$ac_cv_type_socklen_t" >&6 +if test $ac_cv_type_socklen_t = yes; then + : +else -# 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 +cat >>confdefs.h <<_ACEOF +#define socklen_t int +_ACEOF + +fi + + +echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 +if test "${ac_cv_type_signal+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. */ -#include <$ac_header> +#include +#include +#ifdef signal +# undef signal +#endif +#ifdef __cplusplus +extern "C" void (*signal (int, void (*)(int)))(int); +#else +void (*signal ()) (); +#endif + +int +main () +{ +int i; + ; + 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 +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); } >/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_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_cv_type_signal=void else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no +ac_cv_type_signal=int 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 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" +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 +echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +echo "${ECHO_T}$ac_cv_type_signal" >&6 -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +cat >>confdefs.h <<_ACEOF +#define RETSIGTYPE $ac_cv_type_signal _ACEOF -fi - -done - -for ac_header in openssl/crypto.h crypto.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 "$as_me:$LINENO: checking for sig_atomic_t" >&5 +echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6 +if test "${ac_cv_type_sig_atomic_t+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 + 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> +#include + + +int +main () +{ +if ((sig_atomic_t *) 0) + return 0; +if (sizeof (sig_atomic_t)) + return 0; + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -36491,133 +34591,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_type_sig_atomic_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_type_sig_atomic_t=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 +fi +echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5 +echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6 +if test $ac_cv_type_sig_atomic_t = yes; then + : +else -# 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 +cat >>confdefs.h <<_ACEOF +#define sig_atomic_t int +_ACEOF + +fi + + +echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 +echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 +if test "${ac_cv_type_uid_t+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. */ -#include <$ac_header> +#include + _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 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "uid_t" >/dev/null 2>&1; then + ac_cv_type_uid_t=yes else - ac_cpp_err=yes + ac_cv_type_uid_t=no 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 +rm -f conftest* - 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 +echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 +echo "${ECHO_T}$ac_cv_type_uid_t" >&6 +if test $ac_cv_type_uid_t = no; then -# 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 +cat >>confdefs.h <<\_ACEOF +#define uid_t int +_ACEOF -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + +cat >>confdefs.h <<\_ACEOF +#define gid_t int _ACEOF fi -done - -for ac_header in gmp.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 "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +if test "${ac_cv_header_time+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 + 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> +#include +#include +#include + +int +main () +{ +if ((struct tm *) 0) +return 0; + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -36641,163 +34698,50 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_time=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_time=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 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 +echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 +echo "${ECHO_T}$ac_cv_header_time" >&6 +if test $ac_cv_header_time = yes; then -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +cat >>confdefs.h <<\_ACEOF +#define TIME_WITH_SYS_TIME 1 _ACEOF fi -done - - - if test "$ol_with_tls" = "found" ; then - 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 - ol_have_bn_h=yes - fi - - if test "$ac_cv_header_openssl_crypto_h" = "yes" \ - -o "$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 - ol_have_bignum=yes - fi - fi - - if test $ac_cv_header_gmp_h = yes ; then - echo "$as_me:$LINENO: checking for __gmpz_add_ui in -lgmp" >&5 -echo $ECHO_N "checking for __gmpz_add_ui in -lgmp... $ECHO_C" >&6 -if test "${ac_cv_lib_gmp___gmpz_add_ui+set}" = set; then +echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 +echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6 +if test "${ac_cv_struct_tm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgmp $LIBS" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include +#include -/* 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 __gmpz_add_ui (); int main () { -__gmpz_add_ui (); +struct tm *tp; tp->tm_sec; ; 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 +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 @@ -36811,107 +34755,34 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { 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_cv_lib_gmp___gmpz_add_ui=yes + ac_cv_struct_tm=time.h else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_gmp___gmpz_add_ui=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +ac_cv_struct_tm=sys/time.h fi -echo "$as_me:$LINENO: result: $ac_cv_lib_gmp___gmpz_add_ui" >&5 -echo "${ECHO_T}$ac_cv_lib_gmp___gmpz_add_ui" >&6 -if test $ac_cv_lib_gmp___gmpz_add_ui = yes; then - have_gmp=yes -else - have_gmp=no +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - - if test $have_gmp = yes ; then - ol_have_gmp=yes - fi - fi - - echo "$as_me:$LINENO: checking for multiple precision support" >&5 -echo $ECHO_N "checking for multiple precision support... $ECHO_C" >&6 - - ol_mp_support="none" - case "$ol_with_multiple_precision" in - auto) - if test "$ol_have_bignum" = "yes" ; then - ol_mp_support="bignum" - else - if test "$ol_have_gmp" = "yes" ; then - ol_mp_support="gmp" - fi - fi - ;; - bignum) - if test "$ol_have_bignum" != "yes" ; then - { { echo "$as_me:$LINENO: error: OpenSSL's BIGNUM not available" >&5 -echo "$as_me: error: OpenSSL's BIGNUM not available" >&2;} - { (exit 1); exit 1; }; } - fi - ol_mp_support="bignum" - ;; - gmp) - if test "$ol_have_gmp" != "yes" ; then - { { echo "$as_me:$LINENO: error: GMP not available" >&5 -echo "$as_me: error: GMP not available" >&2;} - { (exit 1); exit 1; }; } - fi - ol_mp_support="gmp" - ;; - yes) - if test "$ol_have_bignum" = "yes" ; then - ol_mp_support="bignum" - elif test "$ol_have_gmp" = "yes" ; then - ol_mp_support="gmp" - else - { { echo "$as_me:$LINENO: error: not available" >&5 -echo "$as_me: error: not available" >&2;} - { (exit 1); exit 1; }; } - fi - ;; - esac - - case "$ol_mp_support" in - bignum) - -cat >>confdefs.h <<\_ACEOF -#define HAVE_BIGNUM 1 -_ACEOF - - ;; - gmp) +echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 +echo "${ECHO_T}$ac_cv_struct_tm" >&6 +if test $ac_cv_struct_tm = sys/time.h; then cat >>confdefs.h <<\_ACEOF -#define HAVE_GMP 1 +#define TM_IN_SYS_TIME 1 _ACEOF - SLAPD_GMP_LIBS=-lgmp - ;; - none) - ;; - esac - - echo "$as_me:$LINENO: result: $ol_mp_support" >&5 -echo "${ECHO_T}$ol_mp_support" >&6 fi - -echo "$as_me:$LINENO: checking for mode_t" >&5 -echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 -if test "${ac_cv_type_mode_t+set}" = set; then +echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5 +echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6 +if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -36921,13 +34792,12 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -int -main () -{ -if ((mode_t *) 0) - return 0; -if (sizeof (mode_t)) - return 0; +int +main () +{ +static struct stat ac_aggr; +if (ac_aggr.st_blksize) +return 0; ; return 0; } @@ -36954,33 +34824,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_mode_t=yes + ac_cv_member_struct_stat_st_blksize=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_mode_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 -echo "${ECHO_T}$ac_cv_type_mode_t" >&6 -if test $ac_cv_type_mode_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define mode_t int -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for off_t" >&5 -echo $ECHO_N "checking for off_t... $ECHO_C" >&6 -if test "${ac_cv_type_off_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -36990,10 +34839,9 @@ $ac_includes_default int main () { -if ((off_t *) 0) - return 0; -if (sizeof (off_t)) - return 0; +static struct stat ac_aggr; +if (sizeof ac_aggr.st_blksize) +return 0; ; return 0; } @@ -37020,30 +34868,31 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_off_t=yes + ac_cv_member_struct_stat_st_blksize=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_off_t=no +ac_cv_member_struct_stat_st_blksize=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -echo "${ECHO_T}$ac_cv_type_off_t" >&6 -if test $ac_cv_type_off_t = yes; then - : -else +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5 +echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6 +if test $ac_cv_member_struct_stat_st_blksize = yes; then cat >>confdefs.h <<_ACEOF -#define off_t long +#define HAVE_STRUCT_STAT_ST_BLKSIZE 1 _ACEOF + fi -echo "$as_me:$LINENO: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 -if test "${ac_cv_type_pid_t+set}" = set; then +echo "$as_me:$LINENO: checking for struct passwd.pw_gecos" >&5 +echo $ECHO_N "checking for struct passwd.pw_gecos... $ECHO_C" >&6 +if test "${ac_cv_member_struct_passwd_pw_gecos+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -37053,13 +34902,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +#include + int main () { -if ((pid_t *) 0) - return 0; -if (sizeof (pid_t)) - return 0; +static struct passwd ac_aggr; +if (ac_aggr.pw_gecos) +return 0; ; return 0; } @@ -37086,46 +34936,26 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_pid_t=yes + ac_cv_member_struct_passwd_pw_gecos=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_pid_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6 -if test $ac_cv_type_pid_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define pid_t int -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for ssize_t" >&5 -echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 -if test "${ac_cv_type_ssize_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF +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 + int main () { -if ((ssize_t *) 0) - return 0; -if (sizeof (ssize_t)) - return 0; +static struct passwd ac_aggr; +if (sizeof ac_aggr.pw_gecos) +return 0; ; return 0; } @@ -37152,30 +34982,31 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_ssize_t=yes + ac_cv_member_struct_passwd_pw_gecos=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_ssize_t=no +ac_cv_member_struct_passwd_pw_gecos=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 -echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 -if test $ac_cv_type_ssize_t = yes; then - : -else +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_gecos" >&5 +echo "${ECHO_T}$ac_cv_member_struct_passwd_pw_gecos" >&6 +if test $ac_cv_member_struct_passwd_pw_gecos = yes; then cat >>confdefs.h <<_ACEOF -#define ssize_t signed int +#define HAVE_STRUCT_PASSWD_PW_GECOS 1 _ACEOF + fi -echo "$as_me:$LINENO: checking for caddr_t" >&5 -echo $ECHO_N "checking for caddr_t... $ECHO_C" >&6 -if test "${ac_cv_type_caddr_t+set}" = set; then +echo "$as_me:$LINENO: checking for struct passwd.pw_passwd" >&5 +echo $ECHO_N "checking for struct passwd.pw_passwd... $ECHO_C" >&6 +if test "${ac_cv_member_struct_passwd_pw_passwd+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -37185,13 +35016,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +#include + int main () { -if ((caddr_t *) 0) - return 0; -if (sizeof (caddr_t)) - return 0; +static struct passwd ac_aggr; +if (ac_aggr.pw_passwd) +return 0; ; return 0; } @@ -37218,46 +35050,26 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_caddr_t=yes + ac_cv_member_struct_passwd_pw_passwd=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_caddr_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_caddr_t" >&5 -echo "${ECHO_T}$ac_cv_type_caddr_t" >&6 -if test $ac_cv_type_caddr_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define caddr_t char * -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF +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 + int main () { -if ((size_t *) 0) - return 0; -if (sizeof (size_t)) - return 0; +static struct passwd ac_aggr; +if (sizeof ac_aggr.pw_passwd) +return 0; ; return 0; } @@ -37284,96 +35096,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_size_t=yes + ac_cv_member_struct_passwd_pw_passwd=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_size_t=no +ac_cv_member_struct_passwd_pw_passwd=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 -if test $ac_cv_type_size_t = yes; then - : -else +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_passwd" >&5 +echo "${ECHO_T}$ac_cv_member_struct_passwd_pw_passwd" >&6 +if test $ac_cv_member_struct_passwd_pw_passwd = yes; then cat >>confdefs.h <<_ACEOF -#define size_t unsigned +#define HAVE_STRUCT_PASSWD_PW_PASSWD 1 _ACEOF + fi -echo "$as_me:$LINENO: checking for long long" >&5 -echo $ECHO_N "checking for long long... $ECHO_C" >&6 -if test "${ac_cv_type_long_long+set}" = set; then +echo "$as_me:$LINENO: checking if toupper() requires islower()" >&5 +echo $ECHO_N "checking if toupper() requires islower()... $ECHO_C" >&6 +if test "${ol_cv_c_upper_lower+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + if test "$cross_compiling" = yes; then + ol_cv_c_upper_lower=safe +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 -int -main () + +#include +main() { -if ((long long *) 0) - return 0; -if (sizeof (long long)) - return 0; - ; - return 0; + if ('C' == toupper('C')) + exit(0); + else + exit(1); } _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 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + (exit $ac_status); } && { ac_try='./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_type_long_long=yes + ol_cv_c_upper_lower=no else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_long_long=no +( exit $ac_status ) +ol_cv_c_upper_lower=yes fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 -echo "${ECHO_T}$ac_cv_type_long_long" >&6 -if test $ac_cv_type_long_long = yes; then +fi +echo "$as_me:$LINENO: result: $ol_cv_c_upper_lower" >&5 +echo "${ECHO_T}$ol_cv_c_upper_lower" >&6 +if test $ol_cv_c_upper_lower != no ; then -cat >>confdefs.h <<_ACEOF -#define HAVE_LONG_LONG 1 +cat >>confdefs.h <<\_ACEOF +#define C_UPPER_LOWER 1 _ACEOF - fi -echo "$as_me:$LINENO: checking for ptrdiff_t" >&5 -echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6 -if test "${ac_cv_type_ptrdiff_t+set}" = set; then +echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 +if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -37382,14 +35188,57 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + int main () { -if ((ptrdiff_t *) 0) - return 0; -if (sizeof (ptrdiff_t)) - return 0; +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset x; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *ccp; + char **p; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + ccp = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++ccp; + p = (char**) ccp; + ccp = (char const *const *) p; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + } +#endif + ; return 0; } @@ -37416,30 +35265,28 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_ptrdiff_t=yes + ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_ptrdiff_t=no +ac_cv_c_const=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5 -echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6 -if test $ac_cv_type_ptrdiff_t = yes; then +echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6 +if test $ac_cv_c_const = no; then -cat >>confdefs.h <<_ACEOF -#define HAVE_PTRDIFF_T 1 +cat >>confdefs.h <<\_ACEOF +#define const _ACEOF - fi - -echo "$as_me:$LINENO: checking for socklen_t" >&5 -echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 -if test "${ac_cv_type_socklen_t+set}" = set; then +echo "$as_me:$LINENO: checking if compiler understands volatile" >&5 +echo $ECHO_N "checking if compiler understands volatile... $ECHO_C" >&6 +if test "${ol_cv_c_volatile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -37448,19 +35295,13 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#ifdef HAVE_SYS_SOCKET_H -#include -#endif - - +int x, y, z; int main () { -if ((socklen_t *) 0) - return 0; -if (sizeof (socklen_t)) - return 0; +volatile int a; int * volatile b = x ? &y : &z; + /* Older MIPS compilers (eg., in Ultrix 4.2) don't like *b = 0 */ + *b = 0; ; return 0; } @@ -37487,54 +35328,59 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_socklen_t=yes + ol_cv_c_volatile=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_socklen_t=no +ol_cv_c_volatile=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5 -echo "${ECHO_T}$ac_cv_type_socklen_t" >&6 -if test $ac_cv_type_socklen_t = yes; then - : -else +echo "$as_me:$LINENO: result: $ol_cv_c_volatile" >&5 +echo "${ECHO_T}$ol_cv_c_volatile" >&6 + if test $ol_cv_c_volatile = yes; then + : + else -cat >>confdefs.h <<_ACEOF -#define socklen_t int +cat >>confdefs.h <<\_ACEOF +#define volatile _ACEOF -fi + fi -echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 -if test "${ac_cv_type_signal+set}" = set; then +if test $cross_compiling = yes ; then + { echo "$as_me:$LINENO: WARNING: Crossing compiling... all bets are off!" >&5 +echo "$as_me: WARNING: Crossing compiling... all bets are off!" >&2;} + +cat >>confdefs.h <<\_ACEOF +#define CROSS_COMPILING 1 +_ACEOF + +else + echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 +if test "${ac_cv_c_bigendian+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + # See if sys/param.h defines the BYTE_ORDER macro. +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include -#ifdef signal -# undef signal -#endif -#ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); -#endif +#include int main () { -int i; +#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN + bogus endian macros +#endif + ; return 0; } @@ -37561,46 +35407,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_signal=void -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_signal=int -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6 - -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal -_ACEOF - - - -echo "$as_me:$LINENO: checking for sig_atomic_t" >&5 -echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6 -if test "${ac_cv_type_sig_atomic_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF + # It does; now see whether it defined to BIG_ENDIAN or not. +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 +#include int main () { -if ((sig_atomic_t *) 0) - return 0; -if (sizeof (sig_atomic_t)) - return 0; +#if BYTE_ORDER != BIG_ENDIAN + not big endian +#endif + ; return 0; } @@ -37627,87 +35450,38 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_sig_atomic_t=yes + ac_cv_c_bigendian=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_sig_atomic_t=no +ac_cv_c_bigendian=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5 -echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6 -if test $ac_cv_type_sig_atomic_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define sig_atomic_t int -_ACEOF - -fi - - -echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 -if test "${ac_cv_type_uid_t+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. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1; then - ac_cv_type_uid_t=yes else - ac_cv_type_uid_t=no -fi -rm -f conftest* - -fi -echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 -echo "${ECHO_T}$ac_cv_type_uid_t" >&6 -if test $ac_cv_type_uid_t = no; then - -cat >>confdefs.h <<\_ACEOF -#define uid_t int -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define gid_t int -_ACEOF - -fi - + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 -if test "${ac_cv_header_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +# It does not; compile a test program. +if test "$cross_compiling" = yes; then + # try to guess the endianness by grepping values into an object file + ac_cv_c_bigendian=unknown cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include -#include - +short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } +short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; +void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } int main () { -if ((struct tm *) 0) -return 0; + _ascii (); _ebcdic (); ; return 0; } @@ -37734,29 +35508,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_header_time=yes + if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then + ac_cv_c_bigendian=yes +fi +if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_time=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6 -if test $ac_cv_header_time = yes; then - -cat >>confdefs.h <<\_ACEOF -#define TIME_WITH_SYS_TIME 1 -_ACEOF - -fi - -echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 -echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6 -if test "${ac_cv_struct_tm+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -37764,61 +35532,68 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include - int main () { -struct tm *tp; tp->tm_sec; - ; - return 0; + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long l; + char c[sizeof (long)]; + } u; + u.l = 1; + exit (u.c[sizeof (long) - 1] == 1); } _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 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + (exit $ac_status); } && { ac_try='./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_struct_tm=time.h + ac_cv_c_bigendian=no else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_struct_tm=sys/time.h +( exit $ac_status ) +ac_cv_c_bigendian=yes +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 -echo "${ECHO_T}$ac_cv_struct_tm" >&6 -if test $ac_cv_struct_tm = sys/time.h; then +echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +echo "${ECHO_T}$ac_cv_c_bigendian" >&6 +case $ac_cv_c_bigendian in + yes) cat >>confdefs.h <<\_ACEOF -#define TM_IN_SYS_TIME 1 +#define WORDS_BIGENDIAN 1 _ACEOF + ;; + no) + ;; + *) + { { echo "$as_me:$LINENO: error: unknown endianness +presetting ac_cv_c_bigendian=no (or yes) will help" >&5 +echo "$as_me: error: unknown endianness +presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} + { (exit 1); exit 1; }; } ;; +esac fi -echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5 -echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6 -if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then +echo "$as_me:$LINENO: checking for short" >&5 +echo $ECHO_N "checking for short... $ECHO_C" >&6 +if test "${ac_cv_type_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -37831,9 +35606,10 @@ $ac_includes_default int main () { -static struct stat ac_aggr; -if (ac_aggr.st_blksize) -return 0; +if ((short *) 0) + return 0; +if (sizeof (short)) + return 0; ; return 0; } @@ -37860,11 +35636,30 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_struct_stat_st_blksize=yes + ac_cv_type_short=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_type_short=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 +echo "${ECHO_T}$ac_cv_type_short" >&6 + +echo "$as_me:$LINENO: checking size of short" >&5 +echo $ECHO_N "checking size of short... $ECHO_C" >&6 +if test "${ac_cv_sizeof_short+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_short" = yes; then + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -37875,9 +35670,9 @@ $ac_includes_default int main () { -static struct stat ac_aggr; -if (sizeof ac_aggr.st_blksize) -return 0; +static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)]; +test_array [0] = 0 + ; return 0; } @@ -37904,48 +35699,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_struct_stat_st_blksize=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_member_struct_stat_st_blksize=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5 -echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6 -if test $ac_cv_member_struct_stat_st_blksize = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_BLKSIZE 1 -_ACEOF - - -fi - -echo "$as_me:$LINENO: checking for struct passwd.pw_gecos" >&5 -echo $ECHO_N "checking for struct passwd.pw_gecos... $ECHO_C" >&6 -if test "${ac_cv_member_struct_passwd_pw_gecos+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF + ac_lo=0 ac_mid=0 + while :; do + 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 - int main () { -static struct passwd ac_aggr; -if (ac_aggr.pw_gecos) -return 0; +static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } @@ -37972,7 +35740,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_struct_passwd_pw_gecos=yes + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -37984,14 +35765,12 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include - int main () { -static struct passwd ac_aggr; -if (sizeof ac_aggr.pw_gecos) -return 0; +static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)]; +test_array [0] = 0 + ; return 0; } @@ -38018,48 +35797,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_struct_passwd_pw_gecos=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_member_struct_passwd_pw_gecos=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_gecos" >&5 -echo "${ECHO_T}$ac_cv_member_struct_passwd_pw_gecos" >&6 -if test $ac_cv_member_struct_passwd_pw_gecos = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_PASSWD_PW_GECOS 1 -_ACEOF - - -fi - -echo "$as_me:$LINENO: checking for struct passwd.pw_passwd" >&5 -echo $ECHO_N "checking for struct passwd.pw_passwd... $ECHO_C" >&6 -if test "${ac_cv_member_struct_passwd_pw_passwd+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF + ac_hi=-1 ac_mid=-1 + while :; do + 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 - int main () { -static struct passwd ac_aggr; -if (ac_aggr.pw_passwd) -return 0; +static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)]; +test_array [0] = 0 + ; return 0; } @@ -38086,26 +35838,45 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_struct_passwd_pw_passwd=yes + ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo= ac_hi= +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + 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 - int main () { -static struct passwd ac_aggr; -if (sizeof ac_aggr.pw_passwd) -return 0; +static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } @@ -38132,37 +35903,30 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_struct_passwd_pw_passwd=yes + ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct_passwd_pw_passwd=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +ac_lo=`expr '(' $ac_mid ')' + 1` fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_passwd" >&5 -echo "${ECHO_T}$ac_cv_member_struct_passwd_pw_passwd" >&6 -if test $ac_cv_member_struct_passwd_pw_passwd = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_PASSWD_PW_PASSWD 1 -_ACEOF - - -fi - - -echo "$as_me:$LINENO: checking if toupper() requires islower()" >&5 -echo $ECHO_N "checking if toupper() requires islower()... $ECHO_C" >&6 -if test "${ol_cv_c_upper_lower+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +done +case $ac_lo in +?*) ac_cv_sizeof_short=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (short), 77 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } ;; +esac else - - if test "$cross_compiling" = yes; then - ol_cv_c_upper_lower=safe + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -38170,14 +35934,36 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -#include -main() +$ac_includes_default +long longval () { return (long) (sizeof (short)); } +unsigned long ulongval () { return (long) (sizeof (short)); } +#include +#include +int +main () { - if ('C' == toupper('C')) - exit(0); - else - exit(1); + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + exit (1); + if (((long) (sizeof (short))) < 0) + { + long i = longval (); + if (i != ((long) (sizeof (short)))) + exit (1); + fprintf (f, "%ld\n", i); + } + else + { + unsigned long i = ulongval (); + if (i != ((long) (sizeof (short)))) + exit (1); + fprintf (f, "%lu\n", i); + } + exit (ferror (f) || fclose (f) != 0); + + ; + return 0; } _ACEOF rm -f conftest$ac_exeext @@ -38191,31 +35977,37 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_c_upper_lower=no + ac_cv_sizeof_short=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -ol_cv_c_upper_lower=yes +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (short), 77 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $ol_cv_c_upper_lower" >&5 -echo "${ECHO_T}$ol_cv_c_upper_lower" >&6 -if test $ol_cv_c_upper_lower != no ; then - -cat >>confdefs.h <<\_ACEOF -#define C_UPPER_LOWER 1 +rm -f conftest.val +else + ac_cv_sizeof_short=0 +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 +echo "${ECHO_T}$ac_cv_sizeof_short" >&6 +cat >>confdefs.h <<_ACEOF +#define SIZEOF_SHORT $ac_cv_sizeof_short _ACEOF -fi -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 -if test "${ac_cv_c_const+set}" = set; then +echo "$as_me:$LINENO: checking for int" >&5 +echo $ECHO_N "checking for int... $ECHO_C" >&6 +if test "${ac_cv_type_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -38224,57 +36016,14 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +$ac_includes_default int main () { -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset x; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - ccp = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++ccp; - p = (char**) ccp; - ccp = (char const *const *) p; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - } -#endif - +if ((int *) 0) + return 0; +if (sizeof (int)) + return 0; ; return 0; } @@ -38301,43 +36050,84 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_c_const=yes + ac_cv_type_int=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_c_const=no +ac_cv_type_int=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 -if test $ac_cv_c_const = no; then - -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF - -fi +echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 +echo "${ECHO_T}$ac_cv_type_int" >&6 -echo "$as_me:$LINENO: checking if compiler understands volatile" >&5 -echo $ECHO_N "checking if compiler understands volatile... $ECHO_C" >&6 -if test "${ol_cv_c_volatile+set}" = set; then +echo "$as_me:$LINENO: checking size of int" >&5 +echo $ECHO_N "checking size of int... $ECHO_C" >&6 +if test "${ac_cv_sizeof_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + if test "$ac_cv_type_int" = yes; then + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -int x, y, z; +$ac_includes_default int main () { -volatile int a; int * volatile b = x ? &y : &z; - /* Older MIPS compilers (eg., in Ultrix 4.2) don't like *b = 0 */ - *b = 0; +static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_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_lo=0 ac_mid=0 + while :; do + 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 +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } @@ -38364,58 +36154,36 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ol_cv_c_volatile=yes + ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ol_cv_c_volatile=no +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ol_cv_c_volatile" >&5 -echo "${ECHO_T}$ol_cv_c_volatile" >&6 - if test $ol_cv_c_volatile = yes; then - : - else - -cat >>confdefs.h <<\_ACEOF -#define volatile -_ACEOF - - fi - - -if test $cross_compiling = yes ; then - { echo "$as_me:$LINENO: WARNING: Crossing compiling... all bets are off!" >&5 -echo "$as_me: WARNING: Crossing compiling... all bets are off!" >&2;} - -cat >>confdefs.h <<\_ACEOF -#define CROSS_COMPILING 1 -_ACEOF - -else - echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 -if test "${ac_cv_c_bigendian+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + done else - # See if sys/param.h defines the BYTE_ORDER macro. + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include - +$ac_includes_default int main () { -#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN - bogus endian macros -#endif +static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; +test_array [0] = 0 ; return 0; @@ -38443,22 +36211,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - # It does; now see whether it defined to BIG_ENDIAN or not. -cat >conftest.$ac_ext <<_ACEOF + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include - +$ac_includes_default int main () { -#if BYTE_ORDER != BIG_ENDIAN - not big endian -#endif +static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; +test_array [0] = 0 ; return 0; @@ -38486,38 +36252,45 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_c_bigendian=yes + ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_c_bigendian=no +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -# It does not; compile a test program. -if test "$cross_compiling" = yes; then - # try to guess the endianness by grepping values into an object file - ac_cv_c_bigendian=unknown +ac_lo= ac_hi= +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } -short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } +$ac_includes_default int main () { - _ascii (); _ebcdic (); +static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } @@ -38544,23 +36317,30 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then - ac_cv_c_bigendian=yes -fi -if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi -fi + ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_lo=`expr '(' $ac_mid ')' + 1` fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_int=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (int), 77 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } ;; +esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -38568,17 +36348,36 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +$ac_includes_default +long longval () { return (long) (sizeof (int)); } +unsigned long ulongval () { return (long) (sizeof (int)); } +#include +#include int main () { - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long l; - char c[sizeof (long)]; - } u; - u.l = 1; - exit (u.c[sizeof (long) - 1] == 1); + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + exit (1); + if (((long) (sizeof (int))) < 0) + { + long i = longval (); + if (i != ((long) (sizeof (int)))) + exit (1); + fprintf (f, "%ld\n", i); + } + else + { + unsigned long i = ulongval (); + if (i != ((long) (sizeof (int)))) + exit (1); + fprintf (f, "%lu\n", i); + } + exit (ferror (f) || fclose (f) != 0); + + ; + return 0; } _ACEOF rm -f conftest$ac_exeext @@ -38592,44 +36391,37 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_c_bigendian=no + ac_cv_sizeof_int=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -ac_cv_c_bigendian=yes +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (int), 77 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.val +else + ac_cv_sizeof_int=0 fi -echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6 -case $ac_cv_c_bigendian in - yes) - -cat >>confdefs.h <<\_ACEOF -#define WORDS_BIGENDIAN 1 +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 +echo "${ECHO_T}$ac_cv_sizeof_int" >&6 +cat >>confdefs.h <<_ACEOF +#define SIZEOF_INT $ac_cv_sizeof_int _ACEOF - ;; - no) - ;; - *) - { { echo "$as_me:$LINENO: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -echo "$as_me: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} - { (exit 1); exit 1; }; } ;; -esac -fi -echo "$as_me:$LINENO: checking for short" >&5 -echo $ECHO_N "checking for short... $ECHO_C" >&6 -if test "${ac_cv_type_short+set}" = set; then +echo "$as_me:$LINENO: checking for long" >&5 +echo $ECHO_N "checking for long... $ECHO_C" >&6 +if test "${ac_cv_type_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -38642,9 +36434,9 @@ $ac_includes_default int main () { -if ((short *) 0) +if ((long *) 0) return 0; -if (sizeof (short)) +if (sizeof (long)) return 0; ; return 0; @@ -38672,24 +36464,24 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_short=yes + ac_cv_type_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_short=no +ac_cv_type_long=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 -echo "${ECHO_T}$ac_cv_type_short" >&6 +echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 +echo "${ECHO_T}$ac_cv_type_long" >&6 -echo "$as_me:$LINENO: checking size of short" >&5 -echo $ECHO_N "checking size of short... $ECHO_C" >&6 -if test "${ac_cv_sizeof_short+set}" = set; then +echo "$as_me:$LINENO: checking size of long" >&5 +echo $ECHO_N "checking size of long... $ECHO_C" >&6 +if test "${ac_cv_sizeof_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_short" = yes; then + if test "$ac_cv_type_long" = yes; then # The cast to unsigned long works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -38706,7 +36498,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; test_array [0] = 0 ; @@ -38747,7 +36539,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -38804,7 +36596,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; test_array [0] = 0 ; @@ -38845,7 +36637,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; test_array [0] = 0 ; @@ -38910,7 +36702,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -38949,10 +36741,10 @@ fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in -?*) ac_cv_sizeof_short=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +?*) ac_cv_sizeof_long=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (short), 77 +echo "$as_me: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } ;; esac @@ -38971,8 +36763,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (short)); } -unsigned long ulongval () { return (long) (sizeof (short)); } +long longval () { return (long) (sizeof (long)); } +unsigned long ulongval () { return (long) (sizeof (long)); } #include #include int @@ -38982,17 +36774,17 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) exit (1); - if (((long) (sizeof (short))) < 0) + if (((long) (sizeof (long))) < 0) { long i = longval (); - if (i != ((long) (sizeof (short)))) + if (i != ((long) (sizeof (long)))) exit (1); fprintf (f, "%ld\n", i); } else { unsigned long i = ulongval (); - if (i != ((long) (sizeof (short)))) + if (i != ((long) (sizeof (long)))) exit (1); fprintf (f, "%lu\n", i); } @@ -39013,16 +36805,16 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sizeof_short=`cat conftest.val` + ac_cv_sizeof_long=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (short), 77 +echo "$as_me: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -39031,19 +36823,19 @@ fi fi rm -f conftest.val else - ac_cv_sizeof_short=0 + ac_cv_sizeof_long=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 -echo "${ECHO_T}$ac_cv_sizeof_short" >&6 +echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6 cat >>confdefs.h <<_ACEOF -#define SIZEOF_SHORT $ac_cv_sizeof_short +#define SIZEOF_LONG $ac_cv_sizeof_long _ACEOF -echo "$as_me:$LINENO: checking for int" >&5 -echo $ECHO_N "checking for int... $ECHO_C" >&6 -if test "${ac_cv_type_int+set}" = set; then +echo "$as_me:$LINENO: checking for long long" >&5 +echo $ECHO_N "checking for long long... $ECHO_C" >&6 +if test "${ac_cv_type_long_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -39056,9 +36848,9 @@ $ac_includes_default int main () { -if ((int *) 0) +if ((long long *) 0) return 0; -if (sizeof (int)) +if (sizeof (long long)) return 0; ; return 0; @@ -39086,24 +36878,24 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_int=yes + ac_cv_type_long_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_int=no +ac_cv_type_long_long=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 -echo "${ECHO_T}$ac_cv_type_int" >&6 +echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 +echo "${ECHO_T}$ac_cv_type_long_long" >&6 -echo "$as_me:$LINENO: checking size of int" >&5 -echo $ECHO_N "checking size of int... $ECHO_C" >&6 -if test "${ac_cv_sizeof_int+set}" = set; then +echo "$as_me:$LINENO: checking size of long long" >&5 +echo $ECHO_N "checking size of long long... $ECHO_C" >&6 +if test "${ac_cv_sizeof_long_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_int" = yes; then + if test "$ac_cv_type_long_long" = yes; then # The cast to unsigned long works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -39120,7 +36912,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)]; test_array [0] = 0 ; @@ -39161,7 +36953,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -39218,7 +37010,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)]; test_array [0] = 0 ; @@ -39259,7 +37051,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)]; test_array [0] = 0 ; @@ -39324,7 +37116,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -39363,10 +37155,10 @@ fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in -?*) ac_cv_sizeof_int=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +?*) ac_cv_sizeof_long_long=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (int), 77 +echo "$as_me: error: cannot compute sizeof (long long), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } ;; esac @@ -39385,8 +37177,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (int)); } -unsigned long ulongval () { return (long) (sizeof (int)); } +long longval () { return (long) (sizeof (long long)); } +unsigned long ulongval () { return (long) (sizeof (long long)); } #include #include int @@ -39396,17 +37188,17 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) exit (1); - if (((long) (sizeof (int))) < 0) + if (((long) (sizeof (long long))) < 0) { long i = longval (); - if (i != ((long) (sizeof (int)))) + if (i != ((long) (sizeof (long long)))) exit (1); fprintf (f, "%ld\n", i); } else { unsigned long i = ulongval (); - if (i != ((long) (sizeof (int)))) + if (i != ((long) (sizeof (long long)))) exit (1); fprintf (f, "%lu\n", i); } @@ -39427,16 +37219,16 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sizeof_int=`cat conftest.val` + ac_cv_sizeof_long_long=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (int), 77 +echo "$as_me: error: cannot compute sizeof (long long), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -39445,19 +37237,19 @@ fi fi rm -f conftest.val else - ac_cv_sizeof_int=0 + ac_cv_sizeof_long_long=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 -echo "${ECHO_T}$ac_cv_sizeof_int" >&6 +echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6 cat >>confdefs.h <<_ACEOF -#define SIZEOF_INT $ac_cv_sizeof_int +#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long _ACEOF -echo "$as_me:$LINENO: checking for long" >&5 -echo $ECHO_N "checking for long... $ECHO_C" >&6 -if test "${ac_cv_type_long+set}" = set; then +echo "$as_me:$LINENO: checking for wchar_t" >&5 +echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 +if test "${ac_cv_type_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -39470,9 +37262,9 @@ $ac_includes_default int main () { -if ((long *) 0) +if ((wchar_t *) 0) return 0; -if (sizeof (long)) +if (sizeof (wchar_t)) return 0; ; return 0; @@ -39500,24 +37292,24 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_long=yes + ac_cv_type_wchar_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_long=no +ac_cv_type_wchar_t=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 -echo "${ECHO_T}$ac_cv_type_long" >&6 +echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5 +echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 -echo "$as_me:$LINENO: checking size of long" >&5 -echo $ECHO_N "checking size of long... $ECHO_C" >&6 -if test "${ac_cv_sizeof_long+set}" = set; then +echo "$as_me:$LINENO: checking size of wchar_t" >&5 +echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 +if test "${ac_cv_sizeof_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_long" = yes; then + if test "$ac_cv_type_wchar_t" = yes; then # The cast to unsigned long works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -39534,7 +37326,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) >= 0)]; test_array [0] = 0 ; @@ -39575,7 +37367,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) <= $ac_mid)]; test_array [0] = 0 ; @@ -39632,7 +37424,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) < 0)]; test_array [0] = 0 ; @@ -39673,7 +37465,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) >= $ac_mid)]; test_array [0] = 0 ; @@ -39738,7 +37530,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) <= $ac_mid)]; test_array [0] = 0 ; @@ -39777,10 +37569,10 @@ fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in -?*) ac_cv_sizeof_long=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +?*) ac_cv_sizeof_wchar_t=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (wchar_t), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long), 77 +echo "$as_me: error: cannot compute sizeof (wchar_t), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } ;; esac @@ -39799,8 +37591,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (long)); } -unsigned long ulongval () { return (long) (sizeof (long)); } +long longval () { return (long) (sizeof (wchar_t)); } +unsigned long ulongval () { return (long) (sizeof (wchar_t)); } #include #include int @@ -39810,17 +37602,17 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) exit (1); - if (((long) (sizeof (long))) < 0) + if (((long) (sizeof (wchar_t))) < 0) { long i = longval (); - if (i != ((long) (sizeof (long)))) + if (i != ((long) (sizeof (wchar_t)))) exit (1); fprintf (f, "%ld\n", i); } else { unsigned long i = ulongval (); - if (i != ((long) (sizeof (long)))) + if (i != ((long) (sizeof (wchar_t)))) exit (1); fprintf (f, "%lu\n", i); } @@ -39841,16 +37633,16 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sizeof_long=`cat conftest.val` + ac_cv_sizeof_wchar_t=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (wchar_t), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long), 77 +echo "$as_me: error: cannot compute sizeof (wchar_t), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -39859,85 +37651,95 @@ fi fi rm -f conftest.val else - ac_cv_sizeof_long=0 + ac_cv_sizeof_wchar_t=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6 +echo "$as_me:$LINENO: result: $ac_cv_sizeof_wchar_t" >&5 +echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG $ac_cv_sizeof_long +#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t _ACEOF -echo "$as_me:$LINENO: checking for wchar_t" >&5 -echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 -if test "${ac_cv_type_wchar_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +if test "$ac_cv_sizeof_int" -lt 4 ; then + { echo "$as_me:$LINENO: WARNING: OpenLDAP requires 'int' to be 32 bits or greater." >&5 +echo "$as_me: WARNING: OpenLDAP requires 'int' to be 32 bits or greater." >&2;} + + +cat >>confdefs.h <<\_ACEOF +#define LBER_INT_T long +_ACEOF + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + +cat >>confdefs.h <<\_ACEOF +#define LBER_INT_T int _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if ((wchar_t *) 0) - return 0; -if (sizeof (wchar_t)) - return 0; - ; - return 0; -} + +fi + + +cat >>confdefs.h <<\_ACEOF +#define LBER_LEN_T long _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_cv_type_wchar_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_wchar_t=no + +cat >>confdefs.h <<\_ACEOF +#define LBER_SOCKET_T int +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define LBER_TAG_T long +_ACEOF + + +if test $ol_with_mp = longlong || test $ol_with_mp = auto ; then + if test $ac_cv_sizeof_long_long -gt 4 ; then + ol_with_mp=longlong + +cat >>confdefs.h <<\_ACEOF +#define USE_MP_LONG_LONG 1 +_ACEOF + + elif test $ol_with_mp = longlong ; then + { { echo "$as_me:$LINENO: error: long long unusable for multiple precision" >&5 +echo "$as_me: error: long long unusable for multiple precision" >&2;} + { (exit 1); exit 1; }; } + fi fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +if test $ol_with_mp = long || test $ol_with_mp = auto ; then + if test $ac_cv_sizeof_long -gt 4 ; then + ol_with_mp=long + +cat >>confdefs.h <<\_ACEOF +#define USE_MP_LONG 1 +_ACEOF + + elif test $ol_with_mp = long ; then + { { echo "$as_me:$LINENO: error: long unusable for multiple precision" >&5 +echo "$as_me: error: long unusable for multiple precision" >&2;} + { (exit 1); exit 1; }; } + fi fi -echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5 -echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 +if test $ol_with_mp = bignum || test $ol_with_mp = auto ; then -echo "$as_me:$LINENO: checking size of wchar_t" >&5 -echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 -if test "${ac_cv_sizeof_wchar_t+set}" = set; then +for ac_header in openssl/bn.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 - if test "$ac_cv_type_wchar_t" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. + # 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 @@ -39945,15 +37747,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) >= 0)]; -test_array [0] = 0 - - ; - return 0; -} +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -39977,65 +37771,125 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF + 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. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +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); } && - { 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_hi=$ac_mid; break + (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_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done +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 - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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 + +for ac_header in openssl/crypto.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 @@ -40043,15 +37897,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) < 0)]; -test_array [0] = 0 - - ; - return 0; -} +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -40075,89 +37921,149 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF + 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. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) >= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +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); } && - { 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_lo=$ac_mid; break + (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_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done +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 - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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 -ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF + +done + + if test "$ac_cv_header_openssl_bn_h" = "yes" && + test "$ac_cv_header_openssl_crypto_h" = "yes" && + test "$ol_with_tls" = "found" ; then + ol_with_mp=bignum + +cat >>confdefs.h <<\_ACEOF +#define USE_MP_BIGNUM 1 +_ACEOF + + elif test $ol_with_mp = bignum ; then + { { echo "$as_me:$LINENO: error: bignum not available" >&5 +echo "$as_me: error: bignum not available" >&2;} + { (exit 1); exit 1; }; } + fi +fi +if test $ol_with_mp = gmp || test $ol_with_mp = auto ; then + +for ac_header in gmp.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 -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -40181,141 +38087,199 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_hi=$ac_mid + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` +ac_header_compiler=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_wchar_t=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (wchar_t), 77 -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (wchar_t), 77 -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; +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 - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + 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 + + +echo "$as_me:$LINENO: checking for __gmpz_add_ui in -lgmp" >&5 +echo $ECHO_N "checking for __gmpz_add_ui in -lgmp... $ECHO_C" >&6 +if test "${ac_cv_lib_gmp___gmpz_add_ui+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgmp $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 -long longval () { return (long) (sizeof (wchar_t)); } -unsigned long ulongval () { return (long) (sizeof (wchar_t)); } -#include -#include + +/* 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 __gmpz_add_ui (); int main () { - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - exit (1); - if (((long) (sizeof (wchar_t))) < 0) - { - long i = longval (); - if (i != ((long) (sizeof (wchar_t)))) - exit (1); - fprintf (f, "%ld\n", i); - } - else - { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (wchar_t)))) - exit (1); - fprintf (f, "%lu\n", i); - } - exit (ferror (f) || fclose (f) != 0); - +__gmpz_add_ui (); ; return 0; } _ACEOF -rm -f conftest$ac_exeext +rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&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='./conftest$ac_exeext' + (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_sizeof_wchar_t=`cat conftest.val` + ac_cv_lib_gmp___gmpz_add_ui=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (wchar_t), 77 -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (wchar_t), 77 -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -rm -f conftest.val -else - ac_cv_sizeof_wchar_t=0 +ac_cv_lib_gmp___gmpz_add_ui=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_sizeof_wchar_t" >&5 -echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 -cat >>confdefs.h <<_ACEOF -#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t -_ACEOF - - - -if test "$ac_cv_sizeof_int" -lt 4 ; then - { echo "$as_me:$LINENO: WARNING: OpenLDAP requires 'int' to be 32 bits or greater." >&5 -echo "$as_me: WARNING: OpenLDAP requires 'int' to be 32 bits or greater." >&2;} - - -cat >>confdefs.h <<\_ACEOF -#define LBER_INT_T long +echo "$as_me:$LINENO: result: $ac_cv_lib_gmp___gmpz_add_ui" >&5 +echo "${ECHO_T}$ac_cv_lib_gmp___gmpz_add_ui" >&6 +if test $ac_cv_lib_gmp___gmpz_add_ui = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBGMP 1 _ACEOF -else - -cat >>confdefs.h <<\_ACEOF -#define LBER_INT_T int -_ACEOF + LIBS="-lgmp $LIBS" fi + if test $ac_cv_header_gmp_h = yes && test $ac_cv_lib_gmp___gmpz_add_ui = yes ; then cat >>confdefs.h <<\_ACEOF -#define LBER_LEN_T long -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define LBER_SOCKET_T int -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define LBER_TAG_T long +#define USE_MP_GMP 1 _ACEOF + ol_with_mp=gmp + elif test $ol_with_mp = gmp ; then + { { echo "$as_me:$LINENO: error: gmp not available" >&5 +echo "$as_me: error: gmp not available" >&2;} + { (exit 1); exit 1; }; } + fi +fi +if test $ol_with_mp = auto ; then + ol_with_mp=no +fi echo "$as_me:$LINENO: checking for working memcmp" >&5 echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6 @@ -41268,117 +39232,225 @@ _ACEOF fi done - -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +for ac_func in \ + bcopy \ + closesocket \ + chroot \ + endgrent \ + endpwent \ + fcntl \ + flock \ + fstat \ + getdtablesize \ + getgrgid \ + gethostname \ + getpass \ + getpassphrase \ + getpwuid \ + getpwnam \ + getspnam \ + gettimeofday \ + initgroups \ + inet_ntoa_b \ + ioctl \ + lockf \ + memcpy \ + memmove \ + memrchr \ + mkstemp \ + mktemp \ + pipe \ + read \ + recv \ + recvfrom \ + setpwfile \ + setgid \ + setegid \ + setsid \ + setuid \ + seteuid \ + signal \ + strdup \ + strpbrk \ + strrchr \ + strsep \ + strstr \ + strtol \ + strtoul \ + strtoq \ + strtouq \ + strtoll \ + strspn \ + sysconf \ + waitpid \ + wait4 \ + write \ + send \ + sendmsg \ + sendto \ + +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 - - - - - - - - - - - - - - - - -for ac_func in \ - bcopy \ - closesocket \ - chroot \ - endgrent \ - endpwent \ - fcntl \ - flock \ - fstat \ - getdtablesize \ - getgrgid \ - gethostname \ - getpass \ - getpassphrase \ - getpwuid \ - getpwnam \ - getspnam \ - gettimeofday \ - initgroups \ - lockf \ - memcpy \ - memmove \ - mkstemp \ - mktemp \ - pipe \ - read \ - recv \ - recvfrom \ - setpwfile \ - setgid \ - setegid \ - setsid \ - setuid \ - seteuid \ - signal \ - strdup \ - strpbrk \ - strrchr \ - strsep \ - strstr \ - strtol \ - strtoul \ - strtoq \ - strtouq \ - strtoll \ - strspn \ - sysconf \ - usleep \ - waitpid \ - wait4 \ - write \ - send \ - sendmsg \ - sendto \ - +for ac_func in getopt getpeereid do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -41476,13 +39548,27 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF +else + case $LIBOBJS in + "$ac_func.$ac_objext" | \ + *" $ac_func.$ac_objext" | \ + "$ac_func.$ac_objext "* | \ + *" $ac_func.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; +esac + fi done +if test "$ac_cv_func_getopt" != yes; then + LIBSRCS="$LIBSRCS getopt.c" +fi -for ac_func in getopt getpeereid +if test "$ac_cv_func_getpeereid" != yes; then + +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 @@ -41580,25 +39666,11 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -else - case $LIBOBJS in - "$ac_func.$ac_objext" | \ - *" $ac_func.$ac_objext" | \ - "$ac_func.$ac_objext "* | \ - *" $ac_func.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; -esac - fi 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 + 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 +39788,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 +39907,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 +40054,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 +40178,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 @@ -42171,13 +40253,6 @@ cat >>confdefs.h <<\_ACEOF #define SLAPD_SPASSWD 1 _ACEOF -fi -if test "$ol_enable_multimaster" != no ; then - -cat >>confdefs.h <<\_ACEOF -#define SLAPD_MULTIMASTER 1 -_ACEOF - fi if test "$ol_enable_rlookups" != no ; then @@ -42187,15 +40262,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 @@ -42218,6 +40313,23 @@ cat >>confdefs.h <<\_ACEOF _ACEOF +if test "$ol_enable_monitor" != no ; then + BUILD_SLAPD=yes + BUILD_MONITOR=$ol_enable_monitor + if test "$ol_enable_monitor" = mod ; then + SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-monitor" + MFLAG=SLAPD_MOD_DYNAMIC + else + SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-monitor" + MFLAG=SLAPD_MOD_STATIC + fi + +cat >>confdefs.h <<_ACEOF +#define SLAPD_MONITOR $MFLAG +_ACEOF + +fi + if test "$ol_enable_bdb" != no ; then BUILD_SLAPD=yes BUILD_BDB=$ol_enable_bdb @@ -42286,23 +40398,6 @@ _ACEOF fi -if test "$ol_link_ldbm" != no -a $ol_enable_ldbm != no; then - BUILD_SLAPD=yes - BUILD_LDBM=$ol_enable_ldbm - if test "$ol_enable_ldbm" = mod ; then - SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldbm" - MFLAG=SLAPD_MOD_DYNAMIC - else - SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldbm" - MFLAG=SLAPD_MOD_STATIC - fi - -cat >>confdefs.h <<_ACEOF -#define SLAPD_LDBM $MFLAG -_ACEOF - -fi - if test "$ol_enable_meta" != no ; then BUILD_SLAPD=yes BUILD_META=$ol_enable_meta @@ -42321,23 +40416,6 @@ _ACEOF fi -if test "$ol_enable_monitor" != no ; then - BUILD_SLAPD=yes - BUILD_MONITOR=$ol_enable_monitor - if test "$ol_enable_monitor" = mod ; then - SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-monitor" - MFLAG=SLAPD_MOD_DYNAMIC - else - SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-monitor" - MFLAG=SLAPD_MOD_STATIC - fi - -cat >>confdefs.h <<_ACEOF -#define SLAPD_MONITOR $MFLAG -_ACEOF - -fi - if test "$ol_enable_null" != no ; then BUILD_SLAPD=yes BUILD_NULL=$ol_enable_null @@ -42460,6 +40538,54 @@ _ACEOF fi +if test "$ol_enable_auditlog" != no ; then + BUILD_AUDITLOG=$ol_enable_auditlog + if test "$ol_enable_auditlog" = mod ; then + MFLAG=SLAPD_MOD_DYNAMIC + SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS auditlog.la" + else + MFLAG=SLAPD_MOD_STATIC + SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS auditlog.o" + fi + +cat >>confdefs.h <<_ACEOF +#define SLAPD_OVER_AUDITLOG $MFLAG +_ACEOF + +fi + +if test "$ol_enable_constraint" != no ; then + BUILD_CONSTRAINT=$ol_enable_constraint + if test "$ol_enable_constraint" = mod ; then + MFLAG=SLAPD_MOD_DYNAMIC + SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS constraint.la" + else + MFLAG=SLAPD_MOD_STATIC + SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS constraint.o" + fi + +cat >>confdefs.h <<_ACEOF +#define SLAPD_OVER_CONSTRAINT $MFLAG +_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 @@ -42605,6 +40731,22 @@ _ACEOF fi +if test "$ol_enable_seqmod" != no ; then + BUILD_SEQMOD=$ol_enable_seqmod + if test "$ol_enable_seqmod" = mod ; then + MFLAG=SLAPD_MOD_DYNAMIC + SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS seqmod.la" + else + MFLAG=SLAPD_MOD_STATIC + SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS seqmod.o" + fi + +cat >>confdefs.h <<_ACEOF +#define SLAPD_OVER_SEQMOD $MFLAG +_ACEOF + +fi + if test "$ol_enable_syncprov" != no ; then BUILD_SYNCPROV=$ol_enable_syncprov if test "$ol_enable_syncprov" = mod ; then @@ -42669,8 +40811,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 @@ -42775,6 +40918,11 @@ fi + + + + + @@ -42788,7 +40936,7 @@ if test "${with_xxinstall+set}" = set; then fi; - ac_config_files="$ac_config_files Makefile:build/top.mk:Makefile.in:build/dir.mk doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk doc/man/Makefile:build/top.mk:doc/man/Makefile.in:build/dir.mk doc/man/man1/Makefile:build/top.mk:doc/man/man1/Makefile.in:build/man.mk doc/man/man3/Makefile:build/top.mk:doc/man/man3/Makefile.in:build/man.mk doc/man/man5/Makefile:build/top.mk:doc/man/man5/Makefile.in:build/man.mk doc/man/man8/Makefile:build/top.mk:doc/man/man8/Makefile.in:build/man.mk clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk include/Makefile:build/top.mk:include/Makefile.in libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk libraries/liblunicode/Makefile:build/top.mk:libraries/liblunicode/Makefile.in:build/lib.mk:build/lib-static.mk libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk servers/slapd/back-bdb/Makefile:build/top.mk:servers/slapd/back-bdb/Makefile.in:build/mod.mk servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk servers/slapd/back-hdb/Makefile:build/top.mk:servers/slapd/back-hdb/Makefile.in:build/mod.mk servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/Makefile.in:build/mod.mk servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk servers/slapd/back-relay/Makefile:build/top.mk:servers/slapd/back-relay/Makefile.in:build/mod.mk servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/mod.mk servers/slapd/back-sql/Makefile:build/top.mk:servers/slapd/back-sql/Makefile.in:build/mod.mk servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk servers/slapd/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.mk servers/slapd/overlays/Makefile:build/top.mk:servers/slapd/overlays/Makefile.in:build/lib.mk servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk tests/run tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk" + ac_config_files="$ac_config_files Makefile:build/top.mk:Makefile.in:build/dir.mk doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk doc/man/Makefile:build/top.mk:doc/man/Makefile.in:build/dir.mk doc/man/man1/Makefile:build/top.mk:doc/man/man1/Makefile.in:build/man.mk doc/man/man3/Makefile:build/top.mk:doc/man/man3/Makefile.in:build/man.mk doc/man/man5/Makefile:build/top.mk:doc/man/man5/Makefile.in:build/man.mk doc/man/man8/Makefile:build/top.mk:doc/man/man8/Makefile.in:build/man.mk clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk include/Makefile:build/top.mk:include/Makefile.in libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk libraries/liblunicode/Makefile:build/top.mk:libraries/liblunicode/Makefile.in:build/lib.mk:build/lib-static.mk libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk servers/slapd/back-bdb/Makefile:build/top.mk:servers/slapd/back-bdb/Makefile.in:build/mod.mk servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk servers/slapd/back-hdb/Makefile:build/top.mk:servers/slapd/back-hdb/Makefile.in:build/mod.mk servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/Makefile.in:build/mod.mk servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk servers/slapd/back-relay/Makefile:build/top.mk:servers/slapd/back-relay/Makefile.in:build/mod.mk servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/mod.mk servers/slapd/back-sql/Makefile:build/top.mk:servers/slapd/back-sql/Makefile.in:build/mod.mk servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk servers/slapd/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.mk servers/slapd/overlays/Makefile:build/top.mk:servers/slapd/overlays/Makefile.in:build/lib.mk servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk tests/run tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk" ac_config_commands="$ac_config_commands default" @@ -43286,7 +41434,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 @@ -43320,7 +41471,6 @@ do "servers/slapd/back-dnssrv/Makefile" ) CONFIG_FILES="$CONFIG_FILES servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk" ;; "servers/slapd/back-hdb/Makefile" ) CONFIG_FILES="$CONFIG_FILES servers/slapd/back-hdb/Makefile:build/top.mk:servers/slapd/back-hdb/Makefile.in:build/mod.mk" ;; "servers/slapd/back-ldap/Makefile" ) CONFIG_FILES="$CONFIG_FILES servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk" ;; - "servers/slapd/back-ldbm/Makefile" ) CONFIG_FILES="$CONFIG_FILES servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk" ;; "servers/slapd/back-ldif/Makefile" ) CONFIG_FILES="$CONFIG_FILES servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk" ;; "servers/slapd/back-meta/Makefile" ) CONFIG_FILES="$CONFIG_FILES servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk" ;; "servers/slapd/back-monitor/Makefile" ) CONFIG_FILES="$CONFIG_FILES servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk" ;; @@ -43508,6 +41658,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 @@ -43516,7 +41667,6 @@ s,@BUILD_BDB@,$BUILD_BDB,;t t s,@BUILD_DNSSRV@,$BUILD_DNSSRV,;t t s,@BUILD_HDB@,$BUILD_HDB,;t t s,@BUILD_LDAP@,$BUILD_LDAP,;t t -s,@BUILD_LDBM@,$BUILD_LDBM,;t t s,@BUILD_META@,$BUILD_META,;t t s,@BUILD_MONITOR@,$BUILD_MONITOR,;t t s,@BUILD_NULL@,$BUILD_NULL,;t t @@ -43526,6 +41676,9 @@ 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_AUDITLOG@,$BUILD_AUDITLOG,;t t +s,@BUILD_CONSTRAINT@,$BUILD_CONSTRAINT,;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 @@ -43535,6 +41688,7 @@ s,@BUILD_PROXYCACHE@,$BUILD_PROXYCACHE,;t t s,@BUILD_REFINT@,$BUILD_REFINT,;t t s,@BUILD_RETCODE@,$BUILD_RETCODE,;t t s,@BUILD_RWM@,$BUILD_RWM,;t t +s,@BUILD_SEQMOD@,$BUILD_SEQMOD,;t t s,@BUILD_SYNCPROV@,$BUILD_SYNCPROV,;t t s,@BUILD_TRANSLUCENT@,$BUILD_TRANSLUCENT,;t t s,@BUILD_UNIQUE@,$BUILD_UNIQUE,;t t @@ -43543,7 +41697,7 @@ s,@BUILD_SLURPD@,$BUILD_SLURPD,;t t s,@LDAP_LIBS@,$LDAP_LIBS,;t t s,@SLAPD_LIBS@,$SLAPD_LIBS,;t t s,@SLURPD_LIBS@,$SLURPD_LIBS,;t t -s,@LDBM_LIBS@,$LDBM_LIBS,;t t +s,@BDB_LIBS@,$BDB_LIBS,;t t s,@LTHREAD_LIBS@,$LTHREAD_LIBS,;t t s,@LUTIL_LIBS@,$LUTIL_LIBS,;t t s,@WRAP_LIBS@,$WRAP_LIBS,;t t @@ -43566,6 +41720,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 +42418,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 +42463,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 ;;