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

Fallback for manual setup of GTK 1, if autoconf is run on a system

Browse Source 
where the GTK1 detection function AM_PATH_GTK hasn't been provided by
/usr/share/aclocal/gtk.m4 or equivalent.

(Systems without gtk.m4 are becoming more common, but on the other
hand I know at least one person is still using GTK 1 PuTTY since the
0.62 release.)

[originally from svn r9868]
This commit is contained in:
Simon Tatham 2013-06-15 19:58:10 +00:00
parent a7611316c5
commit c5876a8ba2
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
unix/configure.ac
View File

@ -85,7 +85,15 @@ case "$gtk_version_desired:$gtk" in
1:none | any:none) 1:none | any:none)
ifdef([AM_PATH_GTK],[ ifdef([AM_PATH_GTK],[
AM_PATH_GTK([1.2.0], [gtk=1], []) AM_PATH_GTK([1.2.0], [gtk=1], [])
],[AC_WARNING([generating configure script without GTK 1 autodetection])]) ],[
# manual check for gtk1
AC_PATH_PROG(GTK1_CONFIG, gtk-config, absent)
if test "$GTK1_CONFIG" != "absent"; then
GTK_CFLAGS=`"$GTK1_CONFIG" --cflags`
GTK_LIBS=`"$GTK1_CONFIG" --libs`
gtk=1
fi
])
;; ;;
esac esac