From 7c1d70b04ac7dd89664ea8f5470d41ab9c4f87d3 Mon Sep 17 00:00:00 2001 From: Leena Gunda Date: Thu, 3 Feb 2005 22:29:35 +0000 Subject: [PATCH] Check for screensaver functionality in libXext.so also when deciding to 2005-02-03 Leena Gunda * configure.in: Check for screensaver functionality in libXext.so also when deciding to build typing-break. Fixes bug #155461. --- ChangeLog | 5 +++++ configure.in | 22 ++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46590f88a..a9f17cb6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-02-03 Leena Gunda + + * configure.in: Check for screensaver functionality in libXext.so + also when deciding to build typing-break. Fixes bug #155461. + 2004-12-27 Sergey V. Udaltsov * schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in: diff --git a/configure.in b/configure.in index 403ec4d8f..0b183e8c8 100644 --- a/configure.in +++ b/configure.in @@ -53,20 +53,18 @@ AC_PATH_XTRA x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" AC_CHECK_FUNC(XScreenSaverQueryInfo, [ - TYPING_BREAK="typing-break"],[ - AC_MSG_CHECKING([for XScreenSaverQueryInfo in -lXss]) - save_LDFLAGS=$LDFLAGS + TYPING_BREAK="typing-break"], [ save_LIBS=$LIBS LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lXss -lXext -lX11" - AC_TRY_LINK([#include -#include ],[ -XScreenSaverQueryInfo(NULL, 0, NULL);],[ - AC_MSG_RESULT(yes) - TYPING_BREAK="typing-break" - SCREENSAVER_LIBS="$X_PRE_LIBS $X_LIBS -lXss -lXext -lX11"],[ - AC_MSG_RESULT(no)]) - LIBS=$save_LIBS - LDFLAGS=$save_LDFLAGS]) + AC_CHECK_LIB(Xss, XScreenSaverQueryInfo, [ + TYPING_BREAK="typing-break" + SCREENSAVER_LIBS="$X_PRE_LIBS $X_LIBS -lXss -lXext -lX11"], [ + LIBS=$save_LIBS + LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lXext -lX11" + AC_CHECK_LIB(Xext, XScreenSaverQueryInfo, [ + TYPING_BREAK="typing-break" + SCREENSAVER_LIBS="$X_PRE_LIBS $X_LIBS -lXext -lX11"],[])]) + LIBS=$save_LIBS]) AC_SUBST(TYPING_BREAK) AC_SUBST(SCREENSAVER_LIBS)