From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Sun, 17 Jul 2011 22:17:30 +0000 (+0000)
Subject: Support for re-running autoconf in the absence of the autoconf macro
X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/76984713a777478b1ec0da26327fb81138c103c1

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.


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

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 <utmp.h>])
 
 # 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