Update gnupg to 2.1.8
[gpg4win.git] / configure.ac
index c30d27d..2bef226 100644 (file)
@@ -25,8 +25,6 @@ min_automake_version="1.9.3"
 # (git tag -s gpg4win-2.x.y) and run "./autogen.sh --force".  Please
 # bump the version number immediately after the release and do another
 # commit and push so that the git magic is able to work.
-#
-# After a release the make target "copy-news" is to be called as well!
 m4_define([my_version], [3.0.0])
 
 # Below is m4 magic to extract and compute the git revision number,
@@ -259,55 +257,10 @@ for i in DLLTOOL MAKE UNZIP TAR MKDIR CP RM STOW MAKENSIS ZCAT TEXI2DVI \
    fi
 done
 
-# GpgOL and GpgEx need the runtime libaries
-# The default path should probably be more generic
-changequote(,)dnl
-gcc_major_minor=$($CC --version \
-                  | awk 'NR==1 {split($NF,a,"."); print a[1] "." a[2]}')
-changequote([,])dnl
-
-libgcc_dll=no
-AC_ARG_WITH([libgcc_s_sjlj-1-dll],
-           AC_HELP_STRING([--with-libgcc_s_sjlj-1-dll=FILE],
-                          [use the libgcc_s_sjlj-1 DLL]),
-           [libgcc_dll=$withval])
-
-if test "$libgcc_dll" = "no"; then
-  file="/usr/lib/gcc/$host/$gcc_major_minor/libgcc_s_sjlj-1.dll"
-  if test -r "$file"; then
-    libgcc_dll="$file"
-  fi
-fi
-if test "$libgcc_dll" = "no"; then
-  missing_opt_tools="libgcc_s_sjlj-1.dll $missing_opt_tools"
-else
-  if test -r "$libgcc_dll"; then
-    cp $libgcc_dll src/libgcc_s_sjlj-1.dll-x
-  else
-    missing_opt_tools="libgcc_s_sjlj-1.dll $missing_opt_tools"
-  fi
-fi
-
-libstdcpp_dll=no
-AC_ARG_WITH([libstdc++-6-dll],
-           AC_HELP_STRING([--with-libstdc++-6-dll=FILE],
-                          [use the libstd++-6 DLL]),
-           [libstdcpp_dll=$withval])
-if test "$libstdcpp_dll" = "no"; then
-  file="/usr/lib/gcc/$host/$gcc_major_minor/libstdc++-6.dll"
-  if test -r "$file"; then
-    libstdcpp_dll="$file"
-  fi
-fi
-if test "$libstdcpp_dll" = "no"; then
-  missing_opt_tools="libstdc++-6.dll $missing_opt_tools"
-else
-  if test -r "$libstdcpp_dll"; then
-    cp $libstdcpp_dll src/libstdc++-6.dll-x
-  else
-    missing_opt_tools="libstdc++-6.dll $missing_opt_tools"
- fi
-fi
+# Additional runtime libraries from mingw.
+GPG4WIN_RUNTIME_LIBRARY(libgcc_s_sjlj-1)
+GPG4WIN_RUNTIME_LIBRARY(libstdc++-6)
+GPG4WIN_RUNTIME_LIBRARY(libwinpthread-1)
 
 AC_CHECK_PROGS(GLIB_GENMARSHAL, glib-genmarshal)
 AC_CHECK_PROGS(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
@@ -352,26 +305,14 @@ GPG4WIN_SPKG([gtk+], [libiconv gettext pkgconfig atk pango dnl
                       glib gdk-pixbuf cairo])
 GPG4WIN_SPKG([libpng], [pkgconfig])
 
-GPG4WIN_SPKG([bzip2])
-GPG4WIN_SPKG([adns])
 GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
-GPG4WIN_SPKG([libgcrypt], [libgpg-error])
-GPG4WIN_SPKG([libksba], [libgpg-error])
 GPG4WIN_SPKG([libassuan], [libgpg-error w32pth])
-GPG4WIN_SPKG([dirmngr], [libgpg-error libgcrypt libassuan libksba w32pth])
 GPG4WIN_SPKG([pinentry], [libiconv gtk+])
-GPG4WIN_SPKG([gpgme], [libgpg-error gnupg2 glib])
-GPG4WIN_SPKG([curl], [zlib gnutls])
-GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
-                        w32pth zlib bzip2 adns pinentry])
+GPG4WIN_SPKG([gpgme], [libgpg-error glib])
 GPG4WIN_SPKG([gpgol], [gpgme libassuan])
 GPG4WIN_SPKG([gpgex], [libassuan])
-GPG4WIN_SPKG([scute], [libgpg-error libassuan])
 GPG4WIN_SPKG([paperkey])
 GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
-GPG4WIN_SPKG([libgsasl])
-GPG4WIN_SPKG([libtasn1])
-GPG4WIN_SPKG([gnutls], [libgsasl libtasn1 libgcrypt])
 GPG4WIN_SPKG([w32pth])
 GPG4WIN_SPKG([libiconv])
 GPG4WIN_SPKG([gettext], [libiconv])
@@ -384,11 +325,14 @@ GPG4WIN_SPKGEX([gpgex], [libassuan])
 
 GPG4WIN_IPKG([compendium])
 
+# The GnuPG Package.
+GPG4WIN_BPKG_BINSRC([gnupg-w32])
+
 # Qt related stuff.
 GPG4WIN_BPKG_GNUWIN32([dbus])
 GPG4WIN_BPKG_BINSRC([oxygen-icons])
 GPG4WIN_BPKG_GNUWIN32([qt], [dbus])
-GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme gnupg2 qt oxygen-icons])
+GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme qt oxygen-icons])
 
 GPG4WIN_FINALIZE
 
@@ -417,10 +361,6 @@ fi
 
 # Finalize.
 
-AC_CONFIG_COMMANDS([gpg4win-conf],[[
-chmod +x patches/gnupg2/01-version.patch
-]])
-
 AC_CONFIG_FILES(Makefile)
 AC_CONFIG_FILES(packages/Makefile src/Makefile po/Makefile.in)
 AC_CONFIG_FILES(po/build-cc)
@@ -429,7 +369,6 @@ AC_CONFIG_FILES(doc/Makefile)
 AC_CONFIG_FILES(doc/logo/Makefile)
 AC_CONFIG_FILES(doc/manual/Makefile doc/manual/version.tex)
 AC_CONFIG_FILES(src/dictionaries/Makefile)
-AC_CONFIG_FILES(patches/gnupg2/01-version.patch)
 AC_OUTPUT
 
 # Throw a warning if optional tools are missing