summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure458
1 files changed, 248 insertions, 210 deletions
diff --git a/configure b/configure
index bc46a58..0e8da7a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gpgme 1.4.2.
+# Generated by GNU Autoconf 2.69 for gpgme 1.4.3.
#
# Report bugs to <http://bugs.gnupg.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='gpgme'
PACKAGE_TARNAME='gpgme'
-PACKAGE_VERSION='1.4.2'
-PACKAGE_STRING='gpgme 1.4.2'
+PACKAGE_VERSION='1.4.3'
+PACKAGE_STRING='gpgme 1.4.3'
PACKAGE_BUGREPORT='http://bugs.gnupg.org'
PACKAGE_URL=''
@@ -652,11 +652,6 @@ RUN_G13_TESTS_TRUE
HAVE_G13_FALSE
HAVE_G13_TRUE
G13
-RUN_GPGCONF_TESTS_FALSE
-RUN_GPGCONF_TESTS_TRUE
-HAVE_GPGCONF_FALSE
-HAVE_GPGCONF_TRUE
-GPGCONF
RUN_GPGSM_TESTS_FALSE
RUN_GPGSM_TESTS_TRUE
HAVE_GPGSM_FALSE
@@ -666,6 +661,11 @@ GPG_PATH
RUN_GPG_TESTS_FALSE
RUN_GPG_TESTS_TRUE
GPG
+RUN_GPGCONF_TESTS_FALSE
+RUN_GPGCONF_TESTS_TRUE
+HAVE_GPGCONF_FALSE
+HAVE_GPGCONF_TRUE
+GPGCONF
HAVE_ASSUAN_FALSE
HAVE_ASSUAN_TRUE
LIBASSUAN_LIBS
@@ -857,12 +857,12 @@ with_gpg_version
with_gpgsm_version
with_gpgconf_version
with_g13_version
+with_gpgconf
+enable_gpgconf_test
with_gpg
enable_gpg_test
with_gpgsm
enable_gpgsm_test
-with_gpgconf
-enable_gpgconf_test
with_g13
enable_g13_test
enable_fd_passing
@@ -1420,7 +1420,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gpgme 1.4.2 to adapt to many kinds of systems.
+\`configure' configures gpgme 1.4.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1490,7 +1490,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gpgme 1.4.2:";;
+ short | recursive ) echo "Configuration of gpgme 1.4.3:";;
esac
cat <<\_ACEOF
@@ -1511,9 +1511,9 @@ Optional Features:
--enable-w32-glib build GPGME Glib for W32
--enable-w32-qt build GPGME Qt for W32
--disable-largefile omit support for large files
+ --disable-gpgconf-test disable GPGCONF run test
--disable-gpg-test disable GPG run test
--disable-gpgsm-test disable GPGSM run test
- --disable-gpgconf-test disable GPGCONF run test
--disable-g13-test disable G13 run test
--disable-fd-passing do not use FD passing
@@ -1536,9 +1536,9 @@ Optional Packages:
--with-gpgconf-version=VER
require GPGCONF version VER
--with-g13-version=VER require G13 version VER
+ --with-gpgconf=PATH use gpgconf binary at PATH
--with-gpg=PATH use GnuPG binary at PATH
--with-gpgsm=PATH use GpgSM binary at PATH
- --with-gpgconf=PATH use gpgconf binary at PATH
--with-g13=PATH use g13 binary at PATH
Some influential environment variables:
@@ -1620,7 +1620,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gpgme configure 1.4.2
+gpgme configure 1.4.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2450,7 +2450,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gpgme $as_me 1.4.2, which was
+It was created by gpgme $as_me 1.4.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2813,10 +2813,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# (Interfaces added: AGE++)
# (Interfaces removed/changed: AGE=0)
#
-LIBGPGME_LT_CURRENT=21
+LIBGPGME_LT_CURRENT=22
# Subtract 2 from this value if you want to make the LFS transition an
# ABI break. [Note to self: Remove this comment with the next regular break.]
-LIBGPGME_LT_AGE=10
+LIBGPGME_LT_AGE=11
LIBGPGME_LT_REVISION=0
# If the API is changed in an incompatible way: increment the next counter.
@@ -2864,6 +2864,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
ac_config_headers="$ac_config_headers config.h"
+# Note: For automake 1.13 add the option
+# serial-tests
am__api_version='1.11'
# Find a good install program. We prefer a C program (faster),
@@ -3302,7 +3304,7 @@ fi
# Define the identity of the package.
PACKAGE='gpgme'
- VERSION='1.4.2'
+ VERSION='1.4.3'
cat >>confdefs.h <<_ACEOF
@@ -5995,7 +5997,7 @@ cat >>confdefs.h <<_ACEOF
#define VERSION "$VERSION"
_ACEOF
-VERSION_NUMBER=0x010402
+VERSION_NUMBER=0x010403
# Don't default to build static libs.
@@ -17323,7 +17325,7 @@ fi
#
# Provide information about the build.
#
-BUILD_REVISION="009e26a"
+BUILD_REVISION="d788c35"
cat >>confdefs.h <<_ACEOF
@@ -17332,7 +17334,7 @@ _ACEOF
BUILD_FILEVERSION=`echo "$PACKAGE_VERSION"|sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
-BUILD_FILEVERSION="${BUILD_FILEVERSION}158"
+BUILD_FILEVERSION="${BUILD_FILEVERSION}55176"
BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
@@ -18737,17 +18739,17 @@ fi
cat >>confdefs.h <<_ACEOF
-#define NEED_GPG_VERSION "$NEED_GPG_VERSION"
+#define NEED_GPGCONF_VERSION "$NEED_GPGCONF_VERSION"
_ACEOF
cat >>confdefs.h <<_ACEOF
-#define NEED_GPGSM_VERSION "$NEED_GPGSM_VERSION"
+#define NEED_GPG_VERSION "$NEED_GPG_VERSION"
_ACEOF
cat >>confdefs.h <<_ACEOF
-#define NEED_GPGCONF_VERSION "$NEED_GPGCONF_VERSION"
+#define NEED_GPGSM_VERSION "$NEED_GPGSM_VERSION"
_ACEOF
@@ -18756,30 +18758,33 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-
+#
+# Check for GPGCONF
+#
+gpgconf_usable_for_test=no
NO_OVERRIDE=no
-# Check whether --with-gpg was given.
-if test "${with_gpg+set}" = set; then :
- withval=$with_gpg; GPG=$withval
+# Check whether --with-gpgconf was given.
+if test "${with_gpgconf+set}" = set; then :
+ withval=$with_gpgconf; GPGCONF=$withval
else
NO_OVERRIDE=yes
fi
-if test "$NO_OVERRIDE" = "yes" || test "$GPG" = "yes"; then
- GPG=
+if test "$NO_OVERRIDE" = "yes" || test "$GPGCONF" = "yes"; then
+ GPGCONF=
NO_OVERRIDE=yes
if test "$cross_compiling" != "yes"; then
- # Extract the first word of "gpg", so it can be a program name with args.
-set dummy gpg; ac_word=$2
+ # Extract the first word of "gpgconf", so it can be a program name with args.
+set dummy gpgconf; 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_GPG+:} false; then :
+if ${ac_cv_path_GPGCONF+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $GPG in
+ case $GPGCONF in
[\\/]* | ?:[\\/]*)
- ac_cv_path_GPG="$GPG" # Let the user override the test with a path.
+ ac_cv_path_GPGCONF="$GPGCONF" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -18789,7 +18794,7 @@ do
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_GPG="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_GPGCONF="$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
@@ -18800,10 +18805,10 @@ IFS=$as_save_IFS
;;
esac
fi
-GPG=$ac_cv_path_GPG
-if test -n "$GPG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPG" >&5
-$as_echo "$GPG" >&6; }
+GPGCONF=$ac_cv_path_GPGCONF
+if test -n "$GPGCONF"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGCONF" >&5
+$as_echo "$GPGCONF" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -18811,68 +18816,79 @@ fi
fi
- if test -z "$GPG"; then
- GPG="$GPG_DEFAULT"
+ if test -z "$GPGCONF"; then
+ GPGCONF="$GPGCONF_DEFAULT"
fi
fi
-if test "$GPG" = no; then
+if test "$GPGCONF" = no; then
if test "$NO_OVERRIDE" = "yes"; then
if test "$cross_compiling" != "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
***
-*** Could not find GnuPG, install GnuPG or use --with-gpg=PATH to enable it
+*** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it
***" >&5
$as_echo "$as_me: WARNING:
***
-*** Could not find GnuPG, install GnuPG or use --with-gpg=PATH to enable it
+*** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it
***" >&2;}
else
as_fn_error $? "
***
-*** Can not determine path to GnuPG when cross-compiling, use --with-gpg=PATH
+*** Can not determine path to gpgconf when cross-compiling, use --with-gpgconf=PATH
***" "$LINENO" 5
fi
fi
else
cat >>confdefs.h <<_ACEOF
-#define GPG_PATH "$GPG"
+#define GPGCONF_PATH "$GPGCONF"
_ACEOF
+$as_echo "#define ENABLE_GPGCONF 1" >>confdefs.h
+
fi
-GPG_VERSION=unknown
+ if test "$GPGCONF" != "no"; then
+ HAVE_GPGCONF_TRUE=
+ HAVE_GPGCONF_FALSE='#'
+else
+ HAVE_GPGCONF_TRUE='#'
+ HAVE_GPGCONF_FALSE=
+fi
+
+
+GPGCONF_VERSION=unknown
ok=maybe
-if test -z "$GPG" -o "x$GPG" = "xno"; then
+if test -z "$GPGCONF" -o "x$GPGCONF" = "xno"; then
ok=no
else
if test "$cross_compiling" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GnuPG version can not be checked when cross compiling" >&5
-$as_echo "$as_me: WARNING: GnuPG version can not be checked when cross compiling" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GPGCONF version can not be checked when cross compiling" >&5
+$as_echo "$as_me: WARNING: GPGCONF version can not be checked when cross compiling" >&2;}
ok=no
else
- if test ! -x "$GPG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GnuPG not executable, version check disabled" >&5
-$as_echo "$as_me: WARNING: GnuPG not executable, version check disabled" >&2;}
+ if test ! -x "$GPGCONF"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GPGCONF not executable, version check disabled" >&5
+$as_echo "$as_me: WARNING: GPGCONF not executable, version check disabled" >&2;}
ok=no
fi
fi
fi
if test "$ok" = "maybe"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPG >= $NEED_GPG_VERSION" >&5
-$as_echo_n "checking for GPG >= $NEED_GPG_VERSION... " >&6; }
- req_major=`echo $NEED_GPG_VERSION | \
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPGCONF >= $NEED_GPGCONF_VERSION" >&5
+$as_echo_n "checking for GPGCONF >= $NEED_GPGCONF_VERSION... " >&6; }
+ req_major=`echo $NEED_GPGCONF_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
- req_minor=`echo $NEED_GPG_VERSION | \
+ req_minor=`echo $NEED_GPGCONF_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
- req_micro=`echo $NEED_GPG_VERSION | \
+ req_micro=`echo $NEED_GPGCONF_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
- GPG_VERSION=`$GPG --version | sed -n '1 s/[^0-9]*\(.*\)/\1/p'`
- major=`echo $GPG_VERSION | \
+ GPGCONF_VERSION=`$GPGCONF --version | sed -n '1 s/[^0-9]*\(.*\)/\1/p'`
+ major=`echo $GPGCONF_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
- minor=`echo $GPG_VERSION | \
+ minor=`echo $GPGCONF_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
- micro=`echo $GPG_VERSION | \
+ micro=`echo $GPGCONF_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
if test "$major" -gt "$req_major"; then
@@ -18893,52 +18909,61 @@ $as_echo_n "checking for GPG >= $NEED_GPG_VERSION... " >&6; }
if test "$ok" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+ if test "$cross_compiling" != "yes"; then
+ gpgconf_usable_for_test=yes
+ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GPG must be at least version $NEED_GPG_VERSION" >&5
-$as_echo "$as_me: WARNING: GPG must be at least version $NEED_GPG_VERSION" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GPGCONF must be at least version $NEED_GPGCONF_VERSION" >&5
+$as_echo "$as_me: WARNING: GPGCONF must be at least version $NEED_GPGCONF_VERSION" >&2;}
fi
fi
-run_gpg_test="$ok"
-# Check whether --enable-gpg-test was given.
-if test "${enable_gpg_test+set}" = set; then :
- enableval=$enable_gpg_test; run_gpg_test=$enableval
+run_gpgconf_test="$ok"
+# Check whether --enable-gpgconf-test was given.
+if test "${enable_gpgconf_test+set}" = set; then :
+ enableval=$enable_gpgconf_test; run_gpgconf_test=$enableval
fi
- if test "$run_gpg_test" = "yes"; then
- RUN_GPG_TESTS_TRUE=
- RUN_GPG_TESTS_FALSE='#'
+ if test "$run_gpgconf_test" = "yes"; then
+ RUN_GPGCONF_TESTS_TRUE=
+ RUN_GPGCONF_TESTS_FALSE='#'
else
- RUN_GPG_TESTS_TRUE='#'
- RUN_GPG_TESTS_FALSE=
+ RUN_GPGCONF_TESTS_TRUE='#'
+ RUN_GPGCONF_TESTS_FALSE=
fi
+#
+# Check for GPG
+#
NO_OVERRIDE=no
-# Check whether --with-gpgsm was given.
-if test "${with_gpgsm+set}" = set; then :
- withval=$with_gpgsm; GPGSM=$withval
+# Check whether --with-gpg was given.
+if test "${with_gpg+set}" = set; then :
+ withval=$with_gpg; GPG=$withval
else
NO_OVERRIDE=yes
fi
-if test "$NO_OVERRIDE" = "yes" || test "$GPGSM" = "yes"; then
- GPGSM=
+if test "$NO_OVERRIDE" = "yes" || test "$GPG" = "yes"; then
+ GPG=
NO_OVERRIDE=yes
if test "$cross_compiling" != "yes"; then
- # Extract the first word of "gpgsm", so it can be a program name with args.
-set dummy gpgsm; ac_word=$2
+ if test "$gpgconf_usable_for_test" = "yes"; then
+ GPG="`$GPGCONF --list-components | grep ^gpg: | cut -d: -f 3`"
+ else
+ # Extract the first word of "gpg", so it can be a program name with args.
+set dummy gpg; 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_GPGSM+:} false; then :
+if ${ac_cv_path_GPG+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $GPGSM in
+ case $GPG in
[\\/]* | ?:[\\/]*)
- ac_cv_path_GPGSM="$GPGSM" # Let the user override the test with a path.
+ ac_cv_path_GPG="$GPG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -18948,7 +18973,7 @@ do
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_GPGSM="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_GPG="$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
@@ -18959,91 +18984,80 @@ IFS=$as_save_IFS
;;
esac
fi
-GPGSM=$ac_cv_path_GPGSM
-if test -n "$GPGSM"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGSM" >&5
-$as_echo "$GPGSM" >&6; }
+GPG=$ac_cv_path_GPG
+if test -n "$GPG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPG" >&5
+$as_echo "$GPG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
+ fi
fi
- if test -z "$GPGSM"; then
- GPGSM="$GPGSM_DEFAULT"
+ if test -z "$GPG"; then
+ GPG="$GPG_DEFAULT"
fi
fi
-if test "$GPGSM" = no; then
+if test "$GPG" = no; then
if test "$NO_OVERRIDE" = "yes"; then
if test "$cross_compiling" != "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
***
-*** Could not find GpgSM, install GpgSM or use --with-gpgsm=PATH to enable it
+*** Could not find GnuPG, install GnuPG or use --with-gpg=PATH to enable it
***" >&5
$as_echo "$as_me: WARNING:
***
-*** Could not find GpgSM, install GpgSM or use --with-gpgsm=PATH to enable it
+*** Could not find GnuPG, install GnuPG or use --with-gpg=PATH to enable it
***" >&2;}
else
as_fn_error $? "
***
-*** Can not determine path to GpgSM when cross-compiling, use --with-gpgsm=PATH
+*** Can not determine path to GnuPG when cross-compiling, use --with-gpg=PATH
***" "$LINENO" 5
fi
fi
else
cat >>confdefs.h <<_ACEOF
-#define GPGSM_PATH "$GPGSM"
+#define GPG_PATH "$GPG"
_ACEOF
-$as_echo "#define ENABLE_GPGSM 1" >>confdefs.h
-
-fi
- if test "$GPGSM" != "no"; then
- HAVE_GPGSM_TRUE=
- HAVE_GPGSM_FALSE='#'
-else
- HAVE_GPGSM_TRUE='#'
- HAVE_GPGSM_FALSE=
fi
-
-
-
-GPGSM_VERSION=unknown
+GPG_VERSION=unknown
ok=maybe
-if test -z "$GPGSM" -o "x$GPGSM" = "xno"; then
+if test -z "$GPG" -o "x$GPG" = "xno"; then
ok=no
else
if test "$cross_compiling" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GPGSM version can not be checked when cross compiling" >&5
-$as_echo "$as_me: WARNING: GPGSM version can not be checked when cross compiling" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GnuPG version can not be checked when cross compiling" >&5
+$as_echo "$as_me: WARNING: GnuPG version can not be checked when cross compiling" >&2;}
ok=no
else
- if test ! -x "$GPGSM"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GPGSM not executable, version check disabled" >&5
-$as_echo "$as_me: WARNING: GPGSM not executable, version check disabled" >&2;}
+ if test ! -x "$GPG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GnuPG not executable, version check disabled" >&5
+$as_echo "$as_me: WARNING: GnuPG not executable, version check disabled" >&2;}
ok=no
fi
fi
fi
if test "$ok" = "maybe"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPGSM >= $NEED_GPGSM_VERSION" >&5
-$as_echo_n "checking for GPGSM >= $NEED_GPGSM_VERSION... " >&6; }
- req_major=`echo $NEED_GPGSM_VERSION | \
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPG >= $NEED_GPG_VERSION" >&5
+$as_echo_n "checking for GPG >= $NEED_GPG_VERSION... " >&6; }
+ req_major=`echo $NEED_GPG_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
- req_minor=`echo $NEED_GPGSM_VERSION | \
+ req_minor=`echo $NEED_GPG_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
- req_micro=`echo $NEED_GPGSM_VERSION | \
+ req_micro=`echo $NEED_GPG_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
- GPGSM_VERSION=`$GPGSM --version | sed -n '1 s/[^0-9]*\(.*\)/\1/p'`
- major=`echo $GPGSM_VERSION | \
+ GPG_VERSION=`$GPG --version | sed -n '1 s/[^0-9]*\(.*\)/\1/p'`
+ major=`echo $GPG_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
- minor=`echo $GPGSM_VERSION | \
+ minor=`echo $GPG_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
- micro=`echo $GPGSM_VERSION | \
+ micro=`echo $GPG_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
if test "$major" -gt "$req_major"; then
@@ -19067,49 +19081,56 @@ $as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GPGSM must be at least version $NEED_GPGSM_VERSION" >&5
-$as_echo "$as_me: WARNING: GPGSM must be at least version $NEED_GPGSM_VERSION" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GPG must be at least version $NEED_GPG_VERSION" >&5
+$as_echo "$as_me: WARNING: GPG must be at least version $NEED_GPG_VERSION" >&2;}
fi
fi
-run_gpgsm_test="$ok"
-# Check whether --enable-gpgsm-test was given.
-if test "${enable_gpgsm_test+set}" = set; then :
- enableval=$enable_gpgsm_test; run_gpgsm_test=$enableval
+run_gpg_test="$ok"
+# Check whether --enable-gpg-test was given.
+if test "${enable_gpg_test+set}" = set; then :
+ enableval=$enable_gpg_test; run_gpg_test=$enableval
fi
- if test "$run_gpgsm_test" = "yes"; then
- RUN_GPGSM_TESTS_TRUE=
- RUN_GPGSM_TESTS_FALSE='#'
+ if test "$run_gpg_test" = "yes"; then
+ RUN_GPG_TESTS_TRUE=
+ RUN_GPG_TESTS_FALSE='#'
else
- RUN_GPGSM_TESTS_TRUE='#'
- RUN_GPGSM_TESTS_FALSE=
+ RUN_GPG_TESTS_TRUE='#'
+ RUN_GPG_TESTS_FALSE=
fi
+
+#
+# Check for GPGSM
+#
NO_OVERRIDE=no
-# Check whether --with-gpgconf was given.
-if test "${with_gpgconf+set}" = set; then :
- withval=$with_gpgconf; GPGCONF=$withval
+# Check whether --with-gpgsm was given.
+if test "${with_gpgsm+set}" = set; then :
+ withval=$with_gpgsm; GPGSM=$withval
else
NO_OVERRIDE=yes
fi
-if test "$NO_OVERRIDE" = "yes" || test "$GPGCONF" = "yes"; then
- GPGCONF=
+if test "$NO_OVERRIDE" = "yes" || test "$GPGSM" = "yes"; then
+ GPGSM=
NO_OVERRIDE=yes
if test "$cross_compiling" != "yes"; then
- # Extract the first word of "gpgconf", so it can be a program name with args.
-set dummy gpgconf; ac_word=$2
+ if test "$gpgconf_usable_for_test" = "yes"; then
+ GPGSM="`$GPGCONF --list-components | grep ^gpgsm: | cut -d: -f 3`"
+ else
+ # Extract the first word of "gpgsm", so it can be a program name with args.
+set dummy gpgsm; 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_GPGCONF+:} false; then :
+if ${ac_cv_path_GPGSM+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $GPGCONF in
+ case $GPGSM in
[\\/]* | ?:[\\/]*)
- ac_cv_path_GPGCONF="$GPGCONF" # Let the user override the test with a path.
+ ac_cv_path_GPGSM="$GPGSM" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -19119,7 +19140,7 @@ do
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_GPGCONF="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_GPGSM="$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
@@ -19130,90 +19151,92 @@ IFS=$as_save_IFS
;;
esac
fi
-GPGCONF=$ac_cv_path_GPGCONF
-if test -n "$GPGCONF"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGCONF" >&5
-$as_echo "$GPGCONF" >&6; }
+GPGSM=$ac_cv_path_GPGSM
+if test -n "$GPGSM"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGSM" >&5
+$as_echo "$GPGSM" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
+ fi
fi
- if test -z "$GPGCONF"; then
- GPGCONF="$GPGCONF_DEFAULT"
+ if test -z "$GPGSM"; then
+ GPGSM="$GPGSM_DEFAULT"
fi
fi
-if test "$GPGCONF" = no; then
+if test "$GPGSM" = no; then
if test "$NO_OVERRIDE" = "yes"; then
if test "$cross_compiling" != "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
***
-*** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it
+*** Could not find GpgSM, install GpgSM or use --with-gpgsm=PATH to enable it
***" >&5
$as_echo "$as_me: WARNING:
***
-*** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it
+*** Could not find GpgSM, install GpgSM or use --with-gpgsm=PATH to enable it
***" >&2;}
else
as_fn_error $? "
***
-*** Can not determine path to gpgconf when cross-compiling, use --with-gpgconf=PATH
+*** Can not determine path to GpgSM when cross-compiling, use --with-gpgsm=PATH
***" "$LINENO" 5
fi
fi
else
cat >>confdefs.h <<_ACEOF
-#define GPGCONF_PATH "$GPGCONF"
+#define GPGSM_PATH "$GPGSM"
_ACEOF
-$as_echo "#define ENABLE_GPGCONF 1" >>confdefs.h
+$as_echo "#define ENABLE_GPGSM 1" >>confdefs.h
fi
- if test "$GPGCONF" != "no"; then
- HAVE_GPGCONF_TRUE=
- HAVE_GPGCONF_FALSE='#'
+ if test "$GPGSM" != "no"; then
+ HAVE_GPGSM_TRUE=
+ HAVE_GPGSM_FALSE='#'
else
- HAVE_GPGCONF_TRUE='#'
- HAVE_GPGCONF_FALSE=
+ HAVE_GPGSM_TRUE='#'
+ HAVE_GPGSM_FALSE=
fi
-GPGCONF_VERSION=unknown
+
+GPGSM_VERSION=unknown
ok=maybe
-if test -z "$GPGCONF" -o "x$GPGCONF" = "xno"; then
+if test -z "$GPGSM" -o "x$GPGSM" = "xno"; then
ok=no
else
if test "$cross_compiling" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GPGCONF version can not be checked when cross compiling" >&5
-$as_echo "$as_me: WARNING: GPGCONF version can not be checked when cross compiling" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GPGSM version can not be checked when cross compiling" >&5
+$as_echo "$as_me: WARNING: GPGSM version can not be checked when cross compiling" >&2;}
ok=no
else
- if test ! -x "$GPGCONF"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GPGCONF not executable, version check disabled" >&5
-$as_echo "$as_me: WARNING: GPGCONF not executable, version check disabled" >&2;}
+ if test ! -x "$GPGSM"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GPGSM not executable, version check disabled" >&5
+$as_echo "$as_me: WARNING: GPGSM not executable, version check disabled" >&2;}
ok=no
fi
fi
fi
if test "$ok" = "maybe"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPGCONF >= $NEED_GPGCONF_VERSION" >&5
-$as_echo_n "checking for GPGCONF >= $NEED_GPGCONF_VERSION... " >&6; }
- req_major=`echo $NEED_GPGCONF_VERSION | \
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPGSM >= $NEED_GPGSM_VERSION" >&5
+$as_echo_n "checking for GPGSM >= $NEED_GPGSM_VERSION... " >&6; }
+ req_major=`echo $NEED_GPGSM_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
- req_minor=`echo $NEED_GPGCONF_VERSION | \
+ req_minor=`echo $NEED_GPGSM_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
- req_micro=`echo $NEED_GPGCONF_VERSION | \
+ req_micro=`echo $NEED_GPGSM_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
- GPGCONF_VERSION=`$GPGCONF --version | sed -n '1 s/[^0-9]*\(.*\)/\1/p'`
- major=`echo $GPGCONF_VERSION | \
+ GPGSM_VERSION=`$GPGSM --version | sed -n '1 s/[^0-9]*\(.*\)/\1/p'`
+ major=`echo $GPGSM_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
- minor=`echo $GPGCONF_VERSION | \
+ minor=`echo $GPGSM_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
- micro=`echo $GPGCONF_VERSION | \
+ micro=`echo $GPGSM_VERSION | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
if test "$major" -gt "$req_major"; then
@@ -19237,26 +19260,29 @@ $as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GPGCONF must be at least version $NEED_GPGCONF_VERSION" >&5
-$as_echo "$as_me: WARNING: GPGCONF must be at least version $NEED_GPGCONF_VERSION" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GPGSM must be at least version $NEED_GPGSM_VERSION" >&5
+$as_echo "$as_me: WARNING: GPGSM must be at least version $NEED_GPGSM_VERSION" >&2;}
fi
fi
-run_gpgconf_test="$ok"
-# Check whether --enable-gpgconf-test was given.
-if test "${enable_gpgconf_test+set}" = set; then :
- enableval=$enable_gpgconf_test; run_gpgconf_test=$enableval
+run_gpgsm_test="$ok"
+# Check whether --enable-gpgsm-test was given.
+if test "${enable_gpgsm_test+set}" = set; then :
+ enableval=$enable_gpgsm_test; run_gpgsm_test=$enableval
fi
- if test "$run_gpgconf_test" = "yes"; then
- RUN_GPGCONF_TESTS_TRUE=
- RUN_GPGCONF_TESTS_FALSE='#'
+ if test "$run_gpgsm_test" = "yes"; then
+ RUN_GPGSM_TESTS_TRUE=
+ RUN_GPGSM_TESTS_FALSE='#'
else
- RUN_GPGCONF_TESTS_TRUE='#'
- RUN_GPGCONF_TESTS_FALSE=
+ RUN_GPGSM_TESTS_TRUE='#'
+ RUN_GPGSM_TESTS_FALSE=
fi
+#
+# Check for G13
+#
NO_OVERRIDE=no
# Check whether --with-g13 was given.
@@ -19270,7 +19296,14 @@ if test "$NO_OVERRIDE" = "yes" || test "$G13" = "yes"; then
G13=
NO_OVERRIDE=yes
if test "$cross_compiling" != "yes"; then
- # Extract the first word of "g13", so it can be a program name with args.
+ if test "$gpgconf_usable_for_test" = "yes"; then
+ G13="`$GPGCONF --list-components | grep ^g13: | cut -d: -f 3`"
+ if test -z "$G13"; then
+ # Use a hack if gpgconf has no support for g13.
+ G13="`$GPGCONF --list-dirs | grep ^bindir: | cut -d: -f 2`/g13"
+ fi
+ else
+ # Extract the first word of "g13", so it can be a program name with args.
set dummy g13; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -19310,6 +19343,7 @@ $as_echo "no" >&6; }
fi
+ fi
fi
if test -z "$G13"; then
G13="$G13_DEFAULT"
@@ -19427,6 +19461,10 @@ fi
+#
+# Other checks
+#
+
# Check for funopen
for ac_func in funopen
do :
@@ -19889,6 +19927,14 @@ if test -z "${HAVE_ASSUAN_TRUE}" && test -z "${HAVE_ASSUAN_FALSE}"; then
as_fn_error $? "conditional \"HAVE_ASSUAN\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_GPGCONF_TRUE}" && test -z "${HAVE_GPGCONF_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_GPGCONF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${RUN_GPGCONF_TESTS_TRUE}" && test -z "${RUN_GPGCONF_TESTS_FALSE}"; then
+ as_fn_error $? "conditional \"RUN_GPGCONF_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${RUN_GPG_TESTS_TRUE}" && test -z "${RUN_GPG_TESTS_FALSE}"; then
as_fn_error $? "conditional \"RUN_GPG_TESTS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -19901,14 +19947,6 @@ if test -z "${RUN_GPGSM_TESTS_TRUE}" && test -z "${RUN_GPGSM_TESTS_FALSE}"; then
as_fn_error $? "conditional \"RUN_GPGSM_TESTS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${HAVE_GPGCONF_TRUE}" && test -z "${HAVE_GPGCONF_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_GPGCONF\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${RUN_GPGCONF_TESTS_TRUE}" && test -z "${RUN_GPGCONF_TESTS_FALSE}"; then
- as_fn_error $? "conditional \"RUN_GPGCONF_TESTS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${HAVE_G13_TRUE}" && test -z "${HAVE_G13_FALSE}"; then
as_fn_error $? "conditional \"HAVE_G13\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20322,7 +20360,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gpgme $as_me 1.4.2, which was
+This file was extended by gpgme $as_me 1.4.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20388,7 +20426,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gpgme config.status 1.4.2
+gpgme config.status 1.4.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -22682,16 +22720,16 @@ fi
echo "
GPGME v${VERSION} has been configured as follows:
- Revision: 009e26a (158)
+ Revision: d788c35 (55176)
Platform: $host
- GnuPG path: $GPG
- GnuPG version: $GPG_VERSION, min. $NEED_GPG_VERSION
- GpgSM path: $GPGSM
- GpgSM version: $GPGSM_VERSION, min. $NEED_GPGSM_VERSION
- GpgConf path: $GPGCONF
- GpgConf version: $GPGCONF_VERSION, min. $NEED_GPGCONF_VERSION
- G13 path: $G13
+ Gpgconf at: $GPGCONF
+ Gpgconf version: $GPGCONF_VERSION, min. $NEED_GPGCONF_VERSION
+ GPG at: $GPG
+ GPG version: $GPG_VERSION, min. $NEED_GPG_VERSION
+ Gpgsm at: $GPGSM
+ Gpgsm version: $GPGSM_VERSION, min. $NEED_GPGSM_VERSION
+ G13 at: $G13
G13 version: $G13_VERSION, min. $NEED_G13_VERSION
Assuan version: $libassuan_config_version, min. $NEED_LIBASSUAN_VERSION
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 02:27:16 +0000