X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=configure.ac;h=82fae26c40d02b6fa644d29c69bc382ac73ae690;hb=2eb952ca31aa13d1f6f429305fbb6f43a9a28c56;hp=5818e032a1846fd3139d91f52e17cda0f24410d4;hpb=c8f83979a368d10e8def1796cdadd7f8f3bebf74;p=PuTTY.git diff --git a/configure.ac b/configure.ac index 5818e032..82fae26c 100644 --- a/configure.ac +++ b/configure.ac @@ -48,20 +48,26 @@ 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.])]) AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk=VER], - [specify GTK version to use (`1' or `2')]) + [specify GTK version to use (`1', `2' or `3')]) AS_HELP_STRING([--without-gtk], [do not use GTK (build command-line tools only)])], [gtk_version_desired="$withval"], [gtk_version_desired="any"]) case "$gtk_version_desired" in - 1 | 2 | any | no) ;; + 1 | 2 | 3 | any | no) ;; yes) gtk_version_desired="any" ;; *) AC_ERROR([Invalid GTK version specified]) esac @@ -70,11 +76,19 @@ AC_CHECK_HEADERS([utmpx.h sys/select.h],,,[ #include #include ]) -# Look for both GTK 2 and GTK 1, in descending order of preference. If -# we can't find either, have the makefile only build the CLI programs. +# 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 + 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 2:none | any:none) ifdef([AM_PATH_GTK_2_0],[ @@ -101,7 +115,7 @@ esac AM_CONDITIONAL(HAVE_GTK, [test "$gtk" != "none"]) -if test "$gtk" = "2"; then +if test "$gtk" = "2" -o "$gtk" = "3"; then ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" @@ -174,7 +188,7 @@ psftp will be built. EOF elif test "$gtk" = "none"; then cat <