Rename --with-gtk-version to --with-gtk, and support its negation

--without-gtk as a means of manually overriding the makefile into one
building the command-line tools only (as it would if GTK were not
found at all at configure time).

git-svn-id: svn://svn.tartarus.org/sgt/putty@9240 cda61777-01e9-0310-a592-d414129be87e

diff --git a/README b/README
index a215aef..06f0d37 100644 (file)
--- a/README
+++ b/README
@@ -80,9 +80,13 @@ For building on Unix:
    utilities and has no Gtk dependence.
 
  - For the graphical utilities, Gtk+-1.2 and Gtk+-2.0 should both be
-   supported. In the absence of either, the configure script will
+   supported. If you have both installed, you can manually specify
+   which one you want by giving the option '--with-gtk=1' or
+   '--with-gtk=2' to the configure script. (2 is the default, of
+   course.) In the absence of either, the configure script will
    automatically construct a Makefile which builds only the
-   command-line utilities.
+   command-line utilities; you can manually create this condition by
+   giving configure the option '--without-gtk'.
 
  - pterm would like to be setuid or setgid, as appropriate, to permit
    it to write records of user logins to /var/run/utmp and

diff --git a/unix/configure.ac b/unix/configure.ac
index 2115dff..e755812 100644 (file)
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -50,14 +50,17 @@ WITH_GSSAPI=
 AS_IF([test "x$with_gssapi" != xno],
   [AC_DEFINE([WITH_GSSAPI], [1], [Define if building with GSSAPI support.])])
 
-AC_ARG_WITH([gtk-version],
-  [AS_HELP_STRING([--with-gtk-version],
-                  [specify GTK version to use (1 or 2) (optional)])],
+AC_ARG_WITH([gtk],
+  [AS_HELP_STRING([--with-gtk=VER],
+                  [specify GTK version to use (`1' or `2')])
+AS_HELP_STRING([--without-gtk],
+                  [do not use GTK (build command-line tools only)])],
   [gtk_version_desired="$withval"],
   [gtk_version_desired="any"])
 
 case "$gtk_version_desired" in
-  1 | 2 | any) ;;
+  1 | 2 | any | no) ;;
+  yes) gtk_version_desired="any" ;;
   *) AC_ERROR([Invalid GTK version specified])
 esac
 
@@ -119,7 +122,15 @@ AC_CHECK_FUNCS([getaddrinfo ptsname setresuid strsignal updwtmpx])
 
 AC_OUTPUT
 
-if test "$gtk" = "none"; then cat <<EOF
+if test "$gtk_version_desired" = "no"; then cat <<EOF
+
+'configure' was instructed not to build using GTK. Therefore, PuTTY
+itself and the other GUI utilities will not be built by the generated
+Makefile: only the command-line tools such as puttygen, plink and
+psftp will be built.
+
+EOF
+elif test "$gtk" = "none"; then cat <<EOF
 
 'configure' was unable to find either the GTK 1 or GTK 2 libraries on
 your system. Therefore, PuTTY itself and the other GUI utilities will