From 8aea84e894921b6ee92f08924d2f5090fe8ece14 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sun, 17 Jul 2011 22:17:30 +0000 Subject: [PATCH] Support for re-running autoconf in the absence of the autoconf macro files which provide auto-detection of GTK 1 and GTK 2. This makes it easier for casual PuTTY developers to rerun autoconf for their own purposes without having to install obscure extra packages. Obviously the resulting configure script will not know how to detect whichever version of GTK they didn't have support for, so it won't be product- quality by my standards, but it should be good enough that they can prepare unrelated patches to send to us. [originally from svn r9227] --- unix/configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/unix/configure.ac b/unix/configure.ac index ce000cd2..4b30fb09 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -32,8 +32,12 @@ AC_CHECK_HEADERS([utmpx.h sys/select.h],,,[ #include ]) # Look for both GTK 1 and GTK 2. +ifdef([AM_PATH_GTK],[ AM_PATH_GTK([1.2.0], [gtk=1], [gtk=none]) +],[AC_WARNING([generating configure script without GTK 1 autodetection])]) +ifdef([AM_PATH_GTK_2_0],[ AM_PATH_GTK_2_0([2.0.0], [gtk=2], []) +],[AC_WARNING([generating configure script without GTK 2 autodetection])]) if test "$gtk" = "none"; then all_targets="all-cli" else