[Gpg4win-commits] r337 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2006-08-03 00:02:31 +0200 (Thu, 03 Aug 2006)
New Revision: 337

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/inst-sections.nsi
Log:
2006-08-03  Marcus Brinkmann  <marcus at g10code.de>

	* configure.ac: Add libiconv as a dependency for gnupg.
	* src/inst-sections.nsi: Likewise here.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-08-02 21:42:56 UTC (rev 336)
+++ trunk/ChangeLog	2006-08-02 22:02:31 UTC (rev 337)
@@ -1,3 +1,8 @@
+2006-08-03  Marcus Brinkmann  <marcus at g10code.de>
+
+	* configure.ac: Add libiconv as a dependency for gnupg.
+	* src/inst-sections.nsi: Likewise here.
+
 2006-08-02  Marcus Brinkmann  <marcus at g10code.de>
 
 	* packages/packages.current: Add jpeg packages.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-08-02 21:42:56 UTC (rev 336)
+++ trunk/configure.ac	2006-08-02 22:02:31 UTC (rev 337)
@@ -155,7 +155,7 @@
 
 GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
 GPG4WIN_SPKG([gpgme], [libgpg-error gnupg glib])
-GPG4WIN_SPKG([gnupg])
+GPG4WIN_SPKG([gnupg], [libiconv])
 GPG4WIN_SPKG([pthreads-w32])
 GPG4WIN_SPKG([gpgol], [gpgme])
 GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2006-08-02 21:42:56 UTC (rev 336)
+++ trunk/src/inst-sections.nsi	2006-08-02 22:02:31 UTC (rev 337)
@@ -362,10 +362,17 @@
 
   # Package "zlib" has no dependencies.
   # Package "pkgconfig" has no dependencies.
-  # Package "libiconv" has no dependencies.
   # Package "libgpg-error" has no dependencies.
-  # Package "gnupg" has no dependencies.
 
+!ifdef HAVE_PKG_GNUPG
+  !insertmacro SectionFlagIsSet ${SEC_gnupg} ${SF_SELECTED} have_gnupg skip_gnupg
+  have_gnupg:
+  !insertmacro SelectSection ${SEC_libiconv}
+  skip_gnupg:
+!endif
+
+  # Package "libiconv" has no dependencies.
+
 FunctionEnd