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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-06-18 19:08:54 +0200 (Mon, 18 Jun 2007)
New Revision: 415

Modified:
   trunk/ChangeLog
   trunk/src/inst-sections.nsi
Log:
2007-06-18  Marcus Brinkmann  <marcus at g10code.de>

	* src/inst-sections.nsi: Add dependency management for GnuPG2.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-06-15 15:43:54 UTC (rev 414)
+++ trunk/ChangeLog	2007-06-18 17:08:54 UTC (rev 415)
@@ -1,3 +1,7 @@
+2007-06-18  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/inst-sections.nsi: Add dependency management for GnuPG2.
+
 2007-06-15  Werner Koch  <wk at g10code.com>
 
 	* src/gpg4win.mk.in: Add cruel hack to support gnupg2.

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2007-06-15 15:43:54 UTC (rev 414)
+++ trunk/src/inst-sections.nsi	2007-06-18 17:08:54 UTC (rev 415)
@@ -282,9 +282,34 @@
 !ifdef HAVE_PKG_GPGME
   !insertmacro UnselectSection ${SEC_gpgme}
 !endif
+!ifdef HAVE_PKG_LIBKSBA
+  !insertmacro UnselectSection ${SEC_libksba}
+!endif
+!ifdef HAVE_PKG_W32PTH
+  !insertmacro UnselectSection ${SEC_w32pth}
+!endif
+!ifdef HAVE_PKG_LIBASSUAN
+  !insertmacro UnselectSection ${SEC_libassuan}
+!endif
+!ifdef HAVE_PKG_LIBGCRYPT
+  !insertmacro UnselectSection ${SEC_libgcrypt}
+!endif
 
   # Then enable all dependencies in reverse build list order!
 
+!ifdef HAVE_PKG_GNUPG2
+  !insertmacro SectionFlagIsSet ${SEC_gnupg2} ${SF_SELECTED} have_gnupg2 skip_gnupg2
+  have_gnupg2:
+  !insertmacro SelectSection ${SEC_libiconv}
+  !insertmacro SelectSection ${SEC_libgcrypt}
+  !insertmacro SelectSection ${SEC_libksba}
+  !insertmacro SelectSection ${SEC_libassuan}
+  !insertmacro SelectSection ${SEC_libgpg_error}
+  !insertmacro SelectSection ${SEC_w32pth}
+  !insertmacro SelectSection ${SEC_zlib}
+  skip_gnupg2:
+!endif
+
 !ifdef HAVE_PKG_GPGEE
   !insertmacro SectionFlagIsSet ${SEC_gpgee} ${SF_SELECTED} have_gpgee skip_gpgee
   have_gpgee: