X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=configure.ac;h=82fae26c40d02b6fa644d29c69bc382ac73ae690;hb=9dd9860cc84f82309de64c33e2813c6e9dc60749;hp=b6e431646dbaf398605c38d1f76afb995814b0dd;hpb=54a52b5ebad0eaa04c7b402539cd51d119c84738;p=PuTTY.git

diff --git a/configure.ac b/configure.ac
index b6e43164..82fae26c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,12 @@ AC_ARG_WITH([gssapi],
   [],
   [with_gssapi=yes])
 
+AC_ARG_WITH([quartz],
+  [AS_HELP_STRING([--with-quartz],
+                  [build for the MacOS Quartz GTK back end])],
+  [AC_DEFINE([OSX_GTK], [1], [Define if building with GTK for MacOS.])],
+  [])
+
 WITH_GSSAPI=
 AS_IF([test "x$with_gssapi" != xno],
   [AC_DEFINE([WITH_GSSAPI], [1], [Define if building with GSSAPI support.])])
@@ -70,34 +76,24 @@ AC_CHECK_HEADERS([utmpx.h sys/select.h],,,[
 #include <sys/types.h>
 #include <utmp.h>])
 
-# Look for GTK 2, GTK 3 and GTK 1, in descending order of preference.
-#
-# (I like GTK 2 for its faster support for X server-side fonts due to
-# not being required to do all its drawing via Cairo; GTK 3 is
-# tolerable if GTK 2 can't be had, and GTK 1 is an extreme fallback
-# for platforms - of which I've heard of at least one - to which
-# nothing newer has ever been ported.)
-#
+# Look for GTK 3, GTK 2 and GTK 1, in descending order of preference.
 # If we can't find any, have the makefile only build the CLI programs.
 
 gtk=none
 
 case "$gtk_version_desired:$gtk" in
-  2:none | any:none)
-    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])])
+  3:none | any:none)
+    ifdef([AM_PATH_GTK_3_0],[
+    AM_PATH_GTK_3_0([3.0.0], [gtk=3], [])
+    ],[AC_WARNING([generating configure script without GTK 3 autodetection])])
     ;;
 esac
 
 case "$gtk_version_desired:$gtk" in
-  3:none | any:none)
-    ifdef([AM_PATH_GTK_3_0],[
-    AM_PATH_GTK_3_0([3.0.0], [
-    gtk=3
-    GTK_CFLAGS="$GTK_CFLAGS -Wno-deprecated-declarations"
-    ], [])
-    ],[AC_WARNING([generating configure script without GTK 3 autodetection])])
+  2:none | any:none)
+    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])])
     ;;
 esac
 
@@ -197,13 +193,6 @@ your system. 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" = "3"; then cat <<EOF
-
-PuTTY will be built with GTK 3. Be aware that the GTK 3 support in
-this codebase is UNFINISHED AND EXPERIMENTAL! Many deprecated
-functions are used, and there are known layout bugs.
-
 EOF
 fi