Check for screensaver functionality in libXext.so also when deciding to

2005-02-03  Leena Gunda  <leena.gunda@wipro.com>

	* configure.in: Check for screensaver functionality in libXext.so
	also when deciding to build typing-break. Fixes bug #155461.
This commit is contained in:
Leena Gunda 2005-02-03 22:29:35 +00:00 committed by Richard Hult
parent 66cf181493
commit 7c1d70b04a
2 changed files with 15 additions and 12 deletions

View file

@ -1,3 +1,8 @@
2005-02-03 Leena Gunda <leena.gunda@wipro.com>
* 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 <svu@gnome.org> 2004-12-27 Sergey V. Udaltsov <svu@gnome.org>
* schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in: * schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in:

View file

@ -54,19 +54,17 @@ x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
AC_CHECK_FUNC(XScreenSaverQueryInfo, [ AC_CHECK_FUNC(XScreenSaverQueryInfo, [
TYPING_BREAK="typing-break"], [ TYPING_BREAK="typing-break"], [
AC_MSG_CHECKING([for XScreenSaverQueryInfo in -lXss])
save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS save_LIBS=$LIBS
LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lXss -lXext -lX11" LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lXss -lXext -lX11"
AC_TRY_LINK([#include <X11/Xlib.h> AC_CHECK_LIB(Xss, XScreenSaverQueryInfo, [
#include <X11/extensions/scrnsaver.h>],[
XScreenSaverQueryInfo(NULL, 0, NULL);],[
AC_MSG_RESULT(yes)
TYPING_BREAK="typing-break" TYPING_BREAK="typing-break"
SCREENSAVER_LIBS="$X_PRE_LIBS $X_LIBS -lXss -lXext -lX11"], [ SCREENSAVER_LIBS="$X_PRE_LIBS $X_LIBS -lXss -lXext -lX11"], [
AC_MSG_RESULT(no)])
LIBS=$save_LIBS LIBS=$save_LIBS
LDFLAGS=$save_LDFLAGS]) 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(TYPING_BREAK)
AC_SUBST(SCREENSAVER_LIBS) AC_SUBST(SCREENSAVER_LIBS)