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

[scm-commit at wald.intevation.org]

Author: werner
Date: 2005-11-18 17:26:24 +0100 (Fri, 18 Nov 2005)
New Revision: 61

Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/inst-sections.nsi
   trunk/src/inst-sylpheed-claws.nsi
Log:
Minor fixes

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-11-17 18:52:17 UTC (rev 60)
+++ trunk/ChangeLog	2005-11-18 16:26:24 UTC (rev 61)
@@ -1,3 +1,7 @@
+2005-11-18  Werner Koch  <wk at g10code.com>
+
+	* src/inst-sections.nsi: Add more dependencies to sylpheed.
+
 2005-11-17  Marcus Brinkmann  <marcus at g10code.de>
 
 	* configure.ac: Add glib dependency for GPGME.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2005-11-17 18:52:17 UTC (rev 60)
+++ trunk/src/Makefile.am	2005-11-18 16:26:24 UTC (rev 61)
@@ -58,7 +58,7 @@
 gpg4win_pkg_sylpheed_claws_configure = \
   --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
   --with-gpg-error-prefix=$(idir) --with-gpgme-prefix=$(idir) \
-  --with-config-dir="Sylpheed-claws" \
+  --with-config-dir="Sylpheed-claws" --disable-pthread \
   --disable-libetpan --disable-aspell --disable-trayicon-plugin \
   --disable-openssl --disable-dillo-viewer-plugin --disable-gnomeprint \
   --disable-jpilot --disable-startup-notification --disable-ipv6 \
@@ -71,7 +71,7 @@
 # Extra options for the make infocations for individual packages.
 # make_flags is used fur building make_args_inst is used for installing.
 gpg4win_pkg_pthreads_w32_make_args = \
-  prefix=$(idir) CROSS=$(host_alias)- clean GC
+  prefix=$(idir) CROSS=$(host_alias)- clean GC-inlined
 
 gpg4win_pkg_pthreads_w32_make_args_inst = \
   prefix=$$$${pkgidir} CROSS=$(host_alias)- 

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2005-11-17 18:52:17 UTC (rev 60)
+++ trunk/src/inst-sections.nsi	2005-11-18 16:26:24 UTC (rev 61)
@@ -253,7 +253,9 @@
   !insertmacro SelectSection ${SEC_glib}
   !insertmacro SelectSection ${SEC_gpgme}
   !insertmacro SelectSection ${SEC_gnupg}
-  # fixme: Need more.
+  !insertmacro SelectSection ${SEC_pthreads_w32}
+  !insertmacro SelectSection ${SEC_crypt}
+  !insertmacro SelectSection ${SEC_regex}
   skip_sylpheed:
 !endif
 

Modified: trunk/src/inst-sylpheed-claws.nsi
===================================================================
--- trunk/src/inst-sylpheed-claws.nsi	2005-11-17 18:52:17 UTC (rev 60)
+++ trunk/src/inst-sylpheed-claws.nsi	2005-11-18 16:26:24 UTC (rev 61)
@@ -30,7 +30,6 @@
   File "${gpg4win_pkg_sylpheed_claws}"
 !else
   File ${prefix}/bin/sylpheed-claws.exe
-  File ${prefix}/bin/pthreadGC2.dll
 
   SetOutPath "$INSTDIR\share\sylpheed-claws"
 !endif