Disable gtk-2 pinentry for now.
authorWerner Koch <wk@gnupg.org>
Wed, 17 Oct 2007 09:08:50 +0000 (09:08 +0000)
committerWerner Koch <wk@gnupg.org>
Wed, 17 Oct 2007 09:08:50 +0000 (09:08 +0000)
ChangeLog
configure.ac
src/Makefile.am
src/inst-pinentry.nsi

index 14c23b7..d1eb6d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-17  Werner Koch  <wk@g10code.com>
+
+       * src/inst-pinentry.nsi: Install native pinentry.
+       * src/Makefile.am: Disable pinnetry-gtk-2 for now.
+       * configure.ac: Make pinentry depend on glib.
+
 2007-10-17  Marcus Brinkmann  <marcus@g10code.de>
 
        * configure.ac: Reenable oxygen-icons dependency.
index 8c8f996..4f0f1fb 100644 (file)
@@ -197,7 +197,7 @@ GPG4WIN_SPKG([gnupg], [libiconv bzip2])
 GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
                         w32pth zlib bzip2])
 GPG4WIN_SPKG([pthreads-w32])
-GPG4WIN_SPKG([pinentry])
+GPG4WIN_SPKG([pinentry], [glib])
 GPG4WIN_SPKG([gpgol], [gpgme libassuan])
 GPG4WIN_SPKG([gpgex], [libassuan])
 GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
index d87149a..0d617f3 100644 (file)
@@ -153,7 +153,7 @@ gpg4win_pkg_gnupg2_configure = \
 # non-"libfoo.la" versions of iconv and gettext that we are using.
 gpg4win_pkg_pinentry_configure = \
   --disable-pinentry-gtk \
-  --enable-pinentry-gtk2 --with-glib-prefix=$(idir) --with-gtk-prefix=$(idir) \
+  --disable-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)
index 6e776f1..fb8ef21 100644 (file)
@@ -35,8 +35,8 @@ Section "-Pinentry" SEC_pinentry
 !else
 
   File "${prefix}/bin/pinentry-w32.exe"
-  File "${prefix}/bin/pinentry-gtk-2.exe"
-  File /oname=pinentry.exe "${prefix}/bin/pinentry-gtk-2.exe"
+#  File "${prefix}/bin/pinentry-gtk-2.exe"
+  File /oname=pinentry.exe "${prefix}/bin/pinentry-w32.exe"
 !endif
 SectionEnd