Update gnupg to 2.1.8
[gpg4win.git] / configure.ac
index 0fcd94a..2bef226 100644 (file)
@@ -25,9 +25,7 @@ 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.
 # (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], [2.1.1])
+m4_define([my_version], [3.0.0])
 
 # Below is m4 magic to extract and compute the git revision number,
 # the decimalized short revision number, a beta version string and a
 
 # Below is m4 magic to extract and compute the git revision number,
 # the decimalized short revision number, a beta version string and a
@@ -38,8 +36,8 @@ m4_define([git_revision],
 m4_define([git_revision_dec],
           m4_esyscmd_s([echo $((0x$(echo ]git_revision[|head -c 4)))]))
 m4_define([git_betastring],
 m4_define([git_revision_dec],
           m4_esyscmd_s([echo $((0x$(echo ]git_revision[|head -c 4)))]))
 m4_define([git_betastring],
-          m4_esyscmd_s([git describe --match 'gpg4win-[0-9].*.*[0-9]' --long|\
-                        awk -F- '$3!=0{print"-beta"$3}']))
+          m4_esyscmd_s([git describe --tags --match 'gpg4win-[0-9].*.*[0-9]' \
+                       --long | awk -F- '$3!=0{print"-beta"$3}']))
 m4_define([my_isgit],m4_if(git_betastring,[],[no],[yes]))
 m4_define([my_full_version],[my_version[]git_betastring])
 
 m4_define([my_isgit],m4_if(git_betastring,[],[no],[yes]))
 m4_define([my_full_version],[my_version[]git_betastring])
 
@@ -55,11 +53,11 @@ MANUALDATE_NOVICES="Nov. 30, 2006"
 MANUALVERSION_ADVANCED="0.0.0"
 MANUALDATE_ADVANCED="Nov. 30, 2006"
 COMPENDIUM_VERSION_DE="3.0.0"
 MANUALVERSION_ADVANCED="0.0.0"
 MANUALDATE_ADVANCED="Nov. 30, 2006"
 COMPENDIUM_VERSION_DE="3.0.0"
-COMPENDIUM_DATE_DE="21. Mai 2010"
-COMPENDIUMINPROGRESS_DE="zuletzt geringfügig korrigiert am 4. Januar 2012"
-COMPENDIUM_VERSION_EN="3.0.0-beta1"
-COMPENDIUM_DATE_EN="31. August 2010"
-COMPENDIUMINPROGRESS_EN="last minor changes from 4. January 2012"
+COMPENDIUM_DATE_DE="3. August 2015"
+COMPENDIUMINPROGRESS_DE="zuletzt geringfügig korrigiert am 3. August 2015"
+COMPENDIUM_VERSION_EN="3.0.0"
+COMPENDIUM_DATE_EN="3rd August 2015"
+COMPENDIUMINPROGRESS_EN="last minor changes from 3rd August 2015"
 
 MANUALINPROGRESS_DE=m4_if(my_isgit,[yes],["~und evtl. seitdem weiter bearbeitet"])
 MANUALINPROGRESS_EN=m4_if(my_isgit,[yes],["~and may have been further edited"])
 
 MANUALINPROGRESS_DE=m4_if(my_isgit,[yes],["~und evtl. seitdem weiter bearbeitet"])
 MANUALINPROGRESS_EN=m4_if(my_isgit,[yes],["~and may have been further edited"])
@@ -69,7 +67,7 @@ GIT_REVISION=git_revision
 GIT_REVISION_DEC=git_revision_dec
 
 
 GIT_REVISION_DEC=git_revision_dec
 
 
-AC_CONFIG_SRCDIR(include/config.nsi.in)
+AC_CONFIG_SRCDIR(src/config.nsi.in)
 AC_CONFIG_MACRO_DIR(m4)
 
 AM_INIT_AUTOMAKE([tar-ustar])
 AC_CONFIG_MACRO_DIR(m4)
 
 AM_INIT_AUTOMAKE([tar-ustar])
@@ -259,72 +257,20 @@ for i in DLLTOOL MAKE UNZIP TAR MKDIR CP RM STOW MAKENSIS ZCAT TEXI2DVI \
    fi
 done
 
    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_tools="libgcc_s_sjlj-1.dll $missing_tools"
-else
-  if test -r "$libgcc_dll"; then
-    cp $libgcc_dll src/libgcc_s_sjlj-1.dll-x
-  else
-    missing_tools="libgcc_s_sjlj-1.dll $missing_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_tools="libstdc++-6.dll $missing_tools"
-else
-  if test -r "$libstdcpp_dll"; then
-    cp $libstdcpp_dll src/libstdc++-6.dll-x
-  else
-    missing_tools="libstdc++-6.dll $missing_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)
 AC_CHECK_PROGS(GLIB_COMPILE_RESOURCES, glib-compile-resources)
 AC_CHECK_PROGS(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource)
 
 AC_CHECK_PROGS(GLIB_GENMARSHAL, glib-genmarshal)
 AC_CHECK_PROGS(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
 AC_CHECK_PROGS(GLIB_COMPILE_RESOURCES, glib-compile-resources)
 AC_CHECK_PROGS(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource)
-AC_CHECK_PROGS(GS, gs)
-# For the claws manual we need:
-AC_CHECK_PROGS(DOCBOOK2HTML, docbook2html)
-AC_CHECK_PROGS(DOCBOOK2TXT, docbook2txt)
-AC_CHECK_PROGS(DOCBOOK2PS, docbook2ps)
-AC_CHECK_PROGS(DOCBOOK2PDF, docbook2pdf)
 
 
 missing_opt_tools=
 for i in GLIB_GENMARSHAL GLIB_COMPILE_SCHEMAS GLIB_COMPILE_RESOURCES \
 
 
 missing_opt_tools=
 for i in GLIB_GENMARSHAL GLIB_COMPILE_SCHEMAS GLIB_COMPILE_RESOURCES \
-         GDK_PIXBUF_CSOURCE GS \
-         DOCBOOK2PDF DOCBOOK2TXT DOCBOOK2PS DOCBOOK2PDF; do
+         GDK_PIXBUF_CSOURCE; do
    eval tmp='$'$i
    if test -z "$tmp"; then
       missing_opt_tools="$missing_opt_tools `echo $i | tr 'A-Z' 'a-z'`"
    eval tmp='$'$i
    if test -z "$tmp"; then
       missing_opt_tools="$missing_opt_tools `echo $i | tr 'A-Z' 'a-z'`"
@@ -343,7 +289,6 @@ gpg4win_dup_sources=""
 
 
 GPG4WIN_SPKG([zlib])
 
 
 GPG4WIN_SPKG([zlib])
-GPG4WIN_BPKG_GNUWIN32([bsfilter])
 
 GPG4WIN_BPKG_GTK([pkgconfig])
 
 
 GPG4WIN_BPKG_GTK([pkgconfig])
 
@@ -359,37 +304,15 @@ GPG4WIN_SPKG([gdk-pixbuf], [glib])
 GPG4WIN_SPKG([gtk+], [libiconv gettext pkgconfig atk pango dnl
                       glib gdk-pixbuf cairo])
 GPG4WIN_SPKG([libpng], [pkgconfig])
 GPG4WIN_SPKG([gtk+], [libiconv gettext pkgconfig atk pango dnl
                       glib gdk-pixbuf cairo])
 GPG4WIN_SPKG([libpng], [pkgconfig])
-GPG4WIN_SPKG([enchant], [pkgconfig glib])
 
 
-GPG4WIN_SPKG([bzip2])
-GPG4WIN_SPKG([adns])
 GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
 GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
-GPG4WIN_SPKG([libgcrypt], [libgpg-error])
-GPG4WIN_SPKG([libksba], [libgpg-error])
 GPG4WIN_SPKG([libassuan], [libgpg-error w32pth])
 GPG4WIN_SPKG([libassuan], [libgpg-error w32pth])
-GPG4WIN_SPKG([dirmngr], [libgpg-error libgcrypt libassuan libksba w32pth])
 GPG4WIN_SPKG([pinentry], [libiconv gtk+])
 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([pthreads-w32])
+GPG4WIN_SPKG([gpgme], [libgpg-error glib])
 GPG4WIN_SPKG([gpgol], [gpgme libassuan])
 GPG4WIN_SPKG([gpgex], [libassuan])
 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([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([libetpan], [pthreads-w32 gnutls])
-GPG4WIN_SPKG([libxml2], [zlib])
-GPG4WIN_SPKG([regex])
-GPG4WIN_SPKG([crypt])
-GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng enchant glib dnl
-                            gpgme pthreads-w32 crypt regex libetpan gnutls dnl
-                            libxml2])
-GPG4WIN_SPKG([gtkhtml2_viewer], [curl claws-mail libxml2])
 GPG4WIN_SPKG([w32pth])
 GPG4WIN_SPKG([libiconv])
 GPG4WIN_SPKG([gettext], [libiconv])
 GPG4WIN_SPKG([w32pth])
 GPG4WIN_SPKG([libiconv])
 GPG4WIN_SPKG([gettext], [libiconv])
@@ -402,11 +325,14 @@ GPG4WIN_SPKGEX([gpgex], [libassuan])
 
 GPG4WIN_IPKG([compendium])
 
 
 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])
 # 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
 
 
 GPG4WIN_FINALIZE
 
@@ -435,19 +361,14 @@ fi
 
 # Finalize.
 
 
 # Finalize.
 
-AC_CONFIG_COMMANDS([gpg4win-conf],[[
-chmod +x patches/gnupg2/01-version.patch
-]])
-
 AC_CONFIG_FILES(Makefile)
 AC_CONFIG_FILES(Makefile)
-AC_CONFIG_FILES(packages/Makefile include/Makefile src/Makefile po/Makefile.in)
+AC_CONFIG_FILES(packages/Makefile src/Makefile po/Makefile.in)
 AC_CONFIG_FILES(po/build-cc)
 AC_CONFIG_FILES(po/build-cc)
-AC_CONFIG_FILES(include/config.nsi src/gpg4win.mk)
+AC_CONFIG_FILES(src/config.nsi src/gpg4win.mk)
 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(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
 AC_OUTPUT
 
 # Throw a warning if optional tools are missing