commit: d89bbf04722d03c177f5d26963826e07a02d442a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 26 12:38:44 2026 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 26 12:38:44 2026 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=d89bbf04
configure: properly disable qmanifest, gpkg, gtree when deps are missing
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
configure | 14 ++++++++++++++
configure.ac | 7 +++++++
2 files changed, 21 insertions(+)
diff --git a/configure b/configure
index 0751603d..4de7c8c0 100755
--- a/configure
+++ b/configure
@@ -30821,6 +30821,7 @@ See 'config.log' for more details" "$LINENO" 5; }
fi
LIBBL2="no: missing dependencies"
+ enable_qmanifest=no
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -30836,6 +30837,7 @@ See 'config.log' for more details" "$LINENO" 5; }
fi
LIBBL2="no: missing dependencies"
+ enable_qmanifest=no
else
LIBBL2_CFLAGS=$pkg_cv_LIBBL2_CFLAGS
@@ -30938,6 +30940,9 @@ See 'config.log' for more details" "$LINENO" 5; }
fi
GPGME="no: missing dependencies"
+ enable_qmanifest=no
+ enable_gpkg=no
+ enable_gtree=no
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -30971,6 +30976,9 @@ See 'config.log' for more details" "$LINENO" 5; }
fi
GPGME="no: missing dependencies"
+ enable_qmanifest=no
+ enable_gpkg=no
+ enable_gtree=no
else
GPGME_CFLAGS=$pkg_cv_GPGME_CFLAGS
@@ -31064,6 +31072,8 @@ See 'config.log' for more details" "$LINENO" 5; }
fi
LIBARCHIVE="no: missing dependencies"
+ enable_gpkg=no
+ enable_gtree=no
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -31088,6 +31098,8 @@ See 'config.log' for more details" "$LINENO" 5; }
fi
LIBARCHIVE="no: missing dependencies"
+ enable_gpkg=no
+ enable_gtree=no
else
LIBARCHIVE_CFLAGS=$pkg_cv_LIBARCHIVE_CFLAGS
@@ -31175,6 +31187,7 @@ See 'config.log' for more details" "$LINENO" 5; }
fi
LIBZ="no: missing dependencies"
+ enable_qmanifest=no
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -31190,6 +31203,7 @@ See 'config.log' for more details" "$LINENO" 5; }
fi
LIBZ="no: missing dependencies"
+ enable_qmanifest=no
else
LIBZ_CFLAGS=$pkg_cv_LIBZ_CFLAGS
diff --git a/configure.ac b/configure.ac
index c628444b..213755b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,7 @@ PKG_CHECK_MODULES([LIBBL2], [libb2],
AC_MSG_FAILURE([--enable-qmanifest was given, but
libb2.pc could not be found])
])
LIBBL2="no: missing dependencies"
+ enable_qmanifest=no
])
PKG_CHECK_MODULES([GPGME], [gpgme],
@@ -94,6 +95,9 @@ PKG_CHECK_MODULES([GPGME], [gpgme],
AC_MSG_FAILURE([--enable-gtree was given, but
gpgme.pc could not be found])
])
GPGME="no: missing dependencies"
+ enable_qmanifest=no
+ enable_gpkg=no
+ enable_gtree=no
])
PKG_CHECK_MODULES([LIBARCHIVE], [libarchive],
@@ -111,6 +115,8 @@ PKG_CHECK_MODULES([LIBARCHIVE], [libarchive],
AC_MSG_FAILURE([--enable-gtree was given, but
libarchive.pc could not be found])
])
LIBARCHIVE="no: missing dependencies"
+ enable_gpkg=no
+ enable_gtree=no
])
AS_IF([test "x${enable_qmanifest}" != "xno"], [
@@ -122,6 +128,7 @@ AS_IF([test "x${enable_qmanifest}" != "xno"], [
AC_MSG_FAILURE([--enable-qmanifest was given, but zlib.pc could not be
found])
])
LIBZ="no: missing dependencies"
+ enable_qmanifest=no
])
AC_MSG_CHECKING([whether to enable qmanifest])
