[gentoo-commits] proj/portage-utils:master commit in: /

[Fabian Groffen]

commit:     db094136bfe35f5a03db850a6cb20dead18c25db
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 14:04:16 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 21 14:04:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=db094136

build-sys: conditionally build qmanifest

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 Makefile.am  | 9 ++++++---
 configure.ac | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f28a073..25afc1b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,6 @@ APPLETS = \
        qkeyword \
        qlist \
        qlop \
-       qmanifest \
        qmerge \
        qpkg \
        qsearch \
@@ -38,7 +37,6 @@ dist_man_MANS = \
        man/qkeyword.1 \
        man/qlist.1 \
        man/qlop.1 \
-       man/qmanifest.1 \
        man/qmerge.1 \
        man/qpkg.1 \
        man/qsearch.1 \
@@ -61,7 +59,6 @@ q_SOURCES = \
        qkeyword.c \
        qlist.c \
        qlop.c \
-       qmanifest.c \
        qmerge.c \
        qpkg.c \
        qsearch.c \
@@ -91,6 +88,12 @@ q_LDADD = \
        $(LIB_EACCESS) \
        $(NULL)
 
+if QMANIFEST_ENABLED
+q_SOURCES += qmanifest.c
+dist_man_MANS += man/qmanifest.1
+APPLETS += qmanifest
+endif
+
 install-exec-hook:
        cd $(DESTDIR)$(bindir); \
        for applet in $(APPLETS) ; do \

diff --git a/configure.ac b/configure.ac
index 2a39df8..c0284be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,7 @@ AS_IF([test "x$enable_qmanifest" != xno],
           AC_MSG_CHECKING([whether to enable qmanifest])
           AC_MSG_RESULT([no: disabled by configure argument])
        ])
+AM_CONDITIONAL([QMANIFEST_ENABLED], [test "x$enable_qmanifest" != xno])
 
 AX_CFLAGS_WARN_ALL
 AC_DEFUN([PT_CHECK_CFLAG],[AX_CHECK_COMPILER_FLAGS([$1],[CFLAGS="$CFLAGS 
$1"])])