From 16b144c64a2e199e73875383d297f1d91a8183b2 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Sat, 17 Sep 2005 22:24:47 +0000 Subject: [PATCH] Rebuild for configure.in rev 1.600 (POSIX 1003.1-2001 support) --- configure | 263 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 134 insertions(+), 129 deletions(-) diff --git a/configure b/configure index 6477498478..b058596b58 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /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.600 2005/09/17 20:22:15 hallvard Exp . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -1585,7 +1585,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 @@ -3701,19 +3701,19 @@ echo "$as_me: WARNING: LDBM disabled, ignoring --enable-ldbm-api argument" >&2;} echo "$as_me: WARNING: LDBM disabled, ignoring --enable-ldbm-type argument" >&2;} fi - if test $ol_enable_modules != yes -a \ - $ol_enable_bdb = no -a \ - $ol_enable_dnssrv = no -a \ - $ol_enable_hdb = no -a \ - $ol_enable_ldap = no -a \ - $ol_enable_meta = no -a \ - $ol_enable_monitor = no -a \ - $ol_enable_null = no -a \ - $ol_enable_passwd = no -a \ - $ol_enable_perl = no -a \ - $ol_enable_relay = no -a \ - $ol_enable_shell = no -a \ - $ol_enable_sql = no ; then + if test $ol_enable_modules != yes && + test $ol_enable_bdb = no && + test $ol_enable_dnssrv = no && + test $ol_enable_hdb = no && + test $ol_enable_ldap = no && + test $ol_enable_meta = no && + test $ol_enable_monitor = no && + test $ol_enable_null = no && + test $ol_enable_passwd = no && + test $ol_enable_perl = no && + test $ol_enable_relay = no && + test $ol_enable_shell = no && + test $ol_enable_sql = no ; then if test $ol_enable_slapd = yes ; then { { echo "$as_me:$LINENO: error: slapd requires a backend" >&5 @@ -3729,31 +3729,31 @@ echo "$as_me: WARNING: skipping slapd, no backend specified" >&2;} ol_enable_ldbm_api=no ol_enable_ldbm_type=no - if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then + if test $ol_enable_bdb/$ol_enable_hdb != no/no; then ol_enable_ldbm_api=berkeley fi else - if test $ol_enable_ldbm_api = gdbm -a \ - $ol_enable_ldbm_type = btree ; then + if test $ol_enable_ldbm_api = gdbm && + test $ol_enable_ldbm_type = btree ; then { { echo "$as_me:$LINENO: error: GDBM only supports LDBM type hash" >&5 echo "$as_me: error: GDBM only supports LDBM type hash" >&2;} { (exit 1); exit 1; }; } fi - if test $ol_enable_ldbm_api = mdbm -a \ - $ol_enable_ldbm_type = btree ; then + if test $ol_enable_ldbm_api = mdbm && + test $ol_enable_ldbm_type = btree ; then { { echo "$as_me:$LINENO: error: MDBM only supports LDBM type hash" >&5 echo "$as_me: error: MDBM only supports LDBM type hash" >&2;} { (exit 1); exit 1; }; } fi - if test $ol_enable_ldbm_api = ndbm -a \ - $ol_enable_ldbm_type = btree ; then + if test $ol_enable_ldbm_api = ndbm && + test $ol_enable_ldbm_type = btree ; then { { echo "$as_me:$LINENO: error: NDBM only supports LDBM type hash" >&5 echo "$as_me: error: NDBM only supports LDBM type hash" >&2;} { (exit 1); exit 1; }; } fi - if test $ol_enable_bdb != no -o $ol_enable_hdb != no ; then + if test $ol_enable_bdb/$ol_enable_hdb != no/no ; then if test $ol_enable_ldbm_api = auto ; then ol_enable_ldbm_api=berkeley elif test $ol_enable_ldbm_api != berkeley ; then @@ -3764,7 +3764,7 @@ echo "$as_me: error: LDBM API not compatible with BDB/HDB" >&2;} fi fi -if test $ol_enable_meta = yes -a $ol_enable_ldap = no ; then +if test $ol_enable_meta/$ol_enable_ldap = yes/no ; then { { echo "$as_me:$LINENO: error: --enable-meta requires --enable-ldap" >&5 echo "$as_me: error: --enable-meta requires --enable-ldap" >&2;} { (exit 1); exit 1; }; } @@ -3967,10 +3967,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 @@ -5685,7 +5686,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5688 "configure"' > conftest.$ac_ext + echo '#line 5689 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7665,11 +7666,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7668: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7669: $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:7673: \$? = $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. @@ -7927,11 +7928,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7930: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7931: $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:7935: \$? = $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. @@ -7989,11 +7990,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7992: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7993: $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:7997: \$? = $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 @@ -10229,7 +10230,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&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 @@ -17387,7 +17388,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 +17608,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 +17707,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; }; } @@ -17887,9 +17888,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 @@ -18495,10 +18494,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 @@ -18891,8 +18893,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) @@ -19134,9 +19135,10 @@ _ACEOF fi fi fi -fi + ;; +esac -if test $ol_link_krb4 = yes -a $ol_enable_kbind != no ; then +if test $ol_link_krb4 = yes && test $ol_enable_kbind != no ; then ol_link_kbind=yes elif test $ol_enable_kbind = yes ; then @@ -19145,14 +19147,14 @@ echo "$as_me: error: Kerberos IV detection failed" >&2;} { (exit 1); exit 1; }; } fi -if test $ol_link_krb4 = yes -o $ol_link_krb5 = yes ; then +if test $ol_link_krb4 = yes || test $ol_link_krb5 = yes ; then cat >>confdefs.h <<\_ACEOF #define HAVE_KERBEROS 1 _ACEOF -elif test $ol_with_kerberos != auto -a $ol_with_kerberos != no ; then +elif test $ol_with_kerberos != auto && test $ol_with_kerberos != no ; then { { echo "$as_me:$LINENO: error: Kerberos detection failed" >&5 echo "$as_me: error: Kerberos detection failed" >&2;} { (exit 1); exit 1; }; } @@ -19313,8 +19315,8 @@ fi done - if test $ac_cv_header_openssl_ssl_h = yes \ - -o $ac_cv_header_ssl_h = yes ; then + if test $ac_cv_header_openssl_ssl_h = yes || + test $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 @@ -19647,8 +19649,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 +19776,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 @@ -24171,9 +24172,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 +24252,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 +24670,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 @@ -24950,10 +24951,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) @@ -25403,10 +25404,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 @@ -25646,10 +25647,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) @@ -25802,7 +25803,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 @@ -26232,7 +26234,8 @@ _ACEOF fi fi fi -fi + ;; +esac if test $ol_with_yielding_select = yes ; then @@ -26990,7 +26993,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 +27137,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 @@ -27379,13 +27382,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 +27523,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 +27670,13 @@ ol_cv_func_gethostbyaddr_r_nargs8=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - if test $ol_cv_func_gethostbyaddr_r_nargs7 = yes -a \ - $ol_cv_func_gethostbyaddr_r_nargs8 = no ; then + if test $ol_cv_func_gethostbyaddr_r_nargs7 = yes && + test $ol_cv_func_gethostbyaddr_r_nargs8 = no ; then ol_cv_func_gethostbyaddr_r_nargs=7 - elif test $ol_cv_func_gethostbyaddr_r_nargs7 = no -a \ - $ol_cv_func_gethostbyaddr_r_nargs8 = yes ; then + elif test $ol_cv_func_gethostbyaddr_r_nargs7 = no && + test $ol_cv_func_gethostbyaddr_r_nargs8 = yes ; then ol_cv_func_gethostbyaddr_r_nargs=8 @@ -27698,9 +27701,7 @@ fi ol_link_ldbm=no -if test $ol_enable_ldbm_api = auto \ - -o $ol_enable_ldbm_api = berkeley \ - -o $ol_enable_ldbm_api = bcompat ; then +case $ol_enable_ldbm_api in auto | berkeley | bcompat) if test $ol_enable_ldbm_api = bcompat; then \ @@ -27854,7 +27855,7 @@ fi done -if test $ac_cv_header_db_185_h = yes -o $ac_cv_header_db_h = yes; then +if test $ac_cv_header_db_185_h = yes || test $ac_cv_header_db_h = yes; then echo "$as_me:$LINENO: checking if Berkeley DB header compatibility" >&5 echo $ECHO_N "checking if Berkeley DB header compatibility... $ECHO_C" >&6 if test "${ol_cv_header_db1+set}" = set; then @@ -33104,9 +33105,10 @@ _ACEOF LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_db" fi fi -fi + ;; +esac -if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then +if test $ol_enable_bdb/$ol_enable_hdb != no/no; then if test $ol_link_ldbm != berkeley ; then { { echo "$as_me:$LINENO: error: BDB/HDB: BerkeleyDB not available" >&5 echo "$as_me: error: BDB/HDB: BerkeleyDB not available" >&2;} @@ -33162,13 +33164,13 @@ echo "$as_me: error: BDB/HDB: BerkeleyDB version incompatible" >&2;} fi fi -if test $ol_link_ldbm = no -a $ol_enable_ldbm_type = btree ; then +if test $ol_link_ldbm = no && test $ol_enable_ldbm_type = btree ; then { echo "$as_me:$LINENO: WARNING: Could not find LDBM with BTREE support" >&5 echo "$as_me: WARNING: Could not find LDBM with BTREE support" >&2;} ol_enable_ldbm_api=none fi -if test $ol_enable_ldbm_api = auto -o $ol_enable_ldbm_api = mdbm ; then +if test $ol_enable_ldbm_api = auto || test $ol_enable_ldbm_api = mdbm ; then echo "$as_me:$LINENO: checking for MDBM library" >&5 echo $ECHO_N "checking for MDBM library... $ECHO_C" >&6 if test "${ol_cv_lib_mdbm+set}" = set; then @@ -33505,7 +33507,7 @@ if test "${ol_cv_mdbm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test $ol_cv_lib_mdbm = no -o $ac_cv_header_mdbm_h = no ; then + if test $ol_cv_lib_mdbm = no || test $ac_cv_header_mdbm_h = no ; then ol_cv_mdbm=no else ol_cv_mdbm=yes @@ -33532,7 +33534,7 @@ _ACEOF fi fi -if test $ol_enable_ldbm_api = auto -o $ol_enable_ldbm_api = gdbm ; then +if test $ol_enable_ldbm_api = auto || test $ol_enable_ldbm_api = gdbm ; then echo "$as_me:$LINENO: checking for GDBM library" >&5 echo $ECHO_N "checking for GDBM library... $ECHO_C" >&6 if test "${ol_cv_lib_gdbm+set}" = set; then @@ -33869,7 +33871,7 @@ if test "${ol_cv_gdbm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test $ol_cv_lib_gdbm = no -o $ac_cv_header_gdbm_h = no ; then + if test $ol_cv_lib_gdbm = no || test $ac_cv_header_gdbm_h = no ; then ol_cv_gdbm=no else ol_cv_gdbm=yes @@ -34304,7 +34306,7 @@ if test "${ol_cv_ndbm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test $ol_cv_lib_ndbm = no -o $ac_cv_header_ndbm_h = no ; then + if test $ol_cv_lib_ndbm = no || test $ac_cv_header_ndbm_h = no ; then ol_cv_ndbm=no else ol_cv_ndbm=yes @@ -34332,20 +34334,20 @@ _ACEOF fi fi -if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then +if test $ol_link_ldbm = no && test $ol_enable_ldbm != no ; then { { echo "$as_me:$LINENO: error: could not find suitable LDBM backend" >&5 echo "$as_me: error: could not find suitable LDBM backend" >&2;} { (exit 1); exit 1; }; } fi -if test $ol_enable_bdb = yes -o \ - $ol_enable_hdb = yes -o \ - $ol_enable_ldbm = yes ; then +if test $ol_enable_bdb = yes || + test $ol_enable_hdb = yes || + test $ol_enable_ldbm = yes ; then SLAPD_LIBS="$SLAPD_LIBS \$(LDBM_LIBS)" fi -if test $ol_enable_dynamic = yes -a $enable_shared = yes ; then +if test $ol_enable_dynamic = yes && test $enable_shared = yes ; then BUILD_LIBS_DYNAMIC=shared cat >>confdefs.h <<\_ACEOF @@ -34745,7 +34747,7 @@ fi echo "$as_me:$LINENO: result: $ac_cv_func_openlog" >&5 echo "${ECHO_T}$ac_cv_func_openlog" >&6 - if test $ac_cv_func_openlog = no -a $ol_enable_syslog = yes; then + if test $ac_cv_func_openlog = no && test $ol_enable_syslog = yes; then { { echo "$as_me:$LINENO: error: could not find syslog" >&5 echo "$as_me: error: could not find syslog" >&2;} { (exit select appropriate options or disable); exit select appropriate options or disable; }; } @@ -35232,7 +35234,8 @@ fi done - if test $ac_cv_header_sasl_sasl_h = yes -o $ac_cv_header_sasl_h = yes; then + if test $ac_cv_header_sasl_sasl_h = yes || + test $ac_cv_header_sasl_h = yes; then echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl2" >&5 echo $ECHO_N "checking for sasl_client_init in -lsasl2... $ECHO_C" >&6 if test "${ac_cv_lib_sasl2_sasl_client_init+set}" = set; then @@ -35559,7 +35562,7 @@ echo "$as_me: WARNING: Strong authentication not supported!" >&2;} fi fi -if test $cross_compiling != yes -a "$ac_cv_mingw32" != yes ; then +if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then dev=no if test -r /dev/urandom ; then dev="/dev/urandom"; @@ -36749,18 +36752,18 @@ done ol_have_bn_h=no ol_have_crypto_h=no - if test "$ac_cv_header_openssl_bn_h" = "yes" \ - -o "$ac_cv_header_bn_h" = "yes" ; then + if test "$ac_cv_header_openssl_bn_h" = "yes" || + test "$ac_cv_header_bn_h" = "yes" ; then ol_have_bn_h=yes fi - if test "$ac_cv_header_openssl_crypto_h" = "yes" \ - -o "$ac_cv_header_crypto_h" = "yes" ; then + if test "$ac_cv_header_openssl_crypto_h" = "yes" || + test "$ac_cv_header_crypto_h" = "yes" ; then ol_have_crypto_h=yes fi - if test "$ol_have_bn_h" = "yes" \ - -a "$ol_have_crypto_h" = "yes" ; then + if test "$ol_have_bn_h" = "yes" && + test "$ol_have_crypto_h" = "yes" ; then ol_have_bignum=yes fi fi @@ -41838,7 +41841,8 @@ 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 @@ -42286,7 +42290,7 @@ _ACEOF fi -if test "$ol_link_ldbm" != no -a $ol_enable_ldbm != no; then +if test "$ol_link_ldbm" != no && test $ol_enable_ldbm != no; then BUILD_SLAPD=yes BUILD_LDBM=$ol_enable_ldbm if test "$ol_enable_ldbm" = mod ; then @@ -42669,8 +42673,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 -- 2.39.5