brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add configure option to not even try using xinerama, to make metacity

Browse Source 
2004-02-14  Rob Adams  <readams@readams.net>

	* configure.in: Add configure option to not even try using
	xinerama, to make metacity buildable on systems with no shared
	library version of the xinerama libraries.  Patch for #134203 from
	Julio M. Merino Vidal.
This commit is contained in:
Rob Adams 2004-02-15 05:17:34 +00:00 committed by Rob Adams
parent 57f9a51a58
commit d53afd3ae1
2 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2004-02-14 Rob Adams <readams@readams.net>
* configure.in: Add configure option to not even try using
xinerama, to make metacity buildable on systems with no shared
library version of the xinerama libraries. Patch for #134203 from
Julio M. Merino Vidal.
2004-02-01 Rob Adams <readams@readams.net> 2004-02-01 Rob Adams <readams@readams.net>
* COMPLIANCE: Bring up to date with current draft EWHM. * COMPLIANCE: Bring up to date with current draft EWHM.

81
configure.in
View File

@ -213,46 +213,51 @@ ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
metacity_save_cppflags="$CPPFLAGS" metacity_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_ARG_ENABLE(xinerama,[ --disable-xinerama disable metacity's use of the Xinerama extension],
try_xinerama=no,try_xinerama=yes)
use_solaris_xinerama=no use_solaris_xinerama=no
use_xfree_xinerama=no use_xfree_xinerama=no
case "$host" in if test "${try_xinerama}" != no; then
*-*-solaris*) case "$host" in
# Check for solaris *-*-solaris*)
use_solaris_xinerama=yes # Check for solaris
AC_CHECK_LIB(Xext, XineramaGetInfo, use_solaris_xinerama=yes
use_solaris_xinerama=yes, use_solaris_xinerama=no, AC_CHECK_LIB(Xext, XineramaGetInfo,
$ALL_X_LIBS) use_solaris_xinerama=yes, use_solaris_xinerama=no,
if test "x$use_solaris_xinerama" = "xyes"; then $ALL_X_LIBS)
AC_CHECK_HEADER(X11/extensions/xinerama.h, if test "x$use_solaris_xinerama" = "xyes"; then
if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then AC_CHECK_HEADER(X11/extensions/xinerama.h,
X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS" if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
fi X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
AC_DEFINE(HAVE_SOLARIS_XINERAMA, , [Have Solaris-style Xinerama]) fi
AC_DEFINE(HAVE_XINERAMA, , [Have some version of Xinerama]), AC_DEFINE(HAVE_SOLARIS_XINERAMA, , [Have Solaris-style Xinerama])
use_solaris_xinerama=no, AC_DEFINE(HAVE_XINERAMA, , [Have some version of Xinerama]),
[#include <X11/Xlib.h>]) use_solaris_xinerama=no,
fi [#include <X11/Xlib.h>])
AC_MSG_CHECKING(for Xinerama support on Solaris) fi
AC_MSG_RESULT($use_solaris_xinerama); AC_MSG_CHECKING(for Xinerama support on Solaris)
;; AC_MSG_RESULT($use_solaris_xinerama);
*) ;;
# Check for XFree *)
use_xfree_xinerama=yes # Check for XFree
AC_CHECK_LIB(Xinerama, XineramaQueryExtension, use_xfree_xinerama=yes
[AC_CHECK_HEADER(X11/extensions/Xinerama.h, AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS" [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"
X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS" if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
fi X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
AC_DEFINE(HAVE_XFREE_XINERAMA, , [Have XFree86-style Xinerama]) fi
AC_DEFINE(HAVE_XINERAMA,, [Have some version of Xinerama]), AC_DEFINE(HAVE_XFREE_XINERAMA, , [Have XFree86-style Xinerama])
use_xfree_xinerama=no, AC_DEFINE(HAVE_XINERAMA,, [Have some version of Xinerama]),
[#include <X11/Xlib.h>])], use_xfree_xinerama=no,
use_xfree_xinerama=no, -lXext $ALL_X_LIBS) [#include <X11/Xlib.h>])],
AC_MSG_CHECKING(for Xinerama support on XFree86) use_xfree_xinerama=no, -lXext $ALL_X_LIBS)
AC_MSG_RESULT($use_xfree_xinerama); AC_MSG_CHECKING(for Xinerama support on XFree86)
;; AC_MSG_RESULT($use_xfree_xinerama);
esac ;;
esac
fi
CPPFLAGS="$metacity_save_cppflags" CPPFLAGS="$metacity_save_cppflags"