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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-09-07 22:52:16 +0200 (Fri, 07 Sep 2007)
New Revision: 519

Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/gpg4win.mk.in
   trunk/src/inst-gpgme.nsi
   trunk/src/uninst-gpgme.nsi
Log:
2007-09-07  Marcus Brinkmann  <marcus at g10code.de>

	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Remove LDFLAGS,
	add --enable-w32-qt and work around Qt's lack of cross compilation
	support.
	* src/gpg4win.mk.in (stamps/stamp-$(1)-02-configure): Call
	configure through eval, so that configure options with spaces are
	quoted properly.
	* src/inst-gpgme.nsi [!GPG4WIN_LIGHT]: Install libgpgme-qt-11.dll.
	* src/uninst-gpgme.nsi: Uninstall libgpgme-qt-11.dll.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-09-07 09:46:01 UTC (rev 518)
+++ trunk/ChangeLog	2007-09-07 20:52:16 UTC (rev 519)
@@ -1,3 +1,14 @@
+2007-09-07  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Remove LDFLAGS,
+	add --enable-w32-qt and work around Qt's lack of cross compilation
+	support.
+	* src/gpg4win.mk.in (stamps/stamp-$(1)-02-configure): Call
+	configure through eval, so that configure options with spaces are
+	quoted properly.
+	* src/inst-gpgme.nsi [!GPG4WIN_LIGHT]: Install libgpgme-qt-11.dll.
+	* src/uninst-gpgme.nsi: Uninstall libgpgme-qt-11.dll.
+	
 2007-08-30  Marcus Brinkmann  <marcus at g10code.de>
 
 	* configure.ac: Add gpgex.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2007-09-07 09:46:01 UTC (rev 518)
+++ trunk/src/Makefile.am	2007-09-07 20:52:16 UTC (rev 519)
@@ -149,10 +149,17 @@
   --disable-pinentry-gtk2 \
   --disable-pinentry-qt 
 
-# Glib doesn't add the LDFLAGS automatically.
+# The LDFLAGS is needed for -lintl for glib.  The QT4 variables work
+# around the lack of cross compilation support in qt-dev.
 gpg4win_pkg_gpgme_configure = --silent \
   --with-gpg-error-prefix=$(idir) --enable-static \
-  --enable-w32-glib LDFLAGS=-L$(idir)/lib
+  --enable-w32-glib LDFLAGS=-L$(idir)/lib \
+  --enable-w32-qt \
+  QT4_CORE_CFLAGS=\"-DQT_LARGEFILE_SUPPORT -DQT_DLL \
+                   -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_THREAD_SUPPORT \
+                   -I$(idir)/include/QtCore -I$(idir)/include \
+		   -I$(idir)/mkspecs/win32-g++\" \
+  QT4_CORE_LIBS=\"-L$(idir)/lib -lQtCore4\"
 
 gpg4win_pkg_gpa_configure = --silent \
   --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \

Modified: trunk/src/gpg4win.mk.in
===================================================================
--- trunk/src/gpg4win.mk.in	2007-09-07 09:46:01 UTC (rev 518)
+++ trunk/src/gpg4win.mk.in	2007-09-07 20:52:16 UTC (rev 519)
@@ -125,7 +125,7 @@
 	($(call SETVARS,$(1));				\
 	 mkdir "$$$${pkgbdir}";				\
 	  cd "$$$${pkgbdir}";				\
-	 "$$$${pkgsdir}/configure"			\
+	 eval "$$$${pkgsdir}/configure"			\
 		--prefix="$$$${pkgidir}"		\
 		--host=$(host_cpu)-$(host_os)		\
 		--build=$(build_cpu)-$(build_os)	\

Modified: trunk/src/inst-gpgme.nsi
===================================================================
--- trunk/src/inst-gpgme.nsi	2007-09-07 09:46:01 UTC (rev 518)
+++ trunk/src/inst-gpgme.nsi	2007-09-07 20:52:16 UTC (rev 519)
@@ -1,5 +1,5 @@
 # inst-gpgme.nsi - Installer snippet for gpgme.     -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
+# Copyright (C) 2005, 2007 g10 Code GmbH
 # 
 # This file is part of GPG4Win.
 # 
@@ -48,5 +48,15 @@
       File /oname=libgpgme-glib-11.dll.tmp "${prefix}/bin/libgpgme-glib-11.dll"
       Rename /REBOOTOK libgpgme-glib-11.dll.tmp libgpgme-glib-11.dll
 
+!ifndef GPG4WIN_LIGHT
+  ClearErrors
+  SetOverwrite try
+  File "${prefix}/bin/libgpgme-qt-11.dll"
+  SetOverwrite lastused
+  ifErrors 0 +3
+      File /oname=libgpgme-qt-11.dll.tmp "${prefix}/bin/libgpgme-qt-11.dll"
+      Rename /REBOOTOK libgpgme-qt-11.dll.tmp libgpgme-qt-11.dll
 !endif
+
+!endif
 SectionEnd

Modified: trunk/src/uninst-gpgme.nsi
===================================================================
--- trunk/src/uninst-gpgme.nsi	2007-09-07 09:46:01 UTC (rev 518)
+++ trunk/src/uninst-gpgme.nsi	2007-09-07 20:52:16 UTC (rev 519)
@@ -1,5 +1,5 @@
 # uninst-gpgme.nsi - Installer snippet for gpgme.   -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
+# Copyright (C) 2005, 2007 g10 Code GmbH
 # 
 # This file is part of GPG4Win.
 # 
@@ -32,6 +32,7 @@
 !else
   Delete "$INSTDIR\libgpgme-11.dll"
   Delete "$INSTDIR\libgpgme-glib-11.dll"
+  Delete "$INSTDIR\libgpgme-qt-11.dll"
   RMDir "$INSTDIR"
 !endif
 SectionEnd