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

[marcus at wald.intevation.org]

Author: marcus
Date: 2005-10-21 14:50:29 +0200 (Fri, 21 Oct 2005)
New Revision: 32

Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
Log:
2005-10-21  Marcus Brinkmann  <marcus at g10code.de>

	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Enable static
	library for gpgol.
	(gpg4win_pkg_gpgol_configure): Add gpg-error prefix.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-10-21 11:15:56 UTC (rev 31)
+++ trunk/ChangeLog	2005-10-21 12:50:29 UTC (rev 32)
@@ -1,5 +1,9 @@
 2005-10-21  Marcus Brinkmann  <marcus at g10code.de>
 
+	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Enable static
+	library for gpgol.
+	(gpg4win_pkg_gpgol_configure): Add gpg-error prefix.
+
 	* src/inst-gnupg.nsi: Fix path of deleted files.
 
 	* src/gpg4win.mk.in (pdir): Don't strip DLL files.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2005-10-21 11:15:56 UTC (rev 31)
+++ trunk/src/Makefile.am	2005-10-21 12:50:29 UTC (rev 32)
@@ -26,16 +26,15 @@
 # Extra options to configure for individual packages.
 # We can use $(idir) here for the installation prefix.
 gpg4win_pkg_gpgme_configure = \
-  --with-gpg-error-prefix=$(idir) --without-gpgsm
+  --with-gpg-error-prefix=$(idir) --without-gpgsm --enable-static
 
 gpg4win_pkg_gpa_configure = \
   --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \
   --with-gpgme-prefix=$(idir) --with-zlib=$(idir)
 
 gpg4win_pkg_gpgol_configure = \
-  --with-gpgme-prefix=$(idir)
+  --with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)
 
-
 # Supported binary packages.
 gpg4win_bpkgs :=  libiconv gettext pkgconfig zlib glib libpng pango atk gtk+