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

[scm-commit@wald.intevation.org]

Author: werner
Date: 2007-10-17 11:08:50 +0200 (Wed, 17 Oct 2007)
New Revision: 569

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/inst-pinentry.nsi
Log:
Disable gtk-2 pinentry for now.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-10-16 22:49:13 UTC (rev 568)
+++ trunk/ChangeLog	2007-10-17 09:08:50 UTC (rev 569)
@@ -1,3 +1,9 @@
+2007-10-17  Werner Koch  <wk at 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 at g10code.de>
 
 	* configure.ac: Reenable oxygen-icons dependency.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-10-16 22:49:13 UTC (rev 568)
+++ trunk/configure.ac	2007-10-17 09:08:50 UTC (rev 569)
@@ -197,7 +197,7 @@
 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])

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2007-10-16 22:49:13 UTC (rev 568)
+++ trunk/src/Makefile.am	2007-10-17 09:08:50 UTC (rev 569)
@@ -153,7 +153,7 @@
 # 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)

Modified: trunk/src/inst-pinentry.nsi
===================================================================
--- trunk/src/inst-pinentry.nsi	2007-10-16 22:49:13 UTC (rev 568)
+++ trunk/src/inst-pinentry.nsi	2007-10-17 09:08:50 UTC (rev 569)
@@ -35,8 +35,8 @@
 !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