aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2019-07-14 15:09:30 +0200
committerFabian Groffen <grobian@gentoo.org>2019-07-14 15:09:30 +0200
commitd801e8d09d8aa9c79122d8fa7f6da406d5a9f904 (patch)
tree79a10e8d8e26833c8921bbeb0434111885e9564c /configure
parentqtegrity: use libq/hash iso shelling out to shaXsum (diff)
downloadportage-utils-d801e8d09d8aa9c79122d8fa7f6da406d5a9f904.tar.gz
portage-utils-d801e8d09d8aa9c79122d8fa7f6da406d5a9f904.tar.bz2
portage-utils-d801e8d09d8aa9c79122d8fa7f6da406d5a9f904.zip
buildsys: regen
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure250
1 files changed, 154 insertions, 96 deletions
diff --git a/configure b/configure
index 3af992dd..0bb18e84 100755
--- a/configure
+++ b/configure
@@ -639,6 +639,8 @@ am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+QTEGRITY_ENABLED_FALSE
+QTEGRITY_ENABLED_TRUE
QMANIFEST_ENABLED_FALSE
QMANIFEST_ENABLED_TRUE
GPGME_LIBS
@@ -1806,6 +1808,7 @@ with_sysroot
enable_libtool_lock
with_eprefix
enable_qmanifest
+enable_qtegrity
with_gpgme_prefix
'
ac_precious_vars='build_alias
@@ -2453,6 +2456,7 @@ Optional Features:
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-qmanifest support qmanifest applet
+ --enable-qtegrity support qtegrity applet
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -34426,106 +34430,19 @@ else
enable_qmanifest=auto
fi
+# Check whether --enable-qtegrity was given.
+if test "${enable_qtegrity+set}" = set; then :
+ enableval=$enable_qtegrity;
+else
+ enable_qtegrity=auto
+fi
+
LIBSSL=
LIBBL2=
LIBZ=
HASGPGME=
-# Check whether --with-gpgme-prefix was given.
-if test "${with_gpgme_prefix+set}" = set; then :
- withval=$with_gpgme_prefix; gpgme_config_prefix="$withval"
-else
- gpgme_config_prefix=""
-fi
-
- if test x"${GPGME_CONFIG}" = x ; then
- if test x"${gpgme_config_prefix}" != x ; then
- GPGME_CONFIG="${gpgme_config_prefix}/bin/gpgme-config"
- else
- case "${SYSROOT}" in
- /*)
- if test -x "${SYSROOT}/bin/gpgme-config" ; then
- GPGME_CONFIG="${SYSROOT}/bin/gpgme-config"
- fi
- ;;
- '')
- ;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5
-$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;}
- ;;
- esac
- fi
- fi
-
- use_gpgrt_config=""
- if test x"${GPGME_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
- if $GPGRT_CONFIG gpgme --exists; then
- GPGME_CONFIG="$GPGRT_CONFIG gpgme"
- { $as_echo "$as_me:${as_lineno-$LINENO}: Use gpgrt-config as gpgme-config" >&5
-$as_echo "$as_me: Use gpgrt-config as gpgme-config" >&6;}
- use_gpgrt_config=yes
- fi
- fi
- if test -z "$use_gpgrt_config"; then
- # Extract the first word of "gpgme-config", so it can be a program name with args.
-set dummy gpgme-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GPGME_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $GPGME_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GPGME_CONFIG="$GPGME_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GPGME_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GPGME_CONFIG" && ac_cv_path_GPGME_CONFIG="no"
- ;;
-esac
-fi
-GPGME_CONFIG=$ac_cv_path_GPGME_CONFIG
-if test -n "$GPGME_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGME_CONFIG" >&5
-$as_echo "$GPGME_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- fi
-
- if test "$GPGME_CONFIG" != "no" ; then
- if test -z "$use_gpgrt_config"; then
- gpgme_version=`$GPGME_CONFIG --version`
- else
- gpgme_version=`$GPGME_CONFIG --modversion`
- fi
- fi
- gpgme_version_major=`echo $gpgme_version | \
- sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
- gpgme_version_minor=`echo $gpgme_version | \
- sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
- gpgme_version_micro=`echo $gpgme_version | \
- sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
-
-if test "x$enable_qmanifest" != xno; then :
+if test "x${enable_qmanifest}x${enable_qtegrity}" != xnoxno; then :
for ac_header in openssl/err.h \
openssl/ssl.h
do :
@@ -34635,11 +34552,140 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "--enable-qmanifest was given, but test for ssl failed
See \`config.log' for more details" "$LINENO" 5; }
fi
+ if test "x$enable_qtegrity" != xauto; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "--enable-qtegrity was given, but test for ssl failed
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
LIBSSL=
fi
- for ac_header in blake2.h
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable qtegrity" >&5
+$as_echo_n "checking whether to enable qtegrity... " >&6; }
+ case "x${LIBSSL}" in
+ "x-lssl"*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ ;;
+ *)
+ enable_qtegrity=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no: missing dependencies" >&5
+$as_echo "no: missing dependencies" >&6; }
+ ;;
+ esac
+ if test "x$enable_qtegrity" != xno ; then
+
+$as_echo "#define ENABLE_QTEGRITY 1" >>confdefs.h
+
+ fi
+
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable qtegrity" >&5
+$as_echo_n "checking whether to enable qtegrity... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no: disabled by configure argument" >&5
+$as_echo "no: disabled by configure argument" >&6; }
+
+fi
+
+# Check whether --with-gpgme-prefix was given.
+if test "${with_gpgme_prefix+set}" = set; then :
+ withval=$with_gpgme_prefix; gpgme_config_prefix="$withval"
+else
+ gpgme_config_prefix=""
+fi
+
+ if test x"${GPGME_CONFIG}" = x ; then
+ if test x"${gpgme_config_prefix}" != x ; then
+ GPGME_CONFIG="${gpgme_config_prefix}/bin/gpgme-config"
+ else
+ case "${SYSROOT}" in
+ /*)
+ if test -x "${SYSROOT}/bin/gpgme-config" ; then
+ GPGME_CONFIG="${SYSROOT}/bin/gpgme-config"
+ fi
+ ;;
+ '')
+ ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5
+$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;}
+ ;;
+ esac
+ fi
+ fi
+
+ use_gpgrt_config=""
+ if test x"${GPGME_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+ if $GPGRT_CONFIG gpgme --exists; then
+ GPGME_CONFIG="$GPGRT_CONFIG gpgme"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Use gpgrt-config as gpgme-config" >&5
+$as_echo "$as_me: Use gpgrt-config as gpgme-config" >&6;}
+ use_gpgrt_config=yes
+ fi
+ fi
+ if test -z "$use_gpgrt_config"; then
+ # Extract the first word of "gpgme-config", so it can be a program name with args.
+set dummy gpgme-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GPGME_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GPGME_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GPGME_CONFIG="$GPGME_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_GPGME_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GPGME_CONFIG" && ac_cv_path_GPGME_CONFIG="no"
+ ;;
+esac
+fi
+GPGME_CONFIG=$ac_cv_path_GPGME_CONFIG
+if test -n "$GPGME_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGME_CONFIG" >&5
+$as_echo "$GPGME_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+
+ if test "$GPGME_CONFIG" != "no" ; then
+ if test -z "$use_gpgrt_config"; then
+ gpgme_version=`$GPGME_CONFIG --version`
+ else
+ gpgme_version=`$GPGME_CONFIG --modversion`
+ fi
+ fi
+ gpgme_version_major=`echo $gpgme_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
+ gpgme_version_minor=`echo $gpgme_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
+ gpgme_version_micro=`echo $gpgme_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
+
+if test "x$enable_qmanifest" != xno; then :
+ for ac_header in blake2.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "blake2.h" "ac_cv_header_blake2_h" "$ac_includes_default"
if test "x$ac_cv_header_blake2_h" = xyes; then :
@@ -34911,6 +34957,14 @@ else
QMANIFEST_ENABLED_FALSE=
fi
+ if test "x$enable_qtegrity" != xno; then
+ QTEGRITY_ENABLED_TRUE=
+ QTEGRITY_ENABLED_FALSE='#'
+else
+ QTEGRITY_ENABLED_TRUE='#'
+ QTEGRITY_ENABLED_FALSE=
+fi
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -35829,6 +35883,10 @@ if test -z "${QMANIFEST_ENABLED_TRUE}" && test -z "${QMANIFEST_ENABLED_FALSE}";
as_fn_error $? "conditional \"QMANIFEST_ENABLED\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${QTEGRITY_ENABLED_TRUE}" && test -z "${QTEGRITY_ENABLED_FALSE}"; then
+ as_fn_error $? "conditional \"QTEGRITY_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0