2007-10-14 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Sun, 14 Oct 2007 13:21:14 +0000 (13:21 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Sun, 14 Oct 2007 13:21:14 +0000 (13:21 +0000)
* 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.

ChangeLog
src/Makefile.am
src/inst-pinentry.nsi

index 5c67eb7..98ab778 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-14  Marcus Brinkmann  <marcus@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@g10code.com>
 
        * src/inst-kleopatra.nsi: Select by default.  Do not install
index 8d6ac88..4e2002a 100644 (file)
@@ -147,10 +147,15 @@ gpg4win_pkg_gnupg2_configure = \
   --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.
index 0c10804..6e776f1 100644 (file)
@@ -33,8 +33,10 @@ Section "-Pinentry" SEC_pinentry
 !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