Add adns.
[gpg4win.git] / src / Makefile.am
index f85ddb8..d68dcd9 100644 (file)
@@ -21,10 +21,14 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
         installer-options.ini.in libiconv.def libintl.def loreley.mid \
         gpg4win-splash.wav gpgwrap.c exdll.h g4wihelp.c g4wihelp.nsi \
         inst-sections.nsi installer.nsi installer-finish.nsi  \
-        qt.conf kleowrap.c potomo Memento.nsh                 \
+        qt.conf kleowrap.c potomo Memento.nsh dirmngr.conf    \
         inst-gpg4win.nsi          uninst-gpg4win.nsi         \
         inst-atk.nsi               uninst-atk.nsi            \
         inst-cairo.nsi            uninst-cairo.nsi           \
+        inst-libgsasl.nsi         uninst-libgsasl.nsi        \
+        inst-libtasn1.nsi         uninst-libtasn1.nsi        \
+        inst-opencdk.nsi          uninst-opencdk.nsi         \
+        inst-gnutls.nsi                   uninst-gnutls.nsi          \
         inst-libetpan.nsi         uninst-libetpan.nsi        \
         inst-claws-mail.nsi       uninst-claws-mail.nsi      \
         inst-crypt.nsi            uninst-crypt.nsi           \
@@ -46,6 +50,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
         inst-libgpg-error.nsi     uninst-libgpg-error.nsi    \
         inst-libiconv.nsi         uninst-libiconv.nsi        \
         inst-libksba.nsi          uninst-libksba.nsi         \
+        inst-adns.nsi             uninst-adns.nsi            \
         inst-libpng.nsi                   uninst-libpng.nsi          \
         inst-man_advanced_de.nsi   uninst-man_advanced_de.nsi \
         inst-man_advanced_en.nsi   uninst-man_advanced_en.nsi \
@@ -56,7 +61,6 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
         inst-pkgconfig.nsi        uninst-pkgconfig.nsi       \
         inst-pthreads-w32.nsi     uninst-pthreads-w32.nsi    \
         inst-regex.nsi            uninst-regex.nsi           \
-        inst-sylpheed-claws.nsi           uninst-sylpheed-claws.nsi  \
         inst-w32pth.nsi                   uninst-w32pth.nsi          \
         inst-winpt.nsi            uninst-winpt.nsi           \
         inst-zlib.nsi             uninst-zlib.nsi            \
@@ -74,9 +78,9 @@ CLEANFILES = g4wihelp.dll versioninfo.txt README.en.txt README.de.txt \
 
 # Supported source packages.
 gpg4win_spkgs = glib gnupg libgpg-error gpgme gpgol gpgex \
-               gpa winpt sylpheed-claws libetpan \
-               claws-mail gnupg2 pinentry libassuan libksba \
-               libgcrypt dirmngr w32pth
+               gpa winpt libgsasl libtasn1 opencdk gnutls \
+                libetpan claws-mail gnupg2 pinentry \
+               libassuan libksba libgcrypt adns dirmngr w32pth
 
 # Extra options to configure for individual packages.
 # We can use $(idir) here for the installation prefix.
@@ -135,6 +139,8 @@ gpg4win_pkg_libksba_configure = --silent \
 gpg4win_pkg_libgcrypt_configure = --silent \
   --with-gpg-error-prefix=$(idir)
 
+gpg4win_pkg_adns_configure = --silent
+
 gpg4win_pkg_dirmngr_configure = \
   --with-gpg-error-prefix=$(idir) \
   --with-ksba-prefix=$(idir) \
@@ -194,15 +200,8 @@ gpg4win_pkg_gpgex_configure = --silent \
 gpg4win_pkg_winpt_configure = --silent \
   --with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)
 
-gpg4win_pkg_sylpheed_claws_configure = --silent \
-  --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
-  --with-gpg-error-prefix=$(idir) --with-gpgme-prefix=$(idir) \
-  --with-config-dir="Sylpheed-claws" --disable-pthread \
-  --disable-libetpan --disable-aspell --disable-trayicon-plugin \
-  --disable-openssl --disable-dillo-viewer-plugin --disable-gnomeprint \
-  --disable-jpilot --disable-startup-notification --disable-ipv6 \
-  --disable-mathml-viewer-plugin --disable-clamav-plugin \
-  --disable-spamassassin-plugin
+gpg4win_pkg_gnutls_configure = \
+  --disable-cxx
 
 # The CFLAGS are needed to find pthread-w32.
 gpg4win_pkg_libetpan_configure = \
@@ -211,13 +210,13 @@ gpg4win_pkg_libetpan_configure = \
 gpg4win_pkg_claws_mail_configure = \
   --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
   --with-gpg-error-prefix=$(idir) --with-gpgme-prefix=$(idir) \
-  --with-config-dir="Claws-mail" --disable-pthread \
+  --with-config-dir="Claws-mail" --enable-pthread --enable-gnutls \
   --enable-libetpan --disable-aspell --disable-trayicon-plugin \
   --disable-openssl --disable-dillo-viewer-plugin --disable-gnomeprint \
   --disable-jpilot --disable-startup-notification --disable-ipv6 \
   --disable-mathml-viewer-plugin --disable-clamav-plugin \
   --disable-spamassassin-plugin --disable-bogofilter-plugin \
-  --disable-valgrind
+  --disable-valgrind --disable-networkmanager-support
 
 # Supported make-only source packages.
 gpg4win_mpkgs = pthreads-w32 bzip2