[Gpg4win-commits] r808 - in trunk: . packages src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-05-08 18:15:05 +0200 (Thu, 08 May 2008)
New Revision: 808

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/packages/packages.current
   trunk/src/Makefile.am
Log:
Update adns.
Allow gpgme building with a missing qt or glib.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-05-08 14:41:18 UTC (rev 807)
+++ trunk/ChangeLog	2008-05-08 16:15:05 UTC (rev 808)
@@ -1,8 +1,14 @@
 2008-05-08  Werner Koch  <wk at g10code.com>
 
+	* packages/packages.current: Update adns.
+
+	* configure.ac: Don't let gpgme depend on qt.
+
 	* src/inst-gpa.nsi: Mape tips installation optional.
 
 	* src/Makefile.am (gpg4win_pkg_gnupg2_configure): Add --with-adns.
+	(gpg4win_pkg_gpgme_configure): Build qt and glib versions only if
+	the packages are available.
 
 2008-05-08  Marcus Brinkmann  <marcus at ulysses.g10code.com>
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-05-08 14:41:18 UTC (rev 807)
+++ trunk/configure.ac	2008-05-08 16:15:05 UTC (rev 808)
@@ -193,7 +193,7 @@
 GPG4WIN_SPKG([dirmngr], [libgpg-error libgcrypt libassuan libksba])
 GPG4WIN_SPKG([w32pth])
 GPG4WIN_SPKG([pinentry], [libiconv gtk+])
-GPG4WIN_SPKG([gpgme], [libgpg-error gnupg glib qt])
+GPG4WIN_SPKG([gpgme], [libgpg-error gnupg glib])
 GPG4WIN_SPKG([gnupg], [libiconv bzip2])
 GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
                         w32pth zlib bzip2 adns pinentry])

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2008-05-08 14:41:18 UTC (rev 807)
+++ trunk/packages/packages.current	2008-05-08 16:15:05 UTC (rev 808)
@@ -306,8 +306,8 @@
 #
 server ftp://ftp.g10code.com/g10code/adns
 
-file adns-1.4-g10-1.tar.bz2
-chk 631ee88b7665b958f5734d736f327fadeb059ee0  
+file adns-1.4-g10-2.tar.bz2
+chk  6255a7958dc9e735c3f76595cd973abca09c1f93
 
 
 #

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2008-05-08 14:41:18 UTC (rev 807)
+++ trunk/src/Makefile.am	2008-05-08 16:15:05 UTC (rev 808)
@@ -158,6 +158,7 @@
   --with-libassuan-prefix=$(idir) \
   --with-zlib=$(idir) \
   --with-pth-prefix=$(idir) \
+  --with-adns=$(idir) \
   --without-included-gettext \
   --disable-regex
 
@@ -176,8 +177,9 @@
 # around the lack of cross compilation support in qt-dev.
 gpg4win_pkg_gpgme_configure = --silent \
   --with-gpg-error-prefix=$(idir) --enable-static \
-  --enable-w32-glib LDFLAGS=-L$(idir)/lib \
-  --enable-w32-qt \
+  `test -n "@HAVE_PKG_GLIB@" && echo "--enable-w32-glib"` \
+  `test -n "@HAVE_PKG_QT@" && echo "--enable-w32-qt"` \
+  LDFLAGS=-L$(idir)/lib \
   QT4_CORE_CFLAGS=\"-DQT_LARGEFILE_SUPPORT -DQT_DLL \
                    -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_THREAD_SUPPORT \
                    -I$(idir)/include/QtCore -I$(idir)/include \