2008-07-25 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Fri, 25 Jul 2008 13:21:02 +0000 (13:21 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Fri, 25 Jul 2008 13:21:02 +0000 (13:21 +0000)
* configure.ac: Prefer pinentry gtk2 over gtk.  Now also choose
qt4 (after qt and before w32 native).
* README: Document Qt.

ChangeLog
README
configure.ac

index 3699d7d..7916f04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-25  Marcus Brinkmann  <marcus@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@g10code.de>
 
        * qt4/pinentrydialog.h, qt4/pinentrydialog.cpp, qt4/main.cpp,
diff --git a/README b/README
index bf100b8..087208a 100644 (file)
--- a/README
+++ b/README
@@ -16,6 +16,7 @@ GTK+ V1.2     --enable-pinentry-gtk    Gimp Toolkit Library Version 1.2
 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
index c2b270c..9ad8691 100644 (file)
@@ -414,25 +414,30 @@ test $have_w32_system = yes && pinentry_w32=yes
 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