From: Kern Sibbald Date: Sun, 3 Feb 2019 16:38:34 +0000 (+0100) Subject: Recompile configure.in X-Git-Tag: Release-9.4.2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c97111b59cadbc63c1ddb1437a756259f856a341;p=thirdparty%2Fbacula.git Recompile configure.in --- diff --git a/bacula/configure b/bacula/configure index 30f28a287..e0db7dd65 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 9.4.0. +# Generated by GNU Autoconf 2.69 for bacula 9.4.2. # # # 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='9.4.0' -PACKAGE_STRING='bacula 9.4.0' +PACKAGE_VERSION='9.4.2' +PACKAGE_STRING='bacula 9.4.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1588,7 +1588,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 9.4.0 to adapt to many kinds of systems. +\`configure' configures bacula 9.4.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1658,7 +1658,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bacula 9.4.0:";; + short | recursive ) echo "Configuration of bacula 9.4.2:";; esac cat <<\_ACEOF @@ -1857,7 +1857,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bacula configure 9.4.0 +bacula configure 9.4.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2792,7 +2792,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 9.4.0, which was +It was created by bacula $as_me 9.4.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4847,6 +4847,12 @@ if test ! -e $CXX; then as_fn_error $? "Unable to find C++ compiler" "$LINENO" 5 fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multiarch system" >&5 +$as_echo_n "checking for multiarch system... " >&6; } +multiarch=`$CC $CFLAGS -print-multiarch 2>/dev/null` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $multiarch" >&5 +$as_echo "$multiarch" >&6; } + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -24612,7 +24618,9 @@ if test "${with_sqlite3+set}" = set; then : SQLITE_BINDIR=/usr/local/bin elif test -f /usr/include/sqlite3.h; then SQLITE_INCDIR=/usr/include - if test -d /usr/lib64; then + if test -n $multiarch -a -d /usr/lib/$multiarch; then + SQLITE_LIBDIR=/usr/lib/$multiarch + elif test -d /usr/lib64; then SQLITE_LIBDIR=/usr/lib64 else SQLITE_LIBDIR=/usr/lib @@ -31791,7 +31799,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 9.4.0, which was +This file was extended by bacula $as_me 9.4.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31857,7 +31865,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 9.4.0 +bacula config.status 9.4.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\"