projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug in the new CLOCK_MONOTONIC implementation. I was treating the
[u/mdw/putty]
/
unix
/
configure.ac
diff --git
a/unix/configure.ac
b/unix/configure.ac
index
e755812
..
930f3e3
100644
(file)
--- a/
unix/configure.ac
+++ b/
unix/configure.ac
@@
-68,27
+68,27
@@
AC_CHECK_HEADERS([utmpx.h sys/select.h],,,[
#include <sys/types.h>
#include <utmp.h>])
#include <sys/types.h>
#include <utmp.h>])
-# Look for both GTK
1 and GTK 2. If we can't find either, have the
-# makefile only build the CLI programs.
+# 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.
gtk=none
gtk=none
-case "$gtk_version_desired" in
- 1 | any)
- ifdef([AM_PATH_GTK],[
- AM_PATH_GTK([1.2.0], [gtk=1], [])
- ],[AC_WARNING([generating configure script without GTK 1 autodetection])])
- ;;
-esac
-
-case "$gtk_version_desired" in
- 2 | any)
+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
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],[
+ AM_PATH_GTK([1.2.0], [gtk=1], [])
+ ],[AC_WARNING([generating configure script without GTK 1 autodetection])])
+ ;;
+esac
+
AM_CONDITIONAL(HAVE_GTK, [test "$gtk" != "none"])
if test "$gtk" = "2"; then
AM_CONDITIONAL(HAVE_GTK, [test "$gtk" != "none"])
if test "$gtk" = "2"; then
@@
-119,6
+119,8
@@
AC_CHECK_LIB(X11, XOpenDisplay,
AC_DEFINE([HAVE_LIBX11],[],[Define if libX11.a is available])])
AC_CHECK_FUNCS([getaddrinfo ptsname setresuid strsignal updwtmpx])
AC_DEFINE([HAVE_LIBX11],[],[Define if libX11.a is available])])
AC_CHECK_FUNCS([getaddrinfo ptsname setresuid strsignal updwtmpx])
+AC_CHECK_DECLS([CLOCK_MONOTONIC], [], [], [[#include <time.h>]])
+AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME],[],[Define if clock_gettime() is available])])
AC_OUTPUT
AC_OUTPUT