nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 01:02:24 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
--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).

[originally from svn r9240]
This commit is contained in:
Simon Tatham 2011-07-23 11:36:25 +00:00
parent 64150a5ef2
commit 7af708a603
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README
View File

@ -80,9 +80,13 @@ For building on Unix:
utilities and has no Gtk dependence. utilities and has no Gtk dependence.
- For the graphical utilities, Gtk+-1.2 and Gtk+-2.0 should both be - 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 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 - pterm would like to be setuid or setgid, as appropriate, to permit
it to write records of user logins to /var/run/utmp and it to write records of user logins to /var/run/utmp and

21
unix/configure.ac
View File

@ -50,14 +50,17 @@ WITH_GSSAPI=
AS_IF([test "x$with_gssapi" != xno], AS_IF([test "x$with_gssapi" != xno],
[AC_DEFINE([WITH_GSSAPI], [1], [Define if building with GSSAPI support.])]) [AC_DEFINE([WITH_GSSAPI], [1], [Define if building with GSSAPI support.])])
AC_ARG_WITH([gtk-version], AC_ARG_WITH([gtk],
[AS_HELP_STRING([--with-gtk-version], [AS_HELP_STRING([--with-gtk=VER],
[specify GTK version to use (1 or 2) (optional)])], [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="$withval"],
[gtk_version_desired="any"]) [gtk_version_desired="any"])
case "$gtk_version_desired" in case "$gtk_version_desired" in
1 | 2 | any) ;; 1 | 2 | any | no) ;;
yes) gtk_version_desired="any" ;;
*) AC_ERROR([Invalid GTK version specified]) *) AC_ERROR([Invalid GTK version specified])
esac esac
@ -119,7 +122,15 @@ AC_CHECK_FUNCS([getaddrinfo ptsname setresuid strsignal updwtmpx])
AC_OUTPUT 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 '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 your system. Therefore, PuTTY itself and the other GUI utilities will