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

[scm-commit at wald.intevation.org]

Author: marcus
Date: 2005-11-17 19:16:24 +0100 (Thu, 17 Nov 2005)
New Revision: 59

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/inst-gpgme.nsi
   trunk/src/uninst-gpgme.nsi
Log:
2005-11-17  Marcus Brinkmann  <marcus at g10code.de>

	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Add
	--enable-w32-glib and LDFLAGS.
	* src/inst-gpgme.nsi: Install libgpgme-glib-11.dll.
	* src/uninst-gpgme.nsi: Uninstall libgpgme-glib-11.dll.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-11-15 11:15:07 UTC (rev 58)
+++ trunk/ChangeLog	2005-11-17 18:16:24 UTC (rev 59)
@@ -1,3 +1,11 @@
+2005-11-17  Marcus Brinkmann  <marcus at g10code.de>
+
+	* configure.ac: Add glib dependency for GPGME.
+	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Add
+	--enable-w32-glib and LDFLAGS.
+	* src/inst-gpgme.nsi: Install libgpgme-glib-11.dll.
+	* src/uninst-gpgme.nsi: Uninstall libgpgme-glib-11.dll.
+
 2005-11-15  Werner Koch  <wk at g10code.com>
 
 	* src/Makefile.am (EXTRA_DIST): Add g4wihelp.nsi.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-11-15 11:15:07 UTC (rev 58)
+++ trunk/configure.ac	2005-11-17 18:16:24 UTC (rev 59)
@@ -97,7 +97,7 @@
 
 
 GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
-GPG4WIN_SPKG([gpgme], [libgpg-error gnupg])
+GPG4WIN_SPKG([gpgme], [libgpg-error gnupg glib])
 GPG4WIN_SPKG([gnupg])
 GPG4WIN_SPKG([gpgol], [gpgme])
 GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2005-11-15 11:15:07 UTC (rev 58)
+++ trunk/src/Makefile.am	2005-11-17 18:16:24 UTC (rev 59)
@@ -40,8 +40,10 @@
 gpg4win_pkg_libgpg_error_configure = \
   CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib
 
+# Glib doesn't add the LDFLAGS automatically.
 gpg4win_pkg_gpgme_configure = \
-  --with-gpg-error-prefix=$(idir) --without-gpgsm --enable-static
+  --with-gpg-error-prefix=$(idir) --without-gpgsm --enable-static \
+  --enable-w32-glib LDFLAGS=-L$(idir)/lib
 
 gpg4win_pkg_gpa_configure = \
   --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \

Modified: trunk/src/inst-gpgme.nsi
===================================================================
--- trunk/src/inst-gpgme.nsi	2005-11-15 11:15:07 UTC (rev 58)
+++ trunk/src/inst-gpgme.nsi	2005-11-17 18:16:24 UTC (rev 59)
@@ -33,5 +33,6 @@
   File "${gpg4win_pkg_gpgme}"
 !else
   File ${prefix}/bin/libgpgme-11.dll
+  File ${prefix}/bin/libgpgme-glib-11.dll
 !endif
 SectionEnd

Modified: trunk/src/uninst-gpgme.nsi
===================================================================
--- trunk/src/uninst-gpgme.nsi	2005-11-15 11:15:07 UTC (rev 58)
+++ trunk/src/uninst-gpgme.nsi	2005-11-17 18:16:24 UTC (rev 59)
@@ -31,6 +31,7 @@
   Call un.SourceDelete
 !else
   Delete "$INSTDIR\libgpgme-11.dll"
+  Delete "$INSTDIR\libgpgme-glib-11.dll"
   RMDir "$INSTDIR"
 !endif
 SectionEnd