Imported Upstream version 1.20.3upstream/1.20.3

1 files changed, 39 insertions, 16 deletions

diff --git a/configure b/configure
index fdcd0dd..80c5a3d 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 wget 1.20.2.
+# Generated by GNU Autoconf 2.69 for wget 1.20.3.
 #
 # Report bugs to <bug-wget@gnu.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='wget'
 PACKAGE_TARNAME='wget'
-PACKAGE_VERSION='1.20.2'
-PACKAGE_STRING='wget 1.20.2'
+PACKAGE_VERSION='1.20.3'
+PACKAGE_STRING='wget 1.20.3'
 PACKAGE_BUGREPORT='bug-wget@gnu.org'
 PACKAGE_URL=''
 
@@ -2407,7 +2407,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 wget 1.20.2 to adapt to many kinds of systems.
+\`configure' configures wget 1.20.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2477,7 +2477,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of wget 1.20.2:";;
+     short | recursive ) echo "Configuration of wget 1.20.3:";;
    esac
   cat <<\_ACEOF
 
@@ -2657,7 +2657,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-wget configure 1.20.2
+wget configure 1.20.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3366,7 +3366,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 wget $as_me 1.20.2, which was
+It was created by wget $as_me 1.20.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4336,7 +4336,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='wget'
- VERSION='1.20.2'
+ VERSION='1.20.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -46807,7 +46807,17 @@ $as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&
      fi
   fi
 
-  # Extract the first word of "gpgme-config", so it can be a program name with args.
+  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; }
@@ -46848,9 +46858,14 @@ $as_echo "no" >&6; }
 fi
 
 
+  fi
 
   if test "$GPGME_CONFIG" != "no" ; then
-    gpgme_version=`$GPGME_CONFIG --version`
+    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/'`
@@ -46987,7 +47002,11 @@ $as_echo_n "checking for GPGME - version >= $min_gpgme_version... " >&6; }
      # If we have a recent GPGME, we should also check that the
      # API is compatible.
      if test "$req_gpgme_api" -gt 0 ; then
-        tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+        if test -z "$use_gpgrt_config"; then
+          tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+        else
+          tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
+        fi
         if test "$tmp" -gt 0 ; then
            if test "$req_gpgme_api" -ne "$tmp" ; then
              ok=no
@@ -47012,12 +47031,16 @@ $as_echo "#define HAVE_GPGME 1" >>confdefs.h
         have_gpg=yes
 
 
-    gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none`
+    if test -z "$use_gpgrt_config"; then
+      gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none`
+    else
+      gpgme_config_host=`$GPGME_CONFIG --variable=host 2>/dev/null || echo none`
+    fi
     if test x"$gpgme_config_host" != xnone ; then
       if test x"$gpgme_config_host" != x"$host" ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
 ***
-*** The config script $GPGME_CONFIG was
+*** The config script \"$GPGME_CONFIG\" was
 *** built for $gpgme_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-gpgme-prefix
@@ -47025,7 +47048,7 @@ $as_echo "#define HAVE_GPGME 1" >>confdefs.h
 ***" >&5
 $as_echo "$as_me: WARNING:
 ***
-*** The config script $GPGME_CONFIG was
+*** The config script \"$GPGME_CONFIG\" was
 *** built for $gpgme_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-gpgme-prefix
@@ -47840,7 +47863,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 wget $as_me 1.20.2, which was
+This file was extended by wget $as_me 1.20.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -47910,7 +47933,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="\\
-wget config.status 1.20.2
+wget config.status 1.20.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"