From 0f9293bcca2250ec509e122dc6f40e55bbd3cff2 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Sat, 2 Jul 2011 15:18:51 +0200 Subject: [PATCH] Update configure --- bacula/configure | 134 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 104 insertions(+), 30 deletions(-) diff --git a/bacula/configure b/bacula/configure index e019f04d10..2eab49ae48 100755 --- a/bacula/configure +++ b/bacula/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for bacula 5.1.14. +# Generated by GNU Autoconf 2.68 for bacula 5.1.15. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -706,8 +706,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='bacula' PACKAGE_TARNAME='bacula' -PACKAGE_VERSION='5.1.14' -PACKAGE_STRING='bacula 5.1.14' +PACKAGE_VERSION='5.1.15' +PACKAGE_STRING='bacula 5.1.15' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -766,6 +766,7 @@ DINCLUDE DEBUG FDLIBS CAP_LIBS +LZOLIBS ZLIBS LIBOBJS X_EXTRA_LIBS @@ -1682,7 +1683,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures bacula 5.1.14 to adapt to many kinds of systems. +\`configure' configures bacula 5.1.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1751,7 +1752,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bacula 5.1.14:";; + short | recursive ) echo "Configuration of bacula 5.1.15:";; esac cat <<\_ACEOF @@ -1946,7 +1947,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bacula configure 5.1.14 +bacula configure 5.1.15 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2896,7 +2897,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bacula $as_me 5.1.14, which was +It was created by bacula $as_me 5.1.15, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -6612,13 +6613,13 @@ if ${lt_cv_nm_interface+:} false; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6615: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6616: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6618: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6619: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6621: output\"" >&5) + (eval echo "\"\$as_me:6622: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7823,7 +7824,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7826 "configure"' > conftest.$ac_ext + echo '#line 7827 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9612,11 +9613,11 @@ else -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:9615: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9616: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9619: \$? = $ac_status" >&5 + echo "$as_me:9620: \$? = $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. @@ -9951,11 +9952,11 @@ else -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:9954: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9955: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9958: \$? = $ac_status" >&5 + echo "$as_me:9959: \$? = $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. @@ -10056,11 +10057,11 @@ else -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:10059: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10060: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10063: \$? = $ac_status" >&5 + echo "$as_me:10064: \$? = $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 @@ -10111,11 +10112,11 @@ else -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:10114: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10115: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10118: \$? = $ac_status" >&5 + echo "$as_me:10119: \$? = $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 @@ -12478,7 +12479,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12481 "configure" +#line 12482 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12574,7 +12575,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12577 "configure" +#line 12578 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14530,11 +14531,11 @@ else -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:14533: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14534: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14537: \$? = $ac_status" >&5 + echo "$as_me:14538: \$? = $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. @@ -14629,11 +14630,11 @@ else -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:14632: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14633: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14636: \$? = $ac_status" >&5 + echo "$as_me:14637: \$? = $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 @@ -14681,11 +14682,11 @@ else -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:14684: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14685: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14688: \$? = $ac_status" >&5 + echo "$as_me:14689: \$? = $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 @@ -28170,6 +28171,78 @@ if test x$ZLIBS = x-lz; then fi +for ac_header in lzo/lzoconf.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "lzo/lzoconf.h" "ac_cv_header_lzo_lzoconf_h" "$ac_includes_default" +if test "x$ac_cv_header_lzo_lzoconf_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LZO_LZOCONF_H 1 +_ACEOF + +fi + +done + +for ac_header in lzo/lzo1x.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "lzo/lzo1x.h" "ac_cv_header_lzo_lzo1x_h" "$ac_includes_default" +if test "x$ac_cv_header_lzo_lzo1x_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LZO_LZO1X_H 1 +_ACEOF + +fi + +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzo1x_1_compress in -llzo2" >&5 +$as_echo_n "checking for lzo1x_1_compress in -llzo2... " >&6; } +if ${ac_cv_lib_lzo2_lzo1x_1_compress+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-llzo2 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char lzo1x_1_compress (); +int +main () +{ +return lzo1x_1_compress (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lzo2_lzo1x_1_compress=yes +else + ac_cv_lib_lzo2_lzo1x_1_compress=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzo2_lzo1x_1_compress" >&5 +$as_echo "$ac_cv_lib_lzo2_lzo1x_1_compress" >&6; } +if test "x$ac_cv_lib_lzo2_lzo1x_1_compress" = xyes; then : + LZOLIBS="-llzo2" +fi + +have_lzo=no +if test x$LZOLIBS = x-llzo2; then + $as_echo "#define HAVE_LZO 1" >>confdefs.h + + have_lzo=yes +fi + + support_acl=auto # Check whether --enable-acl was given. if test "${enable_acl+set}" = set; then : @@ -28245,7 +28318,7 @@ $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; } if test "x$ac_cv_lib_acl_acl_get_file" = xyes; then : have_acl=yes - if test $have_afs = yes; then + if test x$have_afs = xyes; then if test -d /usr/lib64/; then FDLIBS="-L/usr/lib64 -lacl $FDLIBS" else @@ -30029,7 +30102,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by bacula $as_me 5.1.14, which was +This file was extended by bacula $as_me 5.1.15, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30095,7 +30168,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -bacula config.status 5.1.14 +bacula config.status 5.1.15 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -32371,6 +32444,7 @@ Configuration on `date`: TLS support: ${support_tls} Encryption support: ${support_crypto} ZLIB support: ${have_zlib} + LZO support: ${have_lzo} enable-smartalloc: ${support_smartalloc} enable-lockmgr: ${support_lockmgr} bat support: ${support_bat} -- 2.39.5