X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=configure.ac;h=adb31915b501f082e366c2297169df9189147948;hb=510f49e405e71ba5c97875e7a019364e1ef5fac9;hp=2ad3675b144851de4a331a098dd38b58c62b2a11;hpb=1fa0b5a1ac21ae204f5514203e2fa1d5ea287a67;p=PuTTY.git

diff --git a/configure.ac b/configure.ac
index 2ad3675b..adb31915 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,18 @@ AS_IF([test "x$setidtype" = "xsetgid"],
 AC_SUBST(SETID_CMD)
 AC_SUBST(SETID_MODE)
 
+AC_ARG_ENABLE([git-commit],
+  [AS_HELP_STRING([--disable-git-commit],
+                  [disable embedding current git HEAD in binaries])],
+  [],
+  [if test -d "$srcdir/.git"; then
+    enable_git_commit=yes; else enable_git_commit=no; fi])
+
+if test "x$enable_git_commit" = "xyes" -a ! -d "$srcdir/.git"; then
+  AC_ERROR([Cannot --enable-git-commit when source tree is not a git checkout])
+fi
+AM_CONDITIONAL(AUTO_GIT_COMMIT, [test "x$enable_git_commit" = "xyes"])
+
 AC_ARG_WITH([gssapi],
   [AS_HELP_STRING([--without-gssapi],
                   [disable GSSAPI support])],
@@ -51,8 +63,11 @@ AC_ARG_WITH([gssapi],
 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.])],
-  [])
+  [AC_DEFINE([OSX_GTK], [1], [Define if building with GTK for MacOS.])
+   with_quartz=yes],
+  [with_quartz=no])
+
+AM_CONDITIONAL([HAVE_QUARTZ],[test "x$with_quartz" = "xyes"])
 
 WITH_GSSAPI=
 AS_IF([test "x$with_gssapi" != xno],
@@ -76,26 +91,11 @@ 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])])
-    ;;
-esac
-
 case "$gtk_version_desired:$gtk" in
   3:none | any:none)
     ifdef([AM_PATH_GTK_3_0],[
@@ -104,6 +104,14 @@ case "$gtk_version_desired:$gtk" in
     ;;
 esac
 
+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])])
+    ;;
+esac
+
 case "$gtk_version_desired:$gtk" in
   1:none | any:none)
     ifdef([AM_PATH_GTK],[
@@ -200,12 +208,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!
-
 EOF
 fi