[Gpg4win-commits] r520 - in trunk: . src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Sep 7 23:48:16 CEST 2007
Author: marcus
Date: 2007-09-07 23:48:16 +0200 (Fri, 07 Sep 2007)
New Revision: 520
Modified:
trunk/ChangeLog
trunk/TODO
trunk/configure.ac
trunk/src/Makefile.am
trunk/src/inst-gpgme.nsi
trunk/src/inst-sections.nsi
Log:
2007-09-07 Marcus Brinkmann <marcus at g10code.de>
* configure.ac: Add libassuan as dependency for GpgEX.
* src/Makefile.am (gpg4win_pkg_gpgex_configure): Add gpg-error and
libassuan configure options.
* configure.ac: Add qt as dependency for GPGME.
* src/inst-sections.nsi [HAVE_PKG_QT]: Make GPGME depending on Qt.
* src/inst-gpgme.nsi: Change condition from !GPG4WIN_LIGHT to HAVE_PKG_QT.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-07 20:52:16 UTC (rev 519)
+++ trunk/ChangeLog 2007-09-07 21:48:16 UTC (rev 520)
@@ -1,5 +1,13 @@
2007-09-07 Marcus Brinkmann <marcus at g10code.de>
+ * configure.ac: Add libassuan as dependency for GpgEX.
+ * src/Makefile.am (gpg4win_pkg_gpgex_configure): Add gpg-error and
+ libassuan configure options.
+
+ * configure.ac: Add qt as dependency for GPGME.
+ * src/inst-sections.nsi [HAVE_PKG_QT]: Make GPGME depending on Qt.
+ * src/inst-gpgme.nsi: Change condition from !GPG4WIN_LIGHT to HAVE_PKG_QT.
+
* src/Makefile.am (gpg4win_pkg_gpgme_configure): Remove LDFLAGS,
add --enable-w32-qt and work around Qt's lack of cross compilation
support.
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2007-09-07 20:52:16 UTC (rev 519)
+++ trunk/TODO 2007-09-07 21:48:16 UTC (rev 520)
@@ -32,6 +32,11 @@
Werner's GNU strip 2.15.91 20040904 is fine but
Marcus' GNU strip 2.15.94 20050118 does not work.
** Mo file installation macro
+** Allow optional packages. For example, GPGME depends on Qt, which
+ limits the number of different installers you can build. To make
+ this more flexible, we need optional packages in configure.ac
+ checks, and optional configure flags in Makefile.am. The installer
+ itself already supports them well.
* Component related issues:
** Check which iconv to use !!
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-09-07 20:52:16 UTC (rev 519)
+++ trunk/configure.ac 2007-09-07 21:48:16 UTC (rev 520)
@@ -1,5 +1,5 @@
# configure.ac for GPG4Win
-# Copyright (C) 2005, 2006 g10 Code GmbH
+# Copyright (C) 2005, 2006, 2007 g10 Code GmbH
#
# This file is part of GPG4Win
#
@@ -192,14 +192,14 @@
GPG4WIN_SPKG([dirmngr], [libgpg-error libgcrypt libassuan libksba])
GPG4WIN_SPKG([w32pth])
GPG4WIN_SPKG([pinentry], [libiconv])
-GPG4WIN_SPKG([gpgme], [libgpg-error gnupg glib])
+GPG4WIN_SPKG([gpgme], [libgpg-error gnupg glib qt])
GPG4WIN_SPKG([gnupg], [libiconv bzip2])
GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
w32pth zlib bzip2])
GPG4WIN_SPKG([pthreads-w32])
GPG4WIN_SPKG([pinentry])
GPG4WIN_SPKG([gpgol], [gpgme])
-GPG4WIN_SPKG([gpgex])
+GPG4WIN_SPKG([gpgex], [libassuan])
GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
GPG4WIN_SPKG([winpt], [gpgme gnupg])
GPG4WIN_SPKG([sylpheed-claws], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-09-07 20:52:16 UTC (rev 519)
+++ trunk/src/Makefile.am 2007-09-07 21:48:16 UTC (rev 520)
@@ -168,7 +168,9 @@
gpg4win_pkg_gpgol_configure = --silent \
--with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)
-gpg4win_pkg_gpgex_configure = --silent
+gpg4win_pkg_gpgex_configure = --silent \
+ --with-gpg-error-prefix=$(idir) \
+ --with-libassuan-prefix=$(idir)
gpg4win_pkg_winpt_configure = --silent \
--with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)
Modified: trunk/src/inst-gpgme.nsi
===================================================================
--- trunk/src/inst-gpgme.nsi 2007-09-07 20:52:16 UTC (rev 519)
+++ trunk/src/inst-gpgme.nsi 2007-09-07 21:48:16 UTC (rev 520)
@@ -48,7 +48,7 @@
File /oname=libgpgme-glib-11.dll.tmp "${prefix}/bin/libgpgme-glib-11.dll"
Rename /REBOOTOK libgpgme-glib-11.dll.tmp libgpgme-glib-11.dll
-!ifndef GPG4WIN_LIGHT
+!ifdef HAVE_PKG_QT
ClearErrors
SetOverwrite try
File "${prefix}/bin/libgpgme-qt-11.dll"
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2007-09-07 20:52:16 UTC (rev 519)
+++ trunk/src/inst-sections.nsi 2007-09-07 21:48:16 UTC (rev 520)
@@ -656,7 +656,10 @@
${SF_SELECTED} have_gpgme skip_gpgme
have_gpgme:
!insertmacro SelectSection ${SEC_libgpg_error}
- skip_gpgme:
+!ifdef HAVE_PKG_QT
+ !insertmacro SelectSection ${SEC_qt}
+!endif
+ skip_gpgme:
!endif
# Package "zlib" has no dependencies.
More information about the Gpg4win-commits
mailing list