[svn] pinentry - r186 - trunk

[svn author marcus]

Author: marcus
Date: 2008-07-25 15:21:02 +0200 (Fri, 25 Jul 2008)
New Revision: 186

Modified:
   trunk/ChangeLog
   trunk/README
   trunk/configure.ac
Log:
2008-07-25  Marcus Brinkmann  <marcus at g10code.de>

	* configure.ac: Prefer pinentry gtk2 over gtk.  Now also choose
	qt4 (after qt and before w32 native).
	* README: Document Qt.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-07-24 14:49:21 UTC (rev 185)
+++ trunk/ChangeLog	2008-07-25 13:21:02 UTC (rev 186)
@@ -1,3 +1,9 @@
+2008-07-25  Marcus Brinkmann  <marcus at g10code.de>
+
+	* configure.ac: Prefer pinentry gtk2 over gtk.  Now also choose
+	qt4 (after qt and before w32 native).
+	* README: Document Qt.
+
 2008-07-24  Marcus Brinkmann  <marcus at g10code.de>
 
 	* qt4/pinentrydialog.h, qt4/pinentrydialog.cpp, qt4/main.cpp,

Modified: trunk/README
===================================================================
--- trunk/README	2008-07-24 14:49:21 UTC (rev 185)
+++ trunk/README	2008-07-25 13:21:02 UTC (rev 186)
@@ -16,6 +16,7 @@
 GTK+ V2.0	--enable-pinentry-gtk2	 Gimp Toolkit Library, Version 2.0
 					 eg. libgtk-x11-2.0 and libglib-2.0
 Qt		--enable-pinentry-qt	 Qt, eg. libqt or libqt-mt
+Qt4		--enable-pinentry-qt4	 Qt4
 
 The GTK+ and Qt pinentries can fall back to the curses mode.  The
 option to enable this is --enable-fallback-curses, but this is also

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-07-24 14:49:21 UTC (rev 185)
+++ trunk/configure.ac	2008-07-25 13:21:02 UTC (rev 186)
@@ -414,25 +414,30 @@
 AM_CONDITIONAL(BUILD_PINENTRY_W32, test "$pinentry_w32" = "yes")
 
 
-#
-# Figure out the default pinentry
-#
-if test "$pinentry_gtk" = "yes"; then
-   PINENTRY_DEFAULT=pinentry-gtk
+# Figure out the default pinentry.  We are very conservative here.
+# Please change the order only after verifying that the preferred
+# pinentry really is better (more feature-complete and more secure).
+
+if test "$pinentry_gtk_2" = "yes"; then
+   PINENTRY_DEFAULT=pinentry-gtk-2
 else
-  if test "$pinentry_gtk_2" = "yes"; then
-    PINENTRY_DEFAULT=pinentry-gtk-2
+  if test "$pinentry_gtk" = "yes"; then
+    PINENTRY_DEFAULT=pinentry-gtk
   else
     if test "$pinentry_qt" = "yes"; then
       PINENTRY_DEFAULT=pinentry-qt
     else
-      if test "$pinentry_curses" = "yes"; then
-        PINENTRY_DEFAULT=pinentry-curses
+      if test "$pinentry_qt4" = "yes"; then
+        PINENTRY_DEFAULT=pinentry-qt4
       else
-        if test "$pinentry_w32" = "yes"; then
-          PINENTRY_DEFAULT=pinentry-w32
+        if test "$pinentry_curses" = "yes"; then
+          PINENTRY_DEFAULT=pinentry-curses
         else
-          AC_MSG_ERROR([[No pinentry enabled.]])
+          if test "$pinentry_w32" = "yes"; then
+            PINENTRY_DEFAULT=pinentry-w32
+          else
+            AC_MSG_ERROR([[No pinentry enabled.]])
+          fi
         fi
       fi
     fi