From a8841128a9f87ec06bcdb87ec2397ef1b16b3bd2 Mon Sep 17 00:00:00 2001 From: Marco van Wieringen Date: Sat, 1 May 2010 21:42:10 +0200 Subject: [PATCH] Move some AC_MSG_RESULT macros around so the configure output looks somewhat cleaner. --- bacula/autoconf/bacula-macros/db.m4 | 4 ++-- bacula/autoconf/configure.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bacula/autoconf/bacula-macros/db.m4 b/bacula/autoconf/bacula-macros/db.m4 index 6c68e724b9..1eea0772f0 100644 --- a/bacula/autoconf/bacula-macros/db.m4 +++ b/bacula/autoconf/bacula-macros/db.m4 @@ -737,6 +737,8 @@ AC_HELP_STRING([--with-postgresql@<:@=DIR@:>@], [Include PostgreSQL support. DIR AC_MSG_RESULT(no) AC_MSG_ERROR(Invalid PostgreSQL directory $withval - unable to find libpq-fe.h under $withval) fi + AC_DEFINE(HAVE_POSTGRESQL) + AC_MSG_RESULT(yes) POSTGRESQL_LFLAGS="-L$POSTGRESQL_LIBDIR -lpq" AC_CHECK_FUNC(crypt, , AC_CHECK_LIB(crypt, crypt, [POSTGRESQL_LFLAGS="$POSTGRESQL_LFLAGS -lcrypt"])) SQL_INCLUDE=-I$POSTGRESQL_INCDIR @@ -744,8 +746,6 @@ AC_HELP_STRING([--with-postgresql@<:@=DIR@:>@], [Include PostgreSQL support. DIR SQL_BINDIR=$POSTGRESQL_BINDIR SQL_LIB=$POSTGRESQL_LIBDIR/libpq.a - AC_DEFINE(HAVE_POSTGRESQL) - AC_MSG_RESULT(yes) db_found=yes support_postgresql=yes db_type=PostgreSQL diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index a7eb4b7803..fa62cba428 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -1200,6 +1200,7 @@ else OPENSSL_LIBS="" OPENSSL_INC="" fi +AC_MSG_RESULT([$support_tls]) if test "$support_tls" = "no"; then OPENSSL_LIBS="" @@ -1212,7 +1213,6 @@ else AC_CHECK_LIB(ssl, EVP_PKEY_encrypt_old, AC_DEFINE(HAVE_OPENSSLv1, 1, [Set if have OpenSSL version 1.x])) fi -AC_MSG_RESULT([$support_tls]) AC_SUBST(OPENSSL_LIBS) AC_SUBST(OPENSSL_INC) -- 2.39.5