From ea003d8accd1c7e02a47634ea164776fc69d35f8 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 3 Jan 2012 20:00:02 +0100 Subject: [PATCH] Recompile configure --- bacula/configure | 83 +++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 46 deletions(-) diff --git a/bacula/configure b/bacula/configure index 5893712b2e..99c6030388 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.2.2. +# Generated by GNU Autoconf 2.68 for bacula 5.2.4. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='bacula' PACKAGE_TARNAME='bacula' -PACKAGE_VERSION='5.2.2' -PACKAGE_STRING='bacula 5.2.2' +PACKAGE_VERSION='5.2.4' +PACKAGE_STRING='bacula 5.2.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1549,7 +1549,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.2.2 to adapt to many kinds of systems. +\`configure' configures bacula 5.2.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1618,7 +1618,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bacula 5.2.2:";; + short | recursive ) echo "Configuration of bacula 5.2.4:";; esac cat <<\_ACEOF @@ -1819,7 +1819,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bacula configure 5.2.2 +bacula configure 5.2.4 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2749,7 +2749,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.2.2, which was +It was created by bacula $as_me 5.2.4, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -28930,31 +28930,14 @@ 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" +have_lzo=no +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" + 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 "$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 @@ -28991,17 +28974,25 @@ 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" + + LZOLIBS="-llzo2" + +$as_echo "#define HAVE_LZO 1" >>confdefs.h + + have_lzo=yes + fi -have_lzo=no -if test x$LZOLIBS = x-llzo2; then - $as_echo "#define HAVE_LZO 1" >>confdefs.h - have_lzo=yes fi + +fi + + + + support_acl=auto # Check whether --enable-acl was given. if test "${enable_acl+set}" = set; then : @@ -30301,25 +30292,25 @@ $as_echo_n "checking for systemd support... " >&6; } if test "${with_systemd+set}" = set; then : withval=$with_systemd; if test "$withval" != "no"; then - if test "$withval" = "yes"; then - SYSTEMD_UNITDIR="`systemctl show | grep UnitPath | cut -d " " -f2`" - else - SYSTEMD_UNITDIR="${withval}" - fi + if test "$withval" = "yes"; then + SYSTEMD_UNITDIR="`systemctl show | grep UnitPath | cut -d " " -f2`" + else + SYSTEMD_UNITDIR="${withval}" + fi PFILES="${PFILES} \ - platforms/systemd/Makefile \ - platforms/systemd/bacula-dir.service \ - platforms/systemd/bacula-fd.service \ - platforms/systemd/bacula-sd.service" + platforms/systemd/Makefile \ + platforms/systemd/bacula-dir.service \ + platforms/systemd/bacula-fd.service \ + platforms/systemd/bacula-sd.service" $as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } support_systemd="yes" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } support_systemd="no" fi @@ -30894,7 +30885,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.2.2, which was +This file was extended by bacula $as_me 5.2.4, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30960,7 +30951,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.2.2 +bacula config.status 5.2.4 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -- 2.39.5