X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=build%2Fopenldap.m4;h=ecdbb0b5c92e82fed4a37d22dc8e70f9d9b6ca1b;hb=7a760e73eb7acc6aeee0520de28d1000b68384ee;hp=0f0bccf4dc0ff158bf8607e201d2cf3ff54417e2;hpb=ea4bf672cc44954e06984f1efd96a78bd3c4f857;p=openldap diff --git a/build/openldap.m4 b/build/openldap.m4 index 0f0bccf4dc..ecdbb0b5c9 100644 --- a/build/openldap.m4 +++ b/build/openldap.m4 @@ -1,19 +1,29 @@ +dnl OpenLDAP Autoconf Macros dnl $OpenLDAP$ +dnl This work is part of OpenLDAP Software . dnl -dnl Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. -dnl COPYING RESTRICTIONS APPLY, See COPYRIGHT file +dnl Copyright 1998-2007 The OpenLDAP Foundation. +dnl All rights reserved. dnl -dnl OpenLDAP Autoconf Macros +dnl Redistribution and use in source and binary forms, with or without +dnl modification, are permitted only as authorized by the OpenLDAP +dnl Public License. +dnl +dnl A copy of this license is available in the file LICENSE in the +dnl top-level directory of the distribution or, alternatively, at +dnl . dnl dnl -------------------------------------------------------------------- dnl Restricted form of AC_ARG_ENABLE that limits user options dnl dnl $1 = option name dnl $2 = help-string -dnl $3 = default value (auto) +dnl $3 = default value (auto). "--" means do not set it by default dnl $4 = allowed values (auto yes no) +dnl $5 = overridden default AC_DEFUN([OL_ARG_ENABLE], [# OpenLDAP --enable-$1 - AC_ARG_ENABLE($1,changequote(<,>)<$2 [>ifelse($3,,auto,$3)<]>changequote([,]),[ + pushdef([ol_DefVal],ifelse($3,,auto,$3)) + AC_ARG_ENABLE($1,ifelse($4,,[$2],[$2] translit([$4],[ ],[|])) ifelse($3,--,,@<:@ol_DefVal@:>@),[ ol_arg=invalid for ol_val in ifelse($4,,[auto yes no],[$4]) ; do if test "$enableval" = "$ol_val" ; then @@ -24,9 +34,10 @@ AC_DEFUN([OL_ARG_ENABLE], [# OpenLDAP --enable-$1 AC_MSG_ERROR(bad value $enableval for --enable-$1) fi ol_enable_$1="$ol_arg" -], -[ ol_enable_$1=ifelse($3,,"auto","$3")])dnl -dnl AC_VERBOSE(OpenLDAP -enable-$1 $ol_enable_$1) +]ifelse($3,--,,[, +[ ol_enable_$1=ifelse($5,,ol_DefVal,[${]$5[:-]ol_DefVal[}])]]))dnl +dnl AC_MSG_RESULT([OpenLDAP -enable-$1 $ol_enable_$1]) + popdef([ol_DefVal]) # end --enable-$1 ])dnl dnl @@ -38,7 +49,7 @@ dnl $2 = help-string dnl $3 = default value (no) dnl $4 = allowed values (yes or no) AC_DEFUN([OL_ARG_WITH], [# OpenLDAP --with-$1 - AC_ARG_WITH($1,changequote(<,>)<$2 [>ifelse($3,,yes,$3)<]>changequote([,]),[ + AC_ARG_WITH($1,[$2 @<:@]ifelse($3,,yes,$3)@:>@,[ ol_arg=invalid for ol_val in ifelse($4,,[yes no],[$4]) ; do if test "$withval" = "$ol_val" ; then @@ -51,62 +62,9 @@ AC_DEFUN([OL_ARG_WITH], [# OpenLDAP --with-$1 ol_with_$1="$ol_arg" ], [ ol_with_$1=ifelse($3,,"no","$3")])dnl -dnl AC_VERBOSE(OpenLDAP --with-$1 $ol_with_$1) +dnl AC_MSG_RESULT([OpenLDAP --with-$1 $ol_with_$1]) # end --with-$1 ])dnl -dnl -dnl ==================================================================== -dnl -AC_DEFUN(AC_COMPILE_CHECK_SIZEOF, -[changequote(<<, >>)dnl -dnl The name to #define. -define(<>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl -dnl The cache variable name. -define(<>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl -changequote([, ])dnl -AC_MSG_CHECKING(size of $1) -AC_CACHE_VAL(AC_CV_NAME, -[for ac_size in 4 8 1 2 16 $2 ; do # List sizes in rough order of prevalence. - AC_TRY_COMPILE([#include "confdefs.h" -#include -$2 -], [switch (0) case 0: case (sizeof ($1) == $ac_size):;], AC_CV_NAME=$ac_size) - if test x$AC_CV_NAME != x ; then break; fi -done -]) -if test x$AC_CV_NAME = x ; then - AC_MSG_ERROR([cannot determine a size for $1]) -fi -AC_MSG_RESULT($AC_CV_NAME) -AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1]) -undefine([AC_TYPE_NAME])dnl -undefine([AC_CV_NAME])dnl -]) -dnl ==================================================================== -dnl check if hard links are supported. -dnl -AC_DEFUN([OL_PROG_LN_H], [# test for ln hardlink support -AC_MSG_CHECKING(whether ln works) -AC_CACHE_VAL(ol_cv_prog_LN_H, -[rm -f conftest.src conftest.dst -echo "conftest" > conftest.src -if ln conftest.src conftest.dst 2>/dev/null -then - ol_cv_prog_LN_H="ln" -else - ol_cv_prog_LN_H="cp" -fi -rm -f conftest.src conftest.dst -])dnl -LN_H="$ol_cv_prog_LN_H" -if test "$ol_cv_prog_LN_H" = "ln"; then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -AC_SUBST(LN_H)dnl -])dnl -dnl dnl ==================================================================== dnl Check for dependency generation flag AC_DEFUN([OL_MKDEPEND], [# test for make depend flag @@ -122,7 +80,7 @@ if test -z "${MKDEP}"; then noCode; EOF if AC_TRY_COMMAND($OL_MKDEP $flag conftest.c) \ - | 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 @@ -150,13 +108,11 @@ dnl ==================================================================== dnl Check if system uses EBCDIC instead of ASCII AC_DEFUN([OL_CPP_EBCDIC], [# test for EBCDIC AC_CACHE_CHECK([for EBCDIC],ol_cv_cpp_ebcdic,[ - AC_TRY_CPP([ + AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ #if !('M' == 0xd4) #include <__ASCII__/generate_error.h> #endif -], - [ol_cv_cpp_ebcdic=yes], - [ol_cv_cpp_ebcdic=no])]) +]])],[ol_cv_cpp_ebcdic=yes],[ol_cv_cpp_ebcdic=no])]) if test $ol_cv_cpp_ebcdic = yes ; then AC_DEFINE(HAVE_EBCDIC,1, [define if system uses EBCDIC instead of ASCII]) fi @@ -164,14 +120,14 @@ fi dnl dnl -------------------------------------------------------------------- dnl OpenLDAP version of STDC header check w/ EBCDIC support -AC_DEFUN(OL_HEADER_STDC, +AC_DEFUN([OL_HEADER_STDC], [AC_REQUIRE_CPP()dnl AC_REQUIRE([OL_CPP_EBCDIC])dnl AC_CACHE_CHECK([for ANSI C header files], ol_cv_header_stdc, -[AC_TRY_CPP([#include +[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include #include #include -#include ], ol_cv_header_stdc=yes, ol_cv_header_stdc=no) +#include ]])],[ol_cv_header_stdc=yes],[ol_cv_header_stdc=no]) if test $ol_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. @@ -185,7 +141,7 @@ fi if test $ol_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -AC_TRY_RUN([#include +AC_RUN_IFELSE([AC_LANG_SOURCE([[#include #ifndef HAVE_EBCDIC # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -199,7 +155,7 @@ AC_TRY_RUN([#include int main () { int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } -], , ol_cv_header_stdc=no, :) +]])],[],[ol_cv_header_stdc=no],[:]) fi]) if test $ol_cv_header_stdc = yes; then AC_DEFINE(STDC_HEADERS) @@ -208,32 +164,98 @@ ac_cv_header_stdc=disable ]) dnl dnl ==================================================================== -dnl Check if struct passwd has pw_gecos -AC_DEFUN([OL_STRUCT_PASSWD_PW_GECOS], [# test for pw_gecos in struct passwd -AC_CACHE_CHECK([struct passwd for pw_gecos],ol_cv_struct_passwd_pw_gecos,[ - AC_TRY_COMPILE([#include ],[ - struct passwd pwd; - pwd.pw_gecos = pwd.pw_name; -], - [ol_cv_struct_passwd_pw_gecos=yes], - [ol_cv_struct_passwd_pw_gecos=no])]) -if test $ol_cv_struct_passwd_pw_gecos = yes ; then - AC_DEFINE(HAVE_PW_GECOS,1, [define if struct passwd has pw_gecos]) +dnl DNS resolver macros +AC_DEFUN([OL_RESOLVER_TRY], +[if test $ol_cv_lib_resolver = no ; then + AC_CACHE_CHECK([for resolver link (]ifelse($2,,default,$2)[)],[$1], +[ + ol_RESOLVER_LIB=ifelse($2,,,$2) + ol_LIBS=$LIBS + LIBS="$ol_RESOLVER_LIB $LIBS" + + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#include +#ifdef HAVE_ARPA_NAMESER_H +# include +#endif +#ifdef HAVE_RESOLV_H +# include +#endif +]], [[{ + int len, status; + char *request = NULL; + unsigned char reply[64*1024]; + unsigned char host[64*1024]; + unsigned char *p; + +#ifdef NS_HFIXEDSZ + /* Bind 8/9 interface */ + len = res_query(request, ns_c_in, ns_t_srv, reply, sizeof(reply)); +#else + /* Bind 4 interface */ +# ifndef T_SRV +# define T_SRV 33 +# endif + len = res_query(request, C_IN, T_SRV, reply, sizeof(reply)); +#endif + p = reply; +#ifdef NS_HFIXEDSZ + /* Bind 8/9 interface */ + p += NS_HFIXEDSZ; +#elif defined(HFIXEDSZ) + /* Bind 4 interface w/ HFIXEDSZ */ + p += HFIXEDSZ; +#else + /* Bind 4 interface w/o HFIXEDSZ */ + p += sizeof(HEADER); +#endif + status = dn_expand( reply, reply+len, p, host, sizeof(host)); +}]])],[$1=yes],[$1=no]) + + LIBS="$ol_LIBS" +]) + + if test $$1 = yes ; then + ol_cv_lib_resolver=ifelse($2,,yes,$2) + fi fi ]) -dnl dnl -------------------------------------------------------------------- -dnl Check if struct passwd has pw_passwd -AC_DEFUN([OL_STRUCT_PASSWD_PW_PASSWD], [# test for pw_passwd in struct passwd -AC_CACHE_CHECK([struct passwd for pw_passwd],ol_cv_struct_passwd_pw_passwd,[ - AC_TRY_COMPILE([#include ],[ - struct passwd pwd; - pwd.pw_passwd = pwd.pw_name; -], - [ol_cv_struct_passwd_pw_passwd=yes], - [ol_cv_struct_passwd_pw_passwd=no])]) -if test $ol_cv_struct_passwd_pw_passwd = yes ; then - AC_DEFINE(HAVE_PW_PASSWD,1, [define if struct passwd has pw_passwd]) +dnl Try to locate appropriate library +AC_DEFUN([OL_RESOLVER_LINK], +[ol_cv_lib_resolver=no +OL_RESOLVER_TRY(ol_cv_resolver_none) +OL_RESOLVER_TRY(ol_cv_resolver_resolv,[-lresolv]) +OL_RESOLVER_TRY(ol_cv_resolver_bind,[-lbind]) +]) +dnl +dnl ==================================================================== +dnl International Components for Unicode (ICU) +AC_DEFUN([OL_ICU], +[ol_icu=no +AC_CHECK_HEADERS( unicode/utypes.h ) +if test $ac_cv_header_unicode_utypes_h = yes ; then + dnl OL_ICULIBS="-licui18n -licuuc -licudata" + OL_ICULIBS="-licuuc -licudata" + + AC_CACHE_CHECK([for ICU libraries], [ol_cv_lib_icu], [ + ol_LIBS="$LIBS" + LIBS="$OL_ICULIBS $LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +#include +]], [[ +(void) u_errorName(0); +]])],[ol_cv_lib_icu=yes],[ol_cv_lib_icu=no]) + LIBS="$ol_LIBS" +]) + + if test $ol_cv_lib_icu != no ; then + ol_icu="$OL_ICULIBS" + AC_DEFINE(HAVE_ICU,1,[define if you actually have ICU]) + fi fi ]) dnl @@ -248,9 +270,9 @@ AC_DEFUN([OL_BERKELEY_DB_TRY], [ ol_DB_LIB=ifelse($2,,,$2) ol_LIBS=$LIBS - LIBS="$ol_DB_LIB $LIBS" + LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #ifdef HAVE_DB_185_H # include #else @@ -264,7 +286,7 @@ AC_DEFUN([OL_BERKELEY_DB_TRY], #ifndef NULL #define NULL ((void*)0) #endif -],[ +]], [[ #if DB_VERSION_MAJOR > 1 { char *version; @@ -276,7 +298,7 @@ AC_DEFUN([OL_BERKELEY_DB_TRY], minor < DB_VERSION_MINOR ) { printf("Berkeley DB version mismatch\n" - "\texpected: %s\n\tgot: %s\n", + "\theader: %s\n\tlibrary: %s\n", DB_VERSION_STRING, version); return 1; } @@ -290,7 +312,7 @@ AC_DEFUN([OL_BERKELEY_DB_TRY], #else (void) dbopen( NULL, 0, 0, 0, NULL); #endif -],[$1=yes],[$1=no]) +]])],[$1=yes],[$1=no]) LIBS="$ol_LIBS" ]) @@ -305,23 +327,273 @@ dnl -------------------------------------------------------------------- dnl Try to locate appropriate library AC_DEFUN([OL_BERKELEY_DB_LINK], [ol_cv_lib_db=no + +dnl Determine major version +AC_CACHE_CHECK([for Berkeley DB major version], [ol_cv_bdb_major],[ + ol_cv_bdb_major=0 + if test $ol_cv_bdb_major = 0 ; then + AC_EGREP_CPP(__db_version, [ +#include +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif +#if DB_VERSION_MAJOR == 4 +__db_version +#endif + ], [ol_cv_bdb_major=4], [:]) + fi + if test $ol_cv_bdb_major = 0 ; then + AC_EGREP_CPP(__db_version, [ +#include +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif +#if DB_VERSION_MAJOR == 3 +__db_version +#endif + ], [ol_cv_bdb_major=3], [:]) + fi + if test $ol_cv_bdb_major = 0 ; then + AC_EGREP_CPP(__db_version, [ +#include +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif +#if DB_VERSION_MAJOR == 2 +__db_version +#endif + ], [ol_cv_bdb_major=2], [:]) + fi + if test $ol_cv_bdb_major = 0 ; then + AC_EGREP_CPP(__db_version, [ +#include +#ifndef DB_VERSION_MAJOR +# define DB_VERSION_MAJOR 1 +#endif +#if DB_VERSION_MAJOR == 1 +__db_version +#endif + ], [ol_cv_bdb_major=1], [:]) + fi + + if test $ol_cv_bdb_major = 0 ; then + AC_MSG_ERROR([Unknown Berkeley DB major version]) + fi +]) + +dnl Determine minor version +AC_CACHE_CHECK([for Berkeley DB minor version], [ol_cv_bdb_minor],[ + ol_cv_bdb_minor=0 + if test $ol_cv_bdb_minor = 0 ; then + AC_EGREP_CPP(__db_version, [ +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 9 +__db_version +#endif + ], [ol_cv_bdb_minor=9], [:]) + fi + if test $ol_cv_bdb_minor = 0 ; then + AC_EGREP_CPP(__db_version, [ +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 8 +__db_version +#endif + ], [ol_cv_bdb_minor=8], [:]) + fi + if test $ol_cv_bdb_minor = 0 ; then + AC_EGREP_CPP(__db_version, [ +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 7 +__db_version +#endif + ], [ol_cv_bdb_minor=7], [:]) + fi + if test $ol_cv_bdb_minor = 0 ; then + AC_EGREP_CPP(__db_version, [ +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 6 +__db_version +#endif + ], [ol_cv_bdb_minor=6], [:]) + fi + if test $ol_cv_bdb_minor = 0 ; then + AC_EGREP_CPP(__db_version, [ +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 5 +__db_version +#endif + ], [ol_cv_bdb_minor=5], [:]) + fi + if test $ol_cv_bdb_minor = 0 ; then + AC_EGREP_CPP(__db_version, [ +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 4 +__db_version +#endif + ], [ol_cv_bdb_minor=4], [:]) + fi + if test $ol_cv_bdb_minor = 0 ; then + AC_EGREP_CPP(__db_version, [ +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 3 +__db_version +#endif + ], [ol_cv_bdb_minor=3], [:]) + fi + if test $ol_cv_bdb_minor = 0 ; then + AC_EGREP_CPP(__db_version, [ +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 2 +__db_version +#endif + ], [ol_cv_bdb_minor=2], [:]) + fi + if test $ol_cv_bdb_minor = 0 ; then + AC_EGREP_CPP(__db_version, [ +#include +#ifndef DB_VERSION_MINOR +# define DB_VERSION_MINOR 0 +#endif +#if DB_VERSION_MINOR == 1 +__db_version +#endif + ], [ol_cv_bdb_minor=1], [:]) + fi +]) + +if test $ol_cv_bdb_major = 4 ; then + if test $ol_cv_bdb_minor = 5 ; then + OL_BERKELEY_DB_TRY(ol_cv_db_db45,[-ldb45]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_45,[-ldb-45]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_5,[-ldb-4.5]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_4_5,[-ldb-4-5]) + elif test $ol_cv_bdb_minor = 4 ; then + OL_BERKELEY_DB_TRY(ol_cv_db_db44,[-ldb44]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_44,[-ldb-44]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_4,[-ldb-4.4]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_4_4,[-ldb-4-4]) + elif test $ol_cv_bdb_minor = 3 ; then + OL_BERKELEY_DB_TRY(ol_cv_db_db43,[-ldb43]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_43,[-ldb-43]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_3,[-ldb-4.3]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_4_3,[-ldb-4-3]) + elif test $ol_cv_bdb_minor = 2 ; then + OL_BERKELEY_DB_TRY(ol_cv_db_db42,[-ldb42]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_42,[-ldb-42]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_2,[-ldb-4.2]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_4_2,[-ldb-4-2]) + elif test $ol_cv_bdb_minor = 1 ; then + OL_BERKELEY_DB_TRY(ol_cv_db_db41,[-ldb41]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_41,[-ldb-41]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_1,[-ldb-4.1]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_4_1,[-ldb-4-1]) + fi + OL_BERKELEY_DB_TRY(ol_cv_db_db_4,[-ldb-4]) + OL_BERKELEY_DB_TRY(ol_cv_db_db4,[-ldb4]) + OL_BERKELEY_DB_TRY(ol_cv_db_db,[-ldb]) + +elif test $ol_cv_bdb_major = 3 ; then + OL_BERKELEY_DB_TRY(ol_cv_db_db3,[-ldb3]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_3,[-ldb-3]) + +elif test $ol_cv_bdb_major = 2 ; then + OL_BERKELEY_DB_TRY(ol_cv_db_db2,[-ldb2]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_2,[-ldb-2]) + +elif test $ol_cv_bdb_major = 1 ; then + OL_BERKELEY_DB_TRY(ol_cv_db_db1,[-ldb1]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_1,[-ldb-1]) +fi OL_BERKELEY_DB_TRY(ol_cv_db_none) -OL_BERKELEY_DB_TRY(ol_cv_db_db,[-ldb]) -OL_BERKELEY_DB_TRY(ol_cv_db_db3,[-ldb3]) -OL_BERKELEY_DB_TRY(ol_cv_db_db2,[-ldb2]) -OL_BERKELEY_DB_TRY(ol_cv_db_db1,[-ldb1]) ]) dnl dnl -------------------------------------------------------------------- +dnl Check if Berkeley DB version +AC_DEFUN([OL_BERKELEY_DB_VERSION], +[AC_CACHE_CHECK([for Berkeley DB version match], [ol_cv_berkeley_db_version], [ + ol_LIBS="$LIBS" + LIBS="$LTHREAD_LIBS $LIBS" + if test $ol_cv_lib_db != yes ; then + LIBS="$ol_cv_lib_db $LIBS" + fi + + AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#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; +}]])],[ol_cv_berkeley_db_version=yes],[ol_cv_berkeley_db_version=no],[ol_cv_berkeley_db_version=cross]) + + LIBS="$ol_LIBS" +]) + + if test $ol_cv_berkeley_db_version = no ; then + AC_MSG_ERROR([Berkeley DB version mismatch]) + fi +])dnl +dnl +dnl -------------------------------------------------------------------- dnl Check if Berkeley DB supports DB_THREAD AC_DEFUN([OL_BERKELEY_DB_THREAD], [AC_CACHE_CHECK([for Berkeley DB thread support], [ol_cv_berkeley_db_thread], [ ol_LIBS="$LIBS" + LIBS="$LTHREAD_LIBS $LIBS" if test $ol_cv_lib_db != yes ; then - LIBS="$ol_cv_lib_db" + LIBS="$ol_cv_lib_db $LIBS" fi - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #ifdef HAVE_DB_185_H choke me; #else @@ -333,12 +605,9 @@ AC_DEFUN([OL_BERKELEY_DB_THREAD], main() { int rc; - u_int32_t flags = DB_CREATE | DB_INIT_CDB | DB_INIT_MPOOL | + u_int32_t flags = DB_CREATE | #ifdef DB_PRIVATE DB_PRIVATE | -#endif -#ifdef DB_MPOOL_PRIVATE - DB_MPOOL_PRIVATE | #endif DB_THREAD; @@ -347,26 +616,20 @@ main() rc = db_env_create( &env, 0 ); - if( rc ) { - printf("BerkeleyDB: %s\n", db_strerror(rc) ); - return rc; - } - -#if 0 -#ifdef DB_CDB_ALLDB - rc = env->set_flags( env, DB_CDB_ALLDB, 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; } -#endif -#endif #if (DB_VERSION_MAJOR > 3) || (DB_VERSION_MINOR >= 1) - rc = env->open( env, NULL, flags, 0 ); + rc = (env->open)( env, NULL, flags, 0 ); #else - rc = env->open( env, NULL, NULL, flags, 0 ); + rc = (env->open)( env, NULL, NULL, flags, 0 ); #endif if ( rc == 0 ) { @@ -393,18 +656,16 @@ main() #endif return rc; -}], - [ol_cv_berkeley_db_thread=yes], - [ol_cv_berkeley_db_thread=no], - [ol_cv_berkeley_db_thread=cross]) +}]])],[ol_cv_berkeley_db_thread=yes],[ol_cv_berkeley_db_thread=no],[ol_cv_berkeley_db_thread=cross]) LIBS="$ol_LIBS" +]) if test $ol_cv_berkeley_db_thread != no ; then AC_DEFINE(HAVE_BERKELEY_DB_THREAD, 1, [define if Berkeley DB has DB_THREAD support]) fi -])])dnl +])dnl dnl dnl -------------------------------------------------------------------- dnl Find any DB @@ -415,17 +676,38 @@ if test $ac_cv_header_db_h = yes; then OL_BERKELEY_DB_LINK if test "$ol_cv_lib_db" != no ; then ol_cv_berkeley_db=yes + OL_BERKELEY_DB_VERSION OL_BERKELEY_DB_THREAD fi fi ]) -dnl +dnl -------------------------------------------------------------------- +dnl Check for version compatility with back-bdb +AC_DEFUN([OL_BDB_COMPAT], +[AC_CACHE_CHECK([Berkeley DB version for BDB/HDB backends], [ol_cv_bdb_compat],[ + AC_EGREP_CPP(__db_version_compat,[ +#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 + ], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])]) +]) + dnl -------------------------------------------------------------------- dnl Find old Berkeley DB 1.85/1.86 AC_DEFUN([OL_BERKELEY_COMPAT_DB], -[ol_cv_berkeley_db=no -AC_CHECK_HEADERS(db_185.h db.h) -if test $ac_cv_header_db_185_h = yes -o $ac_cv_header_db_h = yes; then +[AC_CHECK_HEADERS(db_185.h db.h) +if test $ac_cv_header_db_185_h = yes || test $ac_cv_header_db_h = yes; then AC_CACHE_CHECK([if Berkeley DB header compatibility], [ol_cv_header_db1],[ AC_EGREP_CPP(__db_version_1,[ #if HAVE_DB_185_H @@ -487,7 +769,7 @@ AC_DEFUN([OL_GDBM], [AC_REQUIRE([OL_LIB_GDBM]) AC_CHECK_HEADERS(gdbm.h) AC_CACHE_CHECK(for db, [ol_cv_gdbm], [ - if test $ol_cv_lib_gdbm = no -o $ac_cv_header_gdbm_h = no ; then + if test $ol_cv_lib_gdbm = no || test $ac_cv_header_gdbm_h = no ; then ol_cv_gdbm=no else ol_cv_gdbm=yes @@ -532,7 +814,7 @@ AC_DEFUN([OL_MDBM], [AC_REQUIRE([OL_LIB_MDBM]) AC_CHECK_HEADERS(mdbm.h) AC_CACHE_CHECK(for db, [ol_cv_mdbm], [ - if test $ol_cv_lib_mdbm = no -o $ac_cv_header_mdbm_h = no ; then + if test $ol_cv_lib_mdbm = no || test $ac_cv_header_mdbm_h = no ; then ol_cv_mdbm=no else ol_cv_mdbm=yes @@ -588,7 +870,7 @@ AC_DEFUN([OL_NDBM], [AC_REQUIRE([OL_LIB_NDBM]) AC_CHECK_HEADERS(ndbm.h) AC_CACHE_CHECK(for db, [ol_cv_ndbm], [ - if test $ol_cv_lib_ndbm = no -o $ac_cv_header_ndbm_h = no ; then + if test $ol_cv_lib_ndbm = no || test $ac_cv_header_ndbm_h = no ; then ol_cv_ndbm=no else ol_cv_ndbm=yes @@ -602,43 +884,58 @@ dnl dnl ==================================================================== dnl Check POSIX Thread version dnl -dnl defines ol_cv_posix_version to 'final' or 'draft' or 'unknown' -dnl 'unknown' implies that the version could not be detected -dnl or that pthreads.h does exist. Existance of pthreads.h -dnl should be tested separately. +dnl defines ol_cv_pthread_version to 4, 5, 6, 7, 8, 10, depending on the +dnl version of the POSIX.4a Draft that is implemented. +dnl 10 == POSIX.4a Final == POSIX.1c-1996 for our purposes. +dnl Existence of pthread.h should be tested separately. +dnl +dnl tests: +dnl pthread_detach() was dropped in Draft 8, it is present +dnl in every other version +dnl PTHREAD_CREATE_UNDETACHED is only in Draft 7, it was called +dnl PTHREAD_CREATE_JOINABLE after that +dnl pthread_attr_create was renamed to pthread_attr_init in Draft 6. +dnl Draft 6-10 has _init, Draft 4-5 has _create. +dnl pthread_attr_default was dropped in Draft 6, only 4 and 5 have it +dnl PTHREAD_MUTEX_INITIALIZER was introduced in Draft 5. It's not +dnl interesting to us because we don't try to statically +dnl initialize mutexes. 5-10 has it. +dnl +dnl Draft 9 and 10 are equivalent for our purposes. dnl AC_DEFUN([OL_POSIX_THREAD_VERSION], [AC_CACHE_CHECK([POSIX thread version],[ol_cv_pthread_version],[ - AC_EGREP_CPP(pthread_version_final,[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ # include - /* this check could be improved */ -# ifdef PTHREAD_ONCE_INIT - pthread_version_final; -# endif - ], ol_pthread_final=yes, ol_pthread_final=no) - - AC_EGREP_CPP(pthread_version_draft4,[ + ]], [[ + int i = PTHREAD_CREATE_JOINABLE; + ]])],[ + AC_EGREP_HEADER(pthread_detach,pthread.h, + ol_cv_pthread_version=10, ol_cv_pthread_version=8)],[ + AC_EGREP_CPP(draft7,[ # include - /* this check could be improved */ -# ifdef pthread_once_init - pthread_version_draft4; +# ifdef PTHREAD_CREATE_UNDETACHED + draft7 # endif - ], ol_pthread_draft4=yes, ol_pthread_draft4=no) - - if test $ol_pthread_final = yes -a $ol_pthread_draft4 = no; then - ol_cv_pthread_version=final - elif test $ol_pthread_final = no -a $ol_pthread_draft4 = yes; then - ol_cv_pthread_version=draft4 - else - ol_cv_pthread_version=unknown - fi + ], ol_cv_pthread_version=7, [ + AC_EGREP_HEADER(pthread_attr_init,pthread.h, + ol_cv_pthread_version=6, [ + AC_EGREP_CPP(draft5,[ +# include +#ifdef PTHREAD_MUTEX_INITIALIZER + draft5 +#endif + ], ol_cv_pthread_version=5, ol_cv_pthread_version=4) ]) ]) ]) ]) ])dnl dnl dnl -------------------------------------------------------------------- -AC_DEFUN([OL_PTHREAD_TEST_INCLUDES], -[/* pthread test headers */ +AC_DEFUN([OL_PTHREAD_TEST_INCLUDES], [[ +/* pthread test headers */ #include +#if HAVE_PTHREADS < 7 +#include +#endif #ifndef NULL #define NULL (void*)0 #endif @@ -648,63 +945,46 @@ static void *task(p) { return (void *) (p == NULL); } -]) -AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[ +]]) +AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ /* pthread test function */ +#ifndef PTHREAD_CREATE_DETACHED +#define PTHREAD_CREATE_DETACHED 1 +#endif pthread_t t; int status; - int detach = 1; + int detach = PTHREAD_CREATE_DETACHED; -#ifdef HAVE_PTHREADS_FINAL +#if HAVE_PTHREADS > 4 /* Final pthreads */ pthread_attr_t attr; status = pthread_attr_init(&attr); if( status ) return status; -#if defined( PTHREAD_CREATE_JOINABLE ) || defined( PTHREAD_UNDETACHED ) - if( !detach ) { -#if defined( PTHREAD_CREATE_JOINABLE ) - status = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE); +#if HAVE_PTHREADS < 7 + status = pthread_attr_setdetachstate(&attr, &detach); + if( status < 0 ) status = errno; #else - status = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_UNDETACHED); + status = pthread_attr_setdetachstate(&attr, detach); #endif - -#ifdef PTHREAD_CREATE_DETACHED - } else { - status = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); -#endif - } if( status ) return status; -#endif - status = pthread_create( &t, &attr, task, NULL ); - if( status ) return status; - -#if !defined( PTHREAD_CREATE_JOINABLE ) && !defined( PTHREAD_UNDETACHED ) - if( detach ) { - /* give thread a chance to complete */ - /* it should remain joinable and hence detachable */ - sleep( 1 ); - - status = pthread_detach( t ); - if( status ) return status; - } +#if HAVE_PTHREADS < 7 + if( status < 0 ) status = errno; #endif - + if( status ) return status; #else /* Draft 4 pthreads */ status = pthread_create( &t, pthread_attr_default, task, NULL ); - if( status ) return status; + if( status ) return errno; - if( detach ) { - /* give thread a chance to complete */ - /* it should remain joinable and hence detachable */ - sleep( 1 ); + /* give thread a chance to complete */ + /* it should remain joinable and hence detachable */ + sleep( 1 ); - status = pthread_detach( &t ); - if( status ) return status; - } + status = pthread_detach( &t ); + if( status ) return errno; #endif #ifdef HAVE_LINUX_THREADS @@ -712,10 +992,10 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[ #endif return 0; -]) +]]) AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], -[OL_PTHREAD_TEST_INCLUDES +AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES int main(argc, argv) int argc; @@ -723,7 +1003,7 @@ int main(argc, argv) { OL_PTHREAD_TEST_FUNCTION } -]) +])) dnl -------------------------------------------------------------------- AC_DEFUN([OL_PTHREAD_TRY], [# Pthread try link: $1 ($2) if test "$ol_link_threads" = no ; then @@ -733,9 +1013,11 @@ if test "$ol_link_threads" = no ; then ol_LIBS="$LIBS" LIBS="$1 $LIBS" - AC_TRY_RUN(OL_PTHREAD_TEST_PROGRAM, - [$2=yes], [$2=no], - [AC_TRY_LINK(OL_PTHREAD_TEST_INCLUDES,OL_PTHREAD_TEST_FUNCTION, + AC_RUN_IFELSE([OL_PTHREAD_TEST_PROGRAM], + [$2=yes], + [$2=no], + [AC_LINK_IFELSE([AC_LANG_PROGRAM(OL_PTHREAD_TEST_INCLUDES, + OL_PTHREAD_TEST_FUNCTION)], [$2=yes], [$2=no])]) # restore the LIBS @@ -777,6 +1059,7 @@ AC_DEFUN([OL_NT_THREADS], [ if test $ac_cv_func__beginthread = yes ; then AC_DEFINE(HAVE_NT_THREADS,1,[if you have NT Threads]) + ol_cv_nt_threads=yes fi ]) dnl ==================================================================== @@ -818,11 +1101,11 @@ AC_DEFUN([OL_LINUX_THREADS], [ AC_REQUIRE([OL_HEADER_LINUX_THREADS]) AC_REQUIRE([OL_SYS_LINUX_THREADS]) AC_CACHE_CHECK([for LinuxThreads consistency], [ol_cv_linux_threads], [ - 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 @@ -834,7 +1117,7 @@ dnl ==================================================================== dnl Check for POSIX Regex AC_DEFUN([OL_POSIX_REGEX], [ AC_CACHE_CHECK([for compatible POSIX regex],ol_cv_c_posix_regex,[ - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include static char *pattern, *string; @@ -856,17 +1139,14 @@ main() regfree(&re); return rc; -}], - [ol_cv_c_posix_regex=yes], - [ol_cv_c_posix_regex=no], - [ol_cv_c_posix_regex=cross])]) +}]])],[ol_cv_c_posix_regex=yes],[ol_cv_c_posix_regex=no],[ol_cv_c_posix_regex=cross])]) ]) dnl dnl ==================================================================== dnl Check if toupper() requires islower() to be called first AC_DEFUN([OL_C_UPPER_LOWER], [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[ - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include main() { @@ -874,32 +1154,28 @@ main() exit(0); else exit(1); -}], - [ol_cv_c_upper_lower=no], - [ol_cv_c_upper_lower=yes], - [ol_cv_c_upper_lower=safe])]) +}]])],[ol_cv_c_upper_lower=no],[ol_cv_c_upper_lower=yes],[ol_cv_c_upper_lower=safe])]) if test $ol_cv_c_upper_lower != no ; then AC_DEFINE(C_UPPER_LOWER,1, [define if toupper() requires islower()]) fi ]) dnl dnl ==================================================================== +dnl Error string checks +dnl dnl Check for declaration of sys_errlist in one of stdio.h and errno.h. dnl Declaration of sys_errlist on BSD4.4 interferes with our declaration. dnl Reported by Keith Bostic. AC_DEFUN([OL_SYS_ERRLIST], [AC_CACHE_CHECK([declaration of sys_errlist],ol_cv_dcl_sys_errlist,[ - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #include #include #ifdef WINNT #include -#endif ], - [char *c = (char *) *sys_errlist], - [ol_cv_dcl_sys_errlist=yes - ol_cv_have_sys_errlist=yes], - [ol_cv_dcl_sys_errlist=no])]) +#endif ]], [[char *c = (char *) *sys_errlist]])],[ol_cv_dcl_sys_errlist=yes + ol_cv_have_sys_errlist=yes],[ol_cv_dcl_sys_errlist=no])]) # # It's possible (for near-UNIX clones) that sys_errlist doesn't exist if test $ol_cv_dcl_sys_errlist = no ; then @@ -907,27 +1183,60 @@ if test $ol_cv_dcl_sys_errlist = no ; then [define if sys_errlist is not declared in stdio.h or errno.h]) AC_CACHE_CHECK([existence of sys_errlist],ol_cv_have_sys_errlist,[ - AC_TRY_LINK([#include ], - [char *c = (char *) *sys_errlist], - [ol_cv_have_sys_errlist=yes], - [ol_cv_have_sys_errlist=no])]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[char *c = (char *) *sys_errlist]])],[ol_cv_have_sys_errlist=yes],[ol_cv_have_sys_errlist=no])]) fi if test $ol_cv_have_sys_errlist = yes ; then AC_DEFINE(HAVE_SYS_ERRLIST,1, [define if you actually have sys_errlist in your libs]) fi ])dnl +AC_DEFUN([OL_NONPOSIX_STRERROR_R], +[AC_CACHE_CHECK([non-posix strerror_r],ol_cv_nonposix_strerror_r,[ + AC_EGREP_CPP(strerror_r,[#include ], + ol_decl_strerror_r=yes, ol_decl_strerror_r=no)dnl + + if test $ol_decl_strerror_r = yes ; then + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ /* from autoconf 2.59 */ + char buf[100]; + char x = *strerror_r (0, buf, sizeof buf); + char *p = strerror_r (0, buf, sizeof buf); + ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no]) + else + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + main() { + char buf[100]; + buf[0] = 0; + strerror_r( 1, buf, sizeof buf ); + exit( buf[0] == 0 ); + } + ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror=no],[ol_cv_nonposix_strerror=no]) + fi + ]) +if test $ol_cv_nonposix_strerror_r = yes ; then + AC_DEFINE(HAVE_NONPOSIX_STRERROR_R,1, + [define if strerror_r returns char* instead of int]) +fi +])dnl dnl +AC_DEFUN([OL_STRERROR], +[OL_SYS_ERRLIST dnl TEMPORARY +AC_CHECK_FUNCS(strerror strerror_r) +ol_cv_func_strerror_r=no +if test "${ac_cv_func_strerror_r}" = yes ; then + OL_NONPOSIX_STRERROR_R +elif test "${ac_cv_func_strerror}" = no ; then + OL_SYS_ERRLIST +fi +])dnl dnl ==================================================================== dnl Early MIPS compilers (used in Ultrix 4.2) don't like dnl "int x; int *volatile a = &x; *a = 0;" dnl -- borrowed from PDKSH -AC_DEFUN(OL_C_VOLATILE, +AC_DEFUN([OL_C_VOLATILE], [AC_CACHE_CHECK(if compiler understands volatile, ol_cv_c_volatile, - [AC_TRY_COMPILE([int x, y, z;], - [volatile int a; int * volatile b = x ? &y : &z; + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int x, y, z;]], [[volatile int a; int * volatile b = x ? &y : &z; /* Older MIPS compilers (eg., in Ultrix 4.2) don't like *b = 0 */ - *b = 0;], ol_cv_c_volatile=yes, ol_cv_c_volatile=no)]) + *b = 0;]])],[ol_cv_c_volatile=yes],[ol_cv_c_volatile=no])]) if test $ol_cv_c_volatile = yes; then : else @@ -941,13 +1250,10 @@ AC_DEFUN([OL_LIB_FETCH], [ol_LIBS=$LIBS LIBS="-lfetch -lcom_err $LIBS" AC_CACHE_CHECK([fetch(3) library],ol_cv_lib_fetch,[ - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include -#include ], - [struct url *u = fetchParseURL("file:///"); ], - [ol_cv_lib_fetch=yes], - [ol_cv_lib_fetch=no])]) +#include ]], [[struct url *u = fetchParseURL("file:///"); ]])],[ol_cv_lib_fetch=yes],[ol_cv_lib_fetch=no])]) LIBS=$ol_LIBS if test $ol_cv_lib_fetch != no ; then ol_link_fetch="-lfetch -lcom_err" @@ -957,41 +1263,10 @@ fi ])dnl dnl dnl ==================================================================== -dnl Define sig_atomic_t if not defined in signal.h -AC_DEFUN(OL_TYPE_SIG_ATOMIC_T, - [AC_CACHE_CHECK(for sig_atomic_t, ol_cv_type_sig_atomic_t, - [AC_TRY_COMPILE([#include ], [sig_atomic_t atomic;], - ol_cv_type_sig_atomic_t=yes, ol_cv_type_sig_atomic_t=no)]) - if test $ol_cv_type_sig_atomic_t = no; then - AC_DEFINE(sig_atomic_t,int, - [define to atomic type if sig_atomic_t is not available]) - fi - ])dnl -dnl -dnl ==================================================================== -dnl Define socklen_t if not defined in sys/types.h or sys/socket.h -AC_DEFUN(OL_TYPE_SOCKLEN_T, - [AC_CACHE_CHECK(for socklen_t, ol_cv_type_socklen_t, - [AC_TRY_COMPILE([ -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_SOCKET_H -#include -#endif -], [socklen_t len;], - ol_cv_type_socklen_t=yes, ol_cv_type_socklen_t=no)]) - if test $ol_cv_type_socklen_t = no; then - AC_DEFINE(socklen_t, int, - [define to int if socklen_t is not available]) - fi - ])dnl -dnl -dnl ==================================================================== dnl Define inet_aton is available -AC_DEFUN(OL_FUNC_INET_ATON, +AC_DEFUN([OL_FUNC_INET_ATON], [AC_CACHE_CHECK([for inet_aton()], ol_cv_func_inet_aton, - [AC_TRY_LINK([ + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #ifdef HAVE_SYS_TYPES_H # include #endif @@ -1005,9 +1280,8 @@ AC_DEFUN(OL_FUNC_INET_ATON, # include # endif #endif -], [struct in_addr in; -int rc = inet_aton( "255.255.255.255", &in );], - ol_cv_func_inet_aton=yes, ol_cv_func_inet_aton=no)]) +]], [[struct in_addr in; +int rc = inet_aton( "255.255.255.255", &in );]])],[ol_cv_func_inet_aton=yes],[ol_cv_func_inet_aton=no])]) if test $ol_cv_func_inet_aton != no; then AC_DEFINE(HAVE_INET_ATON, 1, [define to you inet_aton(3) is available]) @@ -1016,25 +1290,19 @@ int rc = inet_aton( "255.255.255.255", &in );], dnl dnl ==================================================================== dnl check no of arguments for ctime_r -AC_DEFUN(OL_FUNC_CTIME_R_NARGS, +AC_DEFUN([OL_FUNC_CTIME_R_NARGS], [AC_CACHE_CHECK(number of arguments of ctime_r, ol_cv_func_ctime_r_nargs, - [AC_TRY_COMPILE([#include ], - [time_t ti; char *buffer; ctime_r(&ti,buffer,32);], - ol_cv_func_ctime_r_nargs3=yes, - ol_cv_func_ctime_r_nargs3=no) + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[time_t ti; char *buffer; ctime_r(&ti,buffer,32);]])],[ol_cv_func_ctime_r_nargs3=yes],[ol_cv_func_ctime_r_nargs3=no]) - AC_TRY_COMPILE([#include ], - [time_t ti; char *buffer; ctime_r(&ti,buffer);], - ol_cv_func_ctime_r_nargs2=yes, - ol_cv_func_ctime_r_nargs2=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[time_t ti; char *buffer; ctime_r(&ti,buffer);]])],[ol_cv_func_ctime_r_nargs2=yes],[ol_cv_func_ctime_r_nargs2=no]) - 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 @@ -1051,11 +1319,9 @@ AC_DEFUN(OL_FUNC_CTIME_R_NARGS, dnl dnl -------------------------------------------------------------------- dnl check return type of ctime_r() -AC_DEFUN(OL_FUNC_CTIME_R_TYPE, +AC_DEFUN([OL_FUNC_CTIME_R_TYPE], [AC_CACHE_CHECK(return type of ctime_r, ol_cv_func_ctime_r_type, - [AC_TRY_COMPILE([#include ], - [extern int (ctime_r)();], - ol_cv_func_ctime_r_type="int", ol_cv_func_ctime_r_type="charp") + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[extern int (ctime_r)();]])],[ol_cv_func_ctime_r_type="int"],[ol_cv_func_ctime_r_type="charp"]) ]) if test $ol_cv_func_ctime_r_type = "int" ; then AC_DEFINE(CTIME_R_RETURNS_INT,1, [define if ctime_r() returns int]) @@ -1063,41 +1329,35 @@ AC_DEFUN(OL_FUNC_CTIME_R_TYPE, ])dnl dnl ==================================================================== dnl check no of arguments for gethostbyname_r -AC_DEFUN(OL_FUNC_GETHOSTBYNAME_R_NARGS, +AC_DEFUN([OL_FUNC_GETHOSTBYNAME_R_NARGS], [AC_CACHE_CHECK(number of arguments of gethostbyname_r, ol_cv_func_gethostbyname_r_nargs, - [AC_TRY_COMPILE([#include + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #include #include #include -#define BUFSIZE (sizeof(struct hostent)+10)], - [struct hostent hent; char buffer[BUFSIZE]; +#define BUFSIZE (sizeof(struct hostent)+10)]], [[struct hostent hent; char buffer[BUFSIZE]; int bufsize=BUFSIZE;int h_errno; (void)gethostbyname_r("segovia.cs.purdue.edu", &hent, - buffer, bufsize, &h_errno);], - ol_cv_func_gethostbyname_r_nargs5=yes, - ol_cv_func_gethostbyname_r_nargs5=no) + buffer, bufsize, &h_errno);]])],[ol_cv_func_gethostbyname_r_nargs5=yes],[ol_cv_func_gethostbyname_r_nargs5=no]) - AC_TRY_COMPILE([#include + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #include #include #include -#define BUFSIZE (sizeof(struct hostent)+10)], - [struct hostent hent;struct hostent *rhent; +#define BUFSIZE (sizeof(struct hostent)+10)]], [[struct hostent hent;struct hostent *rhent; char buffer[BUFSIZE]; int bufsize=BUFSIZE;int h_errno; (void)gethostbyname_r("localhost", &hent, buffer, bufsize, - &rhent, &h_errno);], - ol_cv_func_gethostbyname_r_nargs6=yes, - ol_cv_func_gethostbyname_r_nargs6=no) + &rhent, &h_errno);]])],[ol_cv_func_gethostbyname_r_nargs6=yes],[ol_cv_func_gethostbyname_r_nargs6=no]) - 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 @@ -1113,46 +1373,40 @@ AC_DEFUN(OL_FUNC_GETHOSTBYNAME_R_NARGS, ])dnl dnl dnl check no of arguments for gethostbyaddr_r -AC_DEFUN(OL_FUNC_GETHOSTBYADDR_R_NARGS, +AC_DEFUN([OL_FUNC_GETHOSTBYADDR_R_NARGS], [AC_CACHE_CHECK(number of arguments of gethostbyaddr_r, [ol_cv_func_gethostbyaddr_r_nargs], - [AC_TRY_COMPILE([#include + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #include #include #include -#define BUFSIZE (sizeof(struct hostent)+10)], - [struct hostent hent; char buffer[BUFSIZE]; +#define BUFSIZE (sizeof(struct hostent)+10)]], [[struct hostent hent; char buffer[BUFSIZE]; struct in_addr add; size_t alen=sizeof(struct in_addr); int bufsize=BUFSIZE;int h_errno; (void)gethostbyaddr_r( (void *)&(add.s_addr), - alen, AF_INET, &hent, buffer, bufsize, &h_errno);], - ol_cv_func_gethostbyaddr_r_nargs7=yes, - ol_cv_func_gethostbyaddr_r_nargs7=no) + alen, AF_INET, &hent, buffer, bufsize, &h_errno);]])],[ol_cv_func_gethostbyaddr_r_nargs7=yes],[ol_cv_func_gethostbyaddr_r_nargs7=no]) - AC_TRY_COMPILE([#include + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #include #include #include -#define BUFSIZE (sizeof(struct hostent)+10)], - [struct hostent hent; +#define BUFSIZE (sizeof(struct hostent)+10)]], [[struct hostent hent; struct hostent *rhent; char buffer[BUFSIZE]; struct in_addr add; size_t alen=sizeof(struct in_addr); int bufsize=BUFSIZE;int h_errno; (void)gethostbyaddr_r( (void *)&(add.s_addr), alen, AF_INET, &hent, buffer, bufsize, - &rhent, &h_errno);], - ol_cv_func_gethostbyaddr_r_nargs8=yes, - ol_cv_func_gethostbyaddr_r_nargs8=no) + &rhent, &h_errno);]])],[ol_cv_func_gethostbyaddr_r_nargs8=yes],[ol_cv_func_gethostbyaddr_r_nargs8=no]) - 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 @@ -1167,3 +1421,40 @@ AC_DEFUN(OL_FUNC_GETHOSTBYADDR_R_NARGS, fi ])dnl dnl +dnl -------------------------------------------------------------------- +dnl Check for Cyrus SASL version compatility +AC_DEFUN([OL_SASL_COMPAT], +[AC_CACHE_CHECK([Cyrus SASL library version], [ol_cv_sasl_compat],[ + AC_EGREP_CPP(__sasl_compat,[ +#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 + ], [ol_cv_sasl_compat=yes], [ol_cv_sasl_compat=no])]) +]) +dnl ==================================================================== +dnl check for SSL compatibility +AC_DEFUN([OL_SSL_COMPAT], +[AC_CACHE_CHECK([OpenSSL library version (CRL checking capability)], [ol_cv_ssl_crl_compat],[ + AC_EGREP_CPP(__ssl_compat,[ +#ifdef HAVE_OPENSSL_SSL_H +#include +#else +#include +#endif + +/* Require 0.9.7d+ */ +#if OPENSSL_VERSION_NUMBER >= 0x0090704fL + char *__ssl_compat = "0.9.7d"; +#endif + ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])]) +])