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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2009-02-16 19:51:37 +0100 (Mon, 16 Feb 2009)
New Revision: 1102

Modified:
   trunk/ChangeLog
   trunk/src/inst-sections.nsi
Log:
2009-02-16  Marcus Brinkmann  <marcus at g10code.de>

	* src/inst-sections.nsi (calc_defaults_man_advanced_en_done): Make
	GPA an alternative to Kleopatra for GpgEX and GpgOL.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-02-16 18:32:43 UTC (rev 1101)
+++ trunk/ChangeLog	2009-02-16 18:51:37 UTC (rev 1102)
@@ -1,5 +1,8 @@
 2009-02-16  Marcus Brinkmann  <marcus at g10code.de>
 
+	* src/inst-sections.nsi (calc_defaults_man_advanced_en_done): Make
+	GPA an alternative to Kleopatra for GpgEX and GpgOL.
+
 	* src/inst-sections.nsi: Install an uninstall entry into the start
 	menu.
 	* src/inst-finish.nsi: Add translation for uninstall entry.

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2009-02-16 18:32:43 UTC (rev 1101)
+++ trunk/src/inst-sections.nsi	2009-02-16 18:51:37 UTC (rev 1102)
@@ -710,8 +710,14 @@
   !insertmacro SectionFlagIsSet ${SEC_gpgex} \
 		${SF_SELECTED} have_gpgex skip_gpgex
   have_gpgex:
-  # This is not a build dependency, but it is a run-t
+
+  # This is not a build dependency, but it is a run-time dependency.
+  !insertmacro SectionFlagIsSet ${SEC_gpa} \
+		${SF_SELECTED} skip_gpgex_dep_kleopatra need_gpgex_dep_kleopatra
+  need_gpgex_dep_kleopatra:
   !insertmacro SelectSection ${SEC_kleopatra}
+  skip_gpgex_dep_kleopatra:
+
   # Other dependencies are linked in statically.
   skip_gpgex:
 !endif
@@ -721,7 +727,14 @@
 		${SF_SELECTED} have_gpgol skip_gpgol
   have_gpgol:
   !insertmacro SelectSection ${SEC_gpgme}
+
+  # This is not a build dependency, but it is a run-time dependency.
+  !insertmacro SectionFlagIsSet ${SEC_gpa} \
+		${SF_SELECTED} skip_gpgol_dep_kleopatra need_gpgol_dep_kleopatra
+  need_gpgol_dep_kleopatra:
   !insertmacro SelectSection ${SEC_kleopatra}
+  skip_gpgol_dep_kleopatra:
+
   skip_gpgol:
 !endif