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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2010-01-08 02:57:11 +0100 (Fri, 08 Jan 2010)
New Revision: 1315

Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/inst-gpgme.nsi
Log:
2010-01-08  Marcus Brinkmann  <marcus at g10code.de>

	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Disable Qt support.
	* src/inst-gpgme.nsi: Do not install qt version.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-01-07 18:43:08 UTC (rev 1314)
+++ trunk/ChangeLog	2010-01-08 01:57:11 UTC (rev 1315)
@@ -1,3 +1,8 @@
+2010-01-08  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Disable Qt support.
+	* src/inst-gpgme.nsi: Do not install qt version.
+
 2010-01-07  Werner Koch  <wk at g10code.com>
 
 	* m4/gpg4win.m4: Fix my last change so that --enable-debug is not

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2010-01-07 18:43:08 UTC (rev 1314)
+++ trunk/src/Makefile.am	2010-01-08 01:57:11 UTC (rev 1315)
@@ -209,13 +209,13 @@
 gpg4win_pkg_gpgme_configure = --silent \
   --with-gpg-error-prefix=$(idir) --enable-static \
   `test -n "@HAVE_PKG_GLIB@" && echo "--enable-w32-glib"` \
-  `test -n "@HAVE_PKG_QT@" && echo "--enable-w32-qt"` \
-  LDFLAGS=-L$(idir)/lib \
-  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\"
+  --disable-w32-qt LDFLAGS=-L$(idir)/lib
+#  `test -n "@HAVE_PKG_QT@" && echo "--disable-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/inst-gpgme.nsi
===================================================================
--- trunk/src/inst-gpgme.nsi	2010-01-07 18:43:08 UTC (rev 1314)
+++ trunk/src/inst-gpgme.nsi	2010-01-08 01:57:11 UTC (rev 1315)
@@ -49,16 +49,6 @@
       File /oname=libgpgme-glib-11.dll.tmp "${prefix}/bin/libgpgme-glib-11.dll"
       Rename /REBOOTOK libgpgme-glib-11.dll.tmp libgpgme-glib-11.dll
 
-!ifdef HAVE_PKG_QT
-  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
-
   File "${prefix}/libexec/gpgme-w32spawn.exe"
 
 !endif