]> asedeno.scripts.mit.edu Git - PuTTY.git/commitdiff
Support for re-running autoconf in the absence of the autoconf macro
authorSimon Tatham <anakin@pobox.com>
Sun, 17 Jul 2011 22:17:30 +0000 (22:17 +0000)
committerSimon Tatham <anakin@pobox.com>
Sun, 17 Jul 2011 22:17:30 +0000 (22:17 +0000)
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

index ce000cd2c24f446ba50daa6099045882940762ff..4b30fb09ead1b13e0035a6800fcdc0297ce15415 100644 (file)
@@ -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