|
 |
82a57af |
From ef6047e5645efbc05f260260b174a4043dda21fd Mon Sep 17 00:00:00 2001
|
|
|
82a57af |
From: Jan Kara <jack@suse.cz>
|
|
|
82a57af |
Date: Mon, 4 Jan 2016 15:36:27 +0100
|
|
|
82a57af |
Subject: [PATCH] Print explicitely disabled options properly
|
|
|
82a57af |
MIME-Version: 1.0
|
|
|
82a57af |
Content-Type: text/plain; charset=UTF-8
|
|
|
82a57af |
Content-Transfer-Encoding: 8bit
|
|
|
82a57af |
|
|
|
82a57af |
Ported to 3.04:
|
|
|
82a57af |
commit 6ccb66159a9eee6ca114b11b70eb06f4ac6900d7
|
|
|
82a57af |
Author: Jan Kara <jack@suse.cz>
|
|
|
82a57af |
Date: Mon Jan 4 15:36:27 2016 +0100
|
|
|
82a57af |
|
|
|
82a57af |
Print explicitely disabled options properly
|
|
|
82a57af |
|
|
|
82a57af |
Currently we printed only an empty string when some build option was
|
|
|
82a57af |
disabled explicitely via --disable-foo. Print 'no' in that case as well.
|
|
|
82a57af |
|
|
|
82a57af |
Signed-off-by: Jan Kara <jack@suse.cz>
|
|
|
82a57af |
|
|
|
82a57af |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
82a57af |
---
|
|
|
82a57af |
configure.ac | 12 +++++++++++-
|
|
|
82a57af |
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
82a57af |
|
|
|
82a57af |
diff --git a/configure.ac b/configure.ac
|
|
|
82a57af |
index 1994945..82aabcb 100644
|
|
|
82a57af |
--- a/configure.ac
|
|
|
82a57af |
+++ b/configure.ac
|
|
|
82a57af |
@@ -74,7 +74,7 @@ AC_ARG_ENABLE([ldapmail],
|
|
|
82a57af |
AS_IF([test "x$enable_ldapmail" != "xno"], [
|
|
|
82a57af |
build_ldap="yes"
|
|
|
82a57af |
AC_CHECK_LIB([ldap], [ldap_initialize], [:;], [
|
|
|
82a57af |
- build_ldap=no
|
|
|
82a57af |
+ build_ldap="no"
|
|
|
82a57af |
AS_IF([test "x$enable_ldapmail" = "xyes"], [
|
|
|
82a57af |
AC_MSG_ERROR([LDAP support required but library not found.]);
|
|
|
82a57af |
])
|
|
|
82a57af |
@@ -84,6 +84,8 @@ AS_IF([test "x$enable_ldapmail" != "xno"], [
|
|
|
82a57af |
AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP])
|
|
|
82a57af |
COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP"
|
|
|
82a57af |
])
|
|
|
82a57af |
+], [
|
|
|
82a57af |
+ build_ldap="no"
|
|
|
82a57af |
])
|
|
|
82a57af |
AC_SUBST(LDAP_LIBS)
|
|
|
82a57af |
|
|
|
82a57af |
@@ -113,6 +115,8 @@ AS_IF([test "x$enable_ext2direct" != "xno"], [
|
|
|
82a57af |
AC_DEFINE([EXT2_DIRECT], 1, [Scanning of ext? filesystems using e2fslib])
|
|
|
82a57af |
COMPILE_OPTS="$COMPILE_OPTS EXT2_DIRECT"
|
|
|
82a57af |
])
|
|
|
82a57af |
+], [
|
|
|
82a57af |
+ build_ext2direct="no"
|
|
|
82a57af |
])
|
|
|
82a57af |
AC_SUBST(EXT2FS_CFLAGS)
|
|
|
82a57af |
AC_SUBST(EXT2FS_LIBS)
|
|
|
82a57af |
@@ -141,6 +145,8 @@ AS_IF([test "x$enable_netlink" != "xno"], [
|
|
|
82a57af |
AC_MSG_ERROR([Required libnl3 libraries for quota netlink daemon not found.])
|
|
|
82a57af |
])
|
|
|
82a57af |
])
|
|
|
82a57af |
+], [
|
|
|
82a57af |
+ build_netlink="no"
|
|
|
82a57af |
])
|
|
|
82a57af |
AM_CONDITIONAL([WITH_NETLINK], [test "x$build_netlink" != "xno"])
|
|
|
82a57af |
AC_SUBST(DBUS_CFLAGS)
|
|
|
82a57af |
@@ -171,6 +177,8 @@ AS_IF([test "x$enable_libwrap" != "xno"], [
|
|
|
82a57af |
AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
|
|
|
82a57af |
COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
|
|
|
82a57af |
])
|
|
|
82a57af |
+], [
|
|
|
82a57af |
+ build_libwrap="no"
|
|
|
82a57af |
])
|
|
|
82a57af |
AC_SUBST(WRAP_LIBS)
|
|
|
82a57af |
|
|
|
82a57af |
@@ -199,6 +207,8 @@ AS_IF([test x"$enable_rpc" != "xno"], [
|
|
|
82a57af |
AC_DEFINE([RPC], 1, [Support for RPC])
|
|
|
82a57af |
COMPILE_OPTS="$COMPILE_OPTS RPC"
|
|
|
82a57af |
])
|
|
|
82a57af |
+], [
|
|
|
82a57af |
+ build_rpc="no"
|
|
|
82a57af |
])
|
|
|
82a57af |
AM_CONDITIONAL([WITH_RPC], [test x"$build_rpc" != "xno"])
|
|
|
82a57af |
|
|
|
82a57af |
--
|
|
|
82a57af |
2.9.4
|
|
|
82a57af |
|