Commit: ad9828a3f6cf1e4b276cce4679a8fdd8427182a7 - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• Revisão: ad9828a3f6cf1e4b276cce4679a8fdd8427182a7 (tree)
• Hora: 2010-04-27 23:35:21
• Autor: Christopher Roy Bratusek <zanghar@free...>
• Commiter: Christopher Roy Bratusek

Mensagem de Log

make xinerama an optional depedency

Mudança Sumário

• modified: ChangeLog
• modified: configure.in
• modified: man/news.texi

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
[phone]  Christopher Bratusek <[e-mail]>
+	* configure.in: make xinerama an optional dependency
+			-- [modified patch from Gentoo]
+
 2010-04-06  Teika Kazura <[e-mail]>
 	* lisp/sawfish/wm/autoload.jl
 	* lisp/sawfish/wm/commands.jl

--- a/configure.in
+++ b/configure.in
@@ -81,11 +81,17 @@ XRANDR_LIBS=""
 XFT_LIBS=""
 XFT_CFLAGS=""
 
+AC_ARG_WITH([xinerama], [AS_HELP_STRING([--with-xinerama], [Include Xinerama support])], [], [with_xinerama=yes])
+
+if test "$with_xinerama" != "no"; then
+
 PKG_CHECK_MODULES(libXineRama, xinerama >= 1.0
 		  ,XINERAMA_LIBS="-lXinerama"
 		  AC_DEFINE(HAVE_X11_EXTENSIONS_XINERAMA_H, 1, [Have xinerama])
 		  ,AC_MSG_ERROR([cannot locate libXineRama]))
 
+fi
+
 PKG_CHECK_MODULES(libXRandR, xrandr >= 1.0
 		  ,XRANDR_LIBS="-lXrandr"
 		  AC_DEFINE(HAVE_X11_EXTENSIONS_XRANDR_H, 1, [Have xrandr])
@@ -135,11 +141,15 @@ XRANDR_LIBS=""
 XFT_LIBS=""
 XFT_CFLAGS=""
 
+if test "$with_xinerama" != "no"; then
+
 AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
 	     [XINERAMA_LIBS="-lXinerama"
 	      AC_CHECK_HEADERS(X11/extensions/Xinerama.h)],
 	     [],[$X_LIBS -lX11 -lXext])
 
+fi
+
 AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
 	     [XRANDR_LIBS="-lXrandr"
 	      AC_CHECK_HEADERS(X11/extensions/Xrandr.h, [], [],

--- a/man/news.texi
+++ b/man/news.texi
@@ -110,6 +110,8 @@ We now edit the info often, so they are not so much meaningful.
 @item Pressing the lock-button does the state-change of the window
 accordingly. [Fuchur]@*
 No theme shipped with Sawfish does have the lock-button yet, though.
+
+@item Make xinerama an optional dependency [original patch from Gentoo]
 @end itemize
 @end itemize