Imported Upstream version 1.8.0upstream/1.8.0

1 files changed, 44 insertions, 87 deletions

diff --git a/configure b/configure
index c44a751..8eb189d 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.7.1.
+# Generated by GNU Autoconf 2.69 for gpgme 1.8.0.
 #
 # 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.7.1'
-PACKAGE_STRING='gpgme 1.7.1'
+PACKAGE_VERSION='1.8.0'
+PACKAGE_STRING='gpgme 1.8.0'
 PACKAGE_BUGREPORT='http://bugs.gnupg.org'
 PACKAGE_URL=''
 
@@ -705,8 +705,6 @@ GPGME_QTTEST_CFLAGS
 GPGME_QT_LIBS
 GPGME_QT_CFLAGS
 HAVE_CXX11
-HAVE_PTHREAD_FALSE
-HAVE_PTHREAD_TRUE
 BUILD_W32_GLIB_FALSE
 BUILD_W32_GLIB_TRUE
 HAVE_ANDROID_SYSTEM_FALSE
@@ -751,6 +749,9 @@ DLLTOOL
 AS
 CC_FOR_BUILD
 VERSION_NUMBER
+VERSION_MICRO
+VERSION_MINOR
+VERSION_MAJOR
 LIBQGPGME_LT_REVISION
 LIBQGPGME_LT_AGE
 LIBQGPGME_LT_CURRENT
@@ -1454,7 +1455,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.7.1 to adapt to many kinds of systems.
+\`configure' configures gpgme 1.8.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1524,7 +1525,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gpgme 1.7.1:";;
+     short | recursive ) echo "Configuration of gpgme 1.8.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1672,7 +1673,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gpgme configure 1.7.1
+gpgme configure 1.8.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2502,7 +2503,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.7.1, which was
+It was created by gpgme $as_me 1.8.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2865,23 +2866,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #   (Interfaces added:			AGE++)
 #   (Interfaces removed/changed:	AGE=0)
 #
-LIBGPGME_LT_CURRENT=27
-LIBGPGME_LT_AGE=16
+LIBGPGME_LT_CURRENT=28
+LIBGPGME_LT_AGE=17
 LIBGPGME_LT_REVISION=0
 
-LIBGPGMEPP_LT_CURRENT=8
-LIBGPGMEPP_LT_AGE=2
+# If there is an ABI break in gpgmepp or qgpgme also bump the
+# version in IMPORTED_LOCATION in the GpgmeppConfig-w32.cmake.in.in
+
+LIBGPGMEPP_LT_CURRENT=9
+LIBGPGMEPP_LT_AGE=3
 LIBGPGMEPP_LT_REVISION=0
 
-LIBQGPGME_LT_CURRENT=7
-LIBQGPGME_LT_AGE=0
+LIBQGPGME_LT_CURRENT=8
+LIBQGPGME_LT_AGE=1
 LIBQGPGME_LT_REVISION=0
 
 # If the API is changed in an incompatible way: increment the next counter.
 GPGME_CONFIG_API_VERSION=1
 ##############################################
 
-NEED_GPG_ERROR_VERSION=1.11
+NEED_GPG_ERROR_VERSION=1.17
 NEED_LIBASSUAN_API=2
 NEED_LIBASSUAN_VERSION=2.0.2
 
@@ -2889,6 +2893,10 @@ NEED_LIBASSUAN_VERSION=2.0.2
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
+VERSION_MAJOR=1
+VERSION_MINOR=8
+VERSION_MICRO=0
+
 ac_aux_dir=
 for ac_dir in build-aux "$srcdir"/build-aux; do
   if test -f "$ac_dir/install-sh"; then
@@ -3408,7 +3416,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gpgme'
- VERSION='1.7.1'
+ VERSION='1.8.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6309,6 +6317,9 @@ test -n "$GITLOG_TO_CHANGELOG" || GITLOG_TO_CHANGELOG="gitlog-to-changelog"
 
 
 
+
+
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE "$PACKAGE"
 _ACEOF
@@ -6318,7 +6329,7 @@ cat >>confdefs.h <<_ACEOF
 #define VERSION "$VERSION"
 _ACEOF
 
-VERSION_NUMBER=0x010701
+VERSION_NUMBER=0x010800
 
 
 # We need to compile and run a program on the build machine.  A
@@ -17433,7 +17444,7 @@ $as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$gl
 $as_echo "no" >&6; }
      if test "$PKG_CONFIG" = "no" ; then
        echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
+       echo "*** See https://www.freedesktop.org/software/pkgconfig/"
      else
        if test -f conf.glibtest ; then
         :
@@ -17499,52 +17510,6 @@ fi
        ;;
     *)
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_create ();
-int
-main ()
-{
-return pthread_create ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthread_pthread_create=yes
-else
-  ac_cv_lib_pthread_pthread_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
-  have_pthread=yes
-fi
-
-	if test "$have_pthread" = yes; then
-
-$as_echo "#define HAVE_PTHREAD /**/" >>confdefs.h
-
-	fi
-
 	# XXX: Probably use exec-prefix here?
 #	GPG_DEFAULT='/usr/bin/gpg'
 #	GPGSM_DEFAULT='/usr/bin/gpgsm'
@@ -17632,15 +17597,6 @@ else
 fi
 
 
- if test "$have_pthread" = "yes"; then
-  HAVE_PTHREAD_TRUE=
-  HAVE_PTHREAD_FALSE='#'
-else
-  HAVE_PTHREAD_TRUE='#'
-  HAVE_PTHREAD_FALSE=
-fi
-
-
 
 # Check whether --enable-fixed-path was given.
 if test "${enable_fixed_path+set}" = set; then :
@@ -20628,7 +20584,7 @@ ENABLED_LANGUAGES=$enabled_languages
 #
 # Provide information about the build.
 #
-BUILD_REVISION="2c490cd"
+BUILD_REVISION="f06220b"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20637,7 +20593,7 @@ _ACEOF
 
 
 BUILD_FILEVERSION=`echo "$PACKAGE_VERSION"|sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
-BUILD_FILEVERSION="${BUILD_FILEVERSION}11337"
+BUILD_FILEVERSION="${BUILD_FILEVERSION}61538"
 
 
 # Check whether --enable-build-timestamp was given.
@@ -22362,6 +22318,8 @@ ac_config_files="$ac_config_files src/gpgme-config"
 
 ac_config_files="$ac_config_files lang/cpp/Makefile lang/cpp/src/Makefile"
 
+ac_config_files="$ac_config_files lang/cpp/src/GpgmeppConfig-w32.cmake.in"
+
 ac_config_files="$ac_config_files lang/cpp/src/GpgmeppConfig.cmake.in"
 
 ac_config_files="$ac_config_files lang/cpp/src/GpgmeppConfigVersion.cmake"
@@ -22370,6 +22328,8 @@ ac_config_files="$ac_config_files lang/cpp/src/gpgmepp_version.h"
 
 ac_config_files="$ac_config_files lang/qt/Makefile lang/qt/src/Makefile"
 
+ac_config_files="$ac_config_files lang/qt/src/QGpgmeConfig-w32.cmake.in"
+
 ac_config_files="$ac_config_files lang/qt/src/QGpgmeConfig.cmake.in"
 
 ac_config_files="$ac_config_files lang/qt/src/QGpgmeConfigVersion.cmake"
@@ -22386,7 +22346,7 @@ if test -z "$HAVE_DOXYGEN_TRUE"; then :
 fi
 ac_config_files="$ac_config_files lang/qt/doc/Makefile"
 
-ac_config_files="$ac_config_files lang/python/Makefile lang/python/pyme/version.py lang/python/tests/Makefile"
+ac_config_files="$ac_config_files lang/python/Makefile lang/python/gpg/version.py lang/python/tests/Makefile"
 
 ac_config_files="$ac_config_files lang/python/setup.py"
 
@@ -22563,10 +22523,6 @@ if test -z "${BUILD_W32_GLIB_TRUE}" && test -z "${BUILD_W32_GLIB_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_W32_GLIB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_PTHREAD_TRUE}" && test -z "${HAVE_PTHREAD_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_PTHREAD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_DOXYGEN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -22992,7 +22948,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.7.1, which was
+This file was extended by gpgme $as_me 1.8.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23058,7 +23014,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.7.1
+gpgme config.status 1.8.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -23665,11 +23621,13 @@ do
     "src/gpgme-config") CONFIG_FILES="$CONFIG_FILES src/gpgme-config" ;;
     "lang/cpp/Makefile") CONFIG_FILES="$CONFIG_FILES lang/cpp/Makefile" ;;
     "lang/cpp/src/Makefile") CONFIG_FILES="$CONFIG_FILES lang/cpp/src/Makefile" ;;
+    "lang/cpp/src/GpgmeppConfig-w32.cmake.in") CONFIG_FILES="$CONFIG_FILES lang/cpp/src/GpgmeppConfig-w32.cmake.in" ;;
     "lang/cpp/src/GpgmeppConfig.cmake.in") CONFIG_FILES="$CONFIG_FILES lang/cpp/src/GpgmeppConfig.cmake.in" ;;
     "lang/cpp/src/GpgmeppConfigVersion.cmake") CONFIG_FILES="$CONFIG_FILES lang/cpp/src/GpgmeppConfigVersion.cmake" ;;
     "lang/cpp/src/gpgmepp_version.h") CONFIG_FILES="$CONFIG_FILES lang/cpp/src/gpgmepp_version.h" ;;
     "lang/qt/Makefile") CONFIG_FILES="$CONFIG_FILES lang/qt/Makefile" ;;
     "lang/qt/src/Makefile") CONFIG_FILES="$CONFIG_FILES lang/qt/src/Makefile" ;;
+    "lang/qt/src/QGpgmeConfig-w32.cmake.in") CONFIG_FILES="$CONFIG_FILES lang/qt/src/QGpgmeConfig-w32.cmake.in" ;;
     "lang/qt/src/QGpgmeConfig.cmake.in") CONFIG_FILES="$CONFIG_FILES lang/qt/src/QGpgmeConfig.cmake.in" ;;
     "lang/qt/src/QGpgmeConfigVersion.cmake") CONFIG_FILES="$CONFIG_FILES lang/qt/src/QGpgmeConfigVersion.cmake" ;;
     "lang/qt/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lang/qt/tests/Makefile" ;;
@@ -23680,7 +23638,7 @@ do
     "lang/qt/doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES lang/qt/doc/Doxyfile" ;;
     "lang/qt/doc/Makefile") CONFIG_FILES="$CONFIG_FILES lang/qt/doc/Makefile" ;;
     "lang/python/Makefile") CONFIG_FILES="$CONFIG_FILES lang/python/Makefile" ;;
-    "lang/python/pyme/version.py") CONFIG_FILES="$CONFIG_FILES lang/python/pyme/version.py" ;;
+    "lang/python/gpg/version.py") CONFIG_FILES="$CONFIG_FILES lang/python/gpg/version.py" ;;
     "lang/python/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lang/python/tests/Makefile" ;;
     "lang/python/setup.py") CONFIG_FILES="$CONFIG_FILES lang/python/setup.py" ;;
 
@@ -24415,7 +24373,7 @@ $as_echo X"$file" |
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# can be downloaded from https://www.gnu.org/licenses/gpl.html, or
 # obtained by writing to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
@@ -25368,12 +25326,11 @@ fi
 echo "
         GPGME v${VERSION} has been configured as follows:
 
-        Revision:          2c490cd  (11337)
+        Revision:          f06220b  (61538)
         Platform:          $host
 
         UI Server:         $uiserver
         FD Passing:        $use_descriptor_passing
-        GPGME Pthread:     $have_pthread
 
         Language bindings: ${enabled_languages_v:-$enabled_languages}
 "