From 1a50d738d722e0963b0481dafa4ec0cceff1cc8b Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 27 Dec 2015 14:21:06 +0100 Subject: [PATCH] Tweak recompile configure --- bacula/autoconf/config.h.in | 13 +++++++++---- bacula/configure | 30 +++++++++++++++++------------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in index 00a8058037..5cc08b80ad 100644 --- a/bacula/autoconf/config.h.in +++ b/bacula/autoconf/config.h.in @@ -116,6 +116,9 @@ /* Define if you have lzo lib */ #undef HAVE_LZO +/* Define if you have libacl */ +#undef HAVE_ACL + /* General libs */ #undef LIBS @@ -134,7 +137,6 @@ /* OSes */ #undef HAVE_LINUX_OS #undef HAVE_FREEBSD_OS -#undef HAVE_KFREEBSD_OS #undef HAVE_NETBSD_OS #undef HAVE_OPENBSD_OS #undef HAVE_BSDI_OS @@ -620,6 +622,9 @@ /* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT +/* Define to 1 if you have LZO compression */ +#undef HAVE_LZO + /* Define to 1 if you have the header file. */ #undef HAVE_MALLOC_H @@ -1094,9 +1099,9 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION /* Define to 1 if the `S_IS*' macros in do not work properly. */ diff --git a/bacula/configure b/bacula/configure index 445dfd59f6..1b3cd52e01 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.69 for bacula 7.2.0. +# Generated by GNU Autoconf 2.69 for bacula 7.2.1. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='bacula' PACKAGE_TARNAME='bacula' -PACKAGE_VERSION='7.2.0' -PACKAGE_STRING='bacula 7.2.0' +PACKAGE_VERSION='7.2.1' +PACKAGE_STRING='bacula 7.2.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -681,11 +681,11 @@ sd_group sd_user dir_group dir_user +db_ssl_options db_port db_password db_user db_name -db_ssl_options mon_sd_password mon_fd_password mon_dir_password @@ -1564,7 +1564,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 7.2.0 to adapt to many kinds of systems. +\`configure' configures bacula 7.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1633,7 +1633,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bacula 7.2.0:";; + short | recursive ) echo "Configuration of bacula 7.2.1:";; esac cat <<\_ACEOF @@ -1721,6 +1721,9 @@ Optional Packages: --with-db-user=UNAME specify database user [default=bacula] --with-db-password=PWD specify database password [default=*none*] --with-db-port=DBPORT specify a database port [default=null] + --with-db-ssl-options=DBSSLOPTIONS + specify SSL options for database user connection + [default=null] --with-dir-user=USER specify user for Director daemon --with-dir-group=GROUP specify group for Director daemon --with-sd-user=USER specify user for Storage daemon @@ -1828,7 +1831,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bacula configure 7.2.0 +bacula configure 7.2.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2763,7 +2766,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 7.2.0, which was +It was created by bacula $as_me 7.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -23657,15 +23660,16 @@ if test "${with_db_port+set}" = set; then : fi -+db_ssl_options= +db_ssl_options= + # Check whether --with-db_ssl_options was given. if test "${with_db_ssl_options+set}" = set; then : withval=$with_db_ssl_options; if test "x$withval" != "x" ; then - db_ssl_options=$withval + db_ssl_options=$withval fi @@ -30509,7 +30513,7 @@ CFLAGS=${CFLAGS--O} if test x$have_gcc = xyes ; then CPPFLAGS="$CPPFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti" - CFLAGS="$CFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti" + CFLAGS="$CFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti" fi LDFLAGS=${LDFLAGS--O} CPPFLAGS="$CPPFLAGS" @@ -31407,7 +31411,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 7.2.0, which was +This file was extended by bacula $as_me 7.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31473,7 +31477,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 7.2.0 +bacula config.status 7.2.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- 2.39.2