summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2009-07-14 08:29:37 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2009-07-14 08:29:37 (GMT)
commitf7ff199b1bfa9fa2e7d3212e72d39d3ddb4f367a (patch)
tree9270307069eed7a16e87f4718f845f749c02cf8c /unix
parent3daccd1085ac968f179ea7cd8e24707a89bb7466 (diff)
downloadtk-f7ff199b1bfa9fa2e7d3212e72d39d3ddb4f367a.zip
tk-f7ff199b1bfa9fa2e7d3212e72d39d3ddb4f367a.tar.gz
tk-f7ff199b1bfa9fa2e7d3212e72d39d3ddb4f367a.tar.bz2
Allow turning off of XScreenSaver use. [Bug 2496018]
Diffstat (limited to 'unix')
-rw-r--r--unix/configure.in50
1 files changed, 30 insertions, 20 deletions
diff --git a/unix/configure.in b/unix/configure.in
index 8106659..77c48b1 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to
dnl generate the file "configure", which is run during Tk installation
dnl to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.153.2.9 2009/04/10 18:13:06 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.153.2.10 2009/07/14 08:29:37 dkf Exp $
AC_INIT([tk],[8.5])
AC_PREREQ(2.59)
@@ -470,28 +470,38 @@ if test $tk_aqua = no; then
tk_oldLibs=$LIBS
LIBS="$tk_oldLibs $XLIBSW"
xss_header_found=no
- AC_CHECK_HEADER(X11/extensions/scrnsaver.h, [
- xss_header_found=yes
- ],,[#include <X11/Xlib.h>])
xss_lib_found=no
- AC_CHECK_FUNC(XScreenSaverQueryInfo,,[
- AC_CHECK_LIB(Xext, XScreenSaverQueryInfo, [
- XLIBSW="$XLIBSW -lXext"
- xss_lib_found=yes
- ], [
- AC_CHECK_LIB(Xss,XScreenSaverQueryInfo, [
- if test "$tcl_cv_ld_weak_l" = yes; then
- # On Darwin, weak link libXss if possible,
- # as it is only available on Tiger or later.
- XLIBSW="$XLIBSW -Wl,-weak-lXss -lXext"
- else
- XLIBSW="$XLIBSW -lXss -lXext"
- fi
+ AC_MSG_CHECKING([whether to try to use XScreenSaver])
+ AC_ARG_ENABLE(xss,
+ AC_HELP_STRING([--enable-xss],
+ [use XScreenSaver for activity timer (default: on)]),
+ [enable_xss=$enableval], [enable_xss=yes])
+ if test "$enable_xss" = "no" ; then
+ AC_MSG_RESULT([$enable_xss])
+ else
+ AC_MSG_RESULT([$enable_xss])
+ AC_CHECK_HEADER(X11/extensions/scrnsaver.h, [
+ xss_header_found=yes
+ ],,[#include <X11/Xlib.h>])
+ AC_CHECK_FUNC(XScreenSaverQueryInfo,,[
+ AC_CHECK_LIB(Xext, XScreenSaverQueryInfo, [
+ XLIBSW="$XLIBSW -lXext"
xss_lib_found=yes
- ],, -lXext)
+ ], [
+ AC_CHECK_LIB(Xss, XScreenSaverQueryInfo, [
+ if test "$tcl_cv_ld_weak_l" = yes; then
+ # On Darwin, weak link libXss if possible,
+ # as it is only available on Tiger or later.
+ XLIBSW="$XLIBSW -Wl,-weak-lXss -lXext"
+ else
+ XLIBSW="$XLIBSW -lXss -lXext"
+ fi
+ xss_lib_found=yes
+ ],, -lXext)
+ ])
])
- ])
- if test $xss_lib_found = yes -a $xss_header_found = yes; then
+ fi
+ if test $enable_xss = yes -a $xss_lib_found = yes -a $xss_header_found = yes; then
AC_DEFINE(HAVE_XSS, 1, [Is XScreenSaver available?])
fi
CFLAGS=$tk_oldCFlags