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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-10-14 15:21:14 +0200 (Sun, 14 Oct 2007)
New Revision: 562

Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/inst-pinentry.nsi
Log:
2007-10-14  Marcus Brinkmann  <marcus at g10code.de>

	* src/Makefile.am (gpg4win_pkg_pinentry_configure): Enable
	pinentry gtk2 and add required configure flags for it.
	* src/inst-pinentry.nsi: Install pinentry-gtk-2.exe along with
	pinentry-w32.exe and make it the default.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-10-12 16:13:18 UTC (rev 561)
+++ trunk/ChangeLog	2007-10-14 13:21:14 UTC (rev 562)
@@ -1,3 +1,10 @@
+2007-10-14  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/Makefile.am (gpg4win_pkg_pinentry_configure): Enable
+	pinentry gtk2 and add required configure flags for it.
+	* src/inst-pinentry.nsi: Install pinentry-gtk-2.exe along with
+	pinentry-w32.exe and make it the default.
+
 2007-10-12  Werner Koch  <wk at g10code.com>
 
 	* src/inst-kleopatra.nsi: Select by default.  Do not install

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2007-10-12 16:13:18 UTC (rev 561)
+++ trunk/src/Makefile.am	2007-10-14 13:21:14 UTC (rev 562)
@@ -147,10 +147,15 @@
   --without-included-gettext \
   --disable-regex
 
+# We would like to use --with-libiconv-prefix and
+# --with-libintl-prefix, but these don't work with the cheesy
+# non-"libfoo.la" versions of iconv and gettext that we are using.
 gpg4win_pkg_pinentry_configure = \
   --disable-pinentry-gtk \
-  --disable-pinentry-gtk2 \
-  --disable-pinentry-qt
+  --enable-pinentry-gtk2 --with-glib-prefix=$(idir) --with-gtk-prefix=$(idir) \
+  --disable-pinentry-qt \
+  CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib
+#  --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir)
 
 # The LDFLAGS is needed for -lintl for glib.  The QT4 variables work
 # around the lack of cross compilation support in qt-dev.

Modified: trunk/src/inst-pinentry.nsi
===================================================================
--- trunk/src/inst-pinentry.nsi	2007-10-12 16:13:18 UTC (rev 561)
+++ trunk/src/inst-pinentry.nsi	2007-10-14 13:21:14 UTC (rev 562)
@@ -33,8 +33,10 @@
 !ifdef SOURCES
   File "${gpg4win_pkg_pinentry}"
 !else
-  File /oname=pinentry.exe "${prefix}/bin/pinentry-w32.exe"
 
+  File "${prefix}/bin/pinentry-w32.exe"
+  File "${prefix}/bin/pinentry-gtk-2.exe"
+  File /oname=pinentry.exe "${prefix}/bin/pinentry-gtk-2.exe"
 !endif
 SectionEnd