commit: d801e8d09d8aa9c79122d8fa7f6da406d5a9f904
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 13:09:30 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 13:09:30 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=d801e8d0
buildsys: regen
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Makefile.in | 59 ++++++++-----
config.h.in | 3 +
configure | 250 +++++++++++++++++++++++++++++++++---------------------
tests/Makefile.in | 4 +-
4 files changed, 195 insertions(+), 121 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 15b2a2f..6166e5f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -99,6 +99,15 @@ bin_PROGRAMS = q$(EXEEXT)
@QMANIFEST_ENABLED_TRUE@am__append_4 = man/qmanifest.1
@QMANIFEST_ENABLED_TRUE@am__append_5 = qmanifest
+@QTEGRITY_ENABLED_TRUE@am__append_6 = qtegrity.c
+@QMANIFEST_ENABLED_FALSE@@QTEGRITY_ENABLED_TRUE@am__append_7 = \
+@QMANIFEST_ENABLED_FALSE@@QTEGRITY_ENABLED_TRUE@ $(OPENMP_CFLAGS)
+
+@QMANIFEST_ENABLED_FALSE@@QTEGRITY_ENABLED_TRUE@am__append_8 = \
+@QMANIFEST_ENABLED_FALSE@@QTEGRITY_ENABLED_TRUE@ $(OPENMP_CFLAGS)
+
+@QTEGRITY_ENABLED_TRUE@am__append_9 = man/qtegrity.1
+@QTEGRITY_ENABLED_TRUE@am__append_10 = qtegrity
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/autotools/m4/00gnulib.m4 \
@@ -257,24 +266,26 @@ am__installdirs = "$(DESTDIR)$(bindir)"
"$(DESTDIR)$(man1dir)"
PROGRAMS = $(bin_PROGRAMS)
am__q_SOURCES_DIST = main.c q.c qatom.c qcheck.c qdepends.c qfile.c \
qgrep.c qkeyword.c qlist.c qlop.c qmerge.c qpkg.c qsearch.c \
- qsize.c qtbz2.c qtegrity.c quse.c qxpak.c qmanifest.c
+ qsize.c qtbz2.c quse.c qxpak.c qmanifest.c qtegrity.c
@QMANIFEST_ENABLED_TRUE@am__objects_1 = q-qmanifest.$(OBJEXT)
+@QTEGRITY_ENABLED_TRUE@am__objects_2 = q-qtegrity.$(OBJEXT)
am_q_OBJECTS = q-main.$(OBJEXT) q-q.$(OBJEXT) q-qatom.$(OBJEXT) \
q-qcheck.$(OBJEXT) q-qdepends.$(OBJEXT) q-qfile.$(OBJEXT) \
q-qgrep.$(OBJEXT) q-qkeyword.$(OBJEXT) q-qlist.$(OBJEXT) \
q-qlop.$(OBJEXT) q-qmerge.$(OBJEXT) q-qpkg.$(OBJEXT) \
q-qsearch.$(OBJEXT) q-qsize.$(OBJEXT) q-qtbz2.$(OBJEXT) \
- q-qtegrity.$(OBJEXT) q-quse.$(OBJEXT) q-qxpak.$(OBJEXT) \
- $(am__objects_1)
+ q-quse.$(OBJEXT) q-qxpak.$(OBJEXT) $(am__objects_1) \
+ $(am__objects_2)
q_OBJECTS = $(am_q_OBJECTS)
am__DEPENDENCIES_1 =
@QMANIFEST_ENABLED_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+@QMANIFEST_ENABLED_FALSE@@QTEGRITY_ENABLED_TRUE@am__DEPENDENCIES_3 =
$(am__DEPENDENCIES_1)
q_DEPENDENCIES = $(top_builddir)/libq/libq.la \
$(top_builddir)/autotools/gnulib/libgnu.a \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_2)
+ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -1586,20 +1597,22 @@ SUBDIRS = \
APPLETS = q qatom qcheck qdepends qfile qgrep qkeyword qlist qlop \
qmerge qpkg qsearch qsize qtbz2 qtegrity quse qxpak $(NULL) \
- $(am__append_5)
+ $(am__append_5) $(am__append_10)
dist_man_MANS = man/q.1 man/qatom.1 man/qcheck.1 man/qdepends.1 \
man/qfile.1 man/qgrep.1 man/qkeyword.1 man/qlist.1 man/qlop.1 \
man/qmerge.1 man/qpkg.1 man/qsearch.1 man/qsize.1 man/qtbz2.1 \
- man/qtegrity.1 man/quse.1 man/qxpak.1 $(NULL) $(am__append_4)
+ man/qtegrity.1 man/quse.1 man/qxpak.1 $(NULL) $(am__append_4) \
+ $(am__append_9)
q_SOURCES = main.c q.c qatom.c qcheck.c qdepends.c qfile.c qgrep.c \
qkeyword.c qlist.c qlop.c qmerge.c qpkg.c qsearch.c qsize.c \
- qtbz2.c qtegrity.c quse.c qxpak.c $(NULL) $(am__append_1)
+ qtbz2.c quse.c qxpak.c $(NULL) $(am__append_1) $(am__append_6)
q_CPPFLAGS = -I$(top_srcdir)/libq -I$(top_builddir)/autotools/gnulib \
- -I$(top_srcdir)/autotools/gnulib $(NULL) $(am__append_2)
+ -I$(top_srcdir)/autotools/gnulib $(NULL) $(am__append_2) \
+ $(am__append_7)
q_LDADD = $(top_builddir)/libq/libq.la \
$(top_builddir)/autotools/gnulib/libgnu.a -liniparser \
$(LIBSSL) $(LIBBL2) $(LIBZ) $(GPGME_LIBS) $(LIB_CLOCK_GETTIME) \
- $(LIB_EACCESS) $(NULL) $(am__append_3)
+ $(LIB_EACCESS) $(NULL) $(am__append_3) $(am__append_8)
EXTRA_DIST = \
autotools/m4/gnulib-cache.m4 \
applets.h \
@@ -1976,20 +1989,6 @@ q-qtbz2.obj: qtbz2.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o q-qtbz2.obj
`if test -f 'qtbz2.c'; then $(CYGPATH_W) 'qtbz2.c'; else $(CYGPATH_W)
'$(srcdir)/qtbz2.c'; fi`
-q-qtegrity.o: qtegrity.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-qtegrity.o -MD -MP -MF
$(DEPDIR)/q-qtegrity.Tpo -c -o q-qtegrity.o `test -f 'qtegrity.c' || echo
'$(srcdir)/'`qtegrity.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-qtegrity.Tpo
$(DEPDIR)/q-qtegrity.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='qtegrity.c'
object='q-qtegrity.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o q-qtegrity.o
`test -f 'qtegrity.c' || echo '$(srcdir)/'`qtegrity.c
-
-q-qtegrity.obj: qtegrity.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-qtegrity.obj -MD -MP -MF
$(DEPDIR)/q-qtegrity.Tpo -c -o q-qtegrity.obj `if test -f 'qtegrity.c'; then
$(CYGPATH_W) 'qtegrity.c'; else $(CYGPATH_W) '$(srcdir)/qtegrity.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-qtegrity.Tpo
$(DEPDIR)/q-qtegrity.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='qtegrity.c'
object='q-qtegrity.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
q-qtegrity.obj `if test -f 'qtegrity.c'; then $(CYGPATH_W) 'qtegrity.c'; else
$(CYGPATH_W) '$(srcdir)/qtegrity.c'; fi`
-
q-quse.o: quse.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-quse.o -MD -MP -MF
$(DEPDIR)/q-quse.Tpo -c -o q-quse.o `test -f 'quse.c' || echo
'$(srcdir)/'`quse.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-quse.Tpo
$(DEPDIR)/q-quse.Po
@@ -2032,6 +2031,20 @@ q-qmanifest.obj: qmanifest.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
q-qmanifest.obj `if test -f 'qmanifest.c'; then $(CYGPATH_W) 'qmanifest.c';
else $(CYGPATH_W) '$(srcdir)/qmanifest.c'; fi`
+q-qtegrity.o: qtegrity.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-qtegrity.o -MD -MP -MF
$(DEPDIR)/q-qtegrity.Tpo -c -o q-qtegrity.o `test -f 'qtegrity.c' || echo
'$(srcdir)/'`qtegrity.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-qtegrity.Tpo
$(DEPDIR)/q-qtegrity.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='qtegrity.c'
object='q-qtegrity.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o q-qtegrity.o
`test -f 'qtegrity.c' || echo '$(srcdir)/'`qtegrity.c
+
+q-qtegrity.obj: qtegrity.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-qtegrity.obj -MD -MP -MF
$(DEPDIR)/q-qtegrity.Tpo -c -o q-qtegrity.obj `if test -f 'qtegrity.c'; then
$(CYGPATH_W) 'qtegrity.c'; else $(CYGPATH_W) '$(srcdir)/qtegrity.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-qtegrity.Tpo
$(DEPDIR)/q-qtegrity.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='qtegrity.c'
object='q-qtegrity.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
q-qtegrity.obj `if test -f 'qtegrity.c'; then $(CYGPATH_W) 'qtegrity.c'; else
$(CYGPATH_W) '$(srcdir)/qtegrity.c'; fi`
+
mostlyclean-libtool:
-rm -f *.lo
diff --git a/config.h.in b/config.h.in
index 1f3a257..a0714f6 100644
--- a/config.h.in
+++ b/config.h.in
@@ -62,6 +62,9 @@
/* Define if qmanifest should be compiled */
#undef ENABLE_QMANIFEST
+/* Define if qtegrity should be compiled */
+#undef ENABLE_QTEGRITY
+
/* Define this to 1 if F_DUPFD behavior does not match POSIX */
#undef FCNTL_DUPFD_BUGGY
diff --git a/configure b/configure
index 3af992d..0bb18e8 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 :
@@ -34633,13 +34550,142 @@ else
{ { $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-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
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 35c14ea..e0ca9a9 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -295,7 +295,7 @@ ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = atom_compare atom_explode copy_file mkdir rmspace qatom \
qcheck qdepends qfile qlist qlop qmerge qtbz2 quse qxpak \
- install profile source qmanifest
+ install profile qmanifest source
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/init.sh.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
@@ -1458,7 +1458,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = atom_compare atom_explode copy_file mkdir rmspace qatom \
qcheck qdepends qfile qlist qlop qmerge qtbz2 quse qxpak \
- install profile source $(am__append_1)
+ install profile $(am__append_1) source
all: all-recursive
.SUFFIXES:
