Merge branch 'backport' into work

[chaz/openbox] / m4 / x11.m4

diff --git a/m4/x11.m4 b/m4/x11.m4
index 494014f21d574bc63e7440ca4ae72904a59cac4b..fc7b36e191b9a16727abd314c40f685cf51ab3fa 100644 (file)
--- a/m4/x11.m4
+++ b/m4/x11.m4
@@ -397,12 +397,12 @@ AC_DEFUN([X11_EXT_XINERAMA],
   fi
 ])
 
-# VIDMODE()
+# X11_EXT_SYNC()
 #
-# Check for the presence of the "VidMode" X Window System extension.
-# Defines "VIDMODE" and sets the $(VIDMODE) variable to "yes" if the extension
-# is present.
-AC_DEFUN([X11_EXT_VIDMODE],
+# Check for the presence of the "Sync" X Window System extension.
+# Defines "SYNC", sets the $(SYNC) variable to "yes", and sets the $(LIBS)
+# appropriately if the extension is present.
+AC_DEFUN([X11_EXT_SYNC],
 [
   AC_REQUIRE([X11_DEVEL])
 
@@ -411,42 +411,40 @@ AC_DEFUN([X11_EXT_VIDMODE],
   OLDCPPFLAGS=$CPPFLAGS
      
   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-  LIBS="$LIBS $X_LIBS -lXext -lXxf86vm"
+  LIBS="$LIBS $X_LIBS"
 
-  AC_CHECK_LIB([Xxf86vm], [XF86VidModeGetViewPort],
-    AC_MSG_CHECKING([for X11/extensions/xf86vmode.h])
+  AC_CHECK_LIB([Xext], [XSyncInitialize],
+    AC_MSG_CHECKING([for X11/extensions/sync.h])
     AC_TRY_LINK(
     [
       #include <X11/Xlib.h>
-      #include <X11/extensions/xf86vmode.h>
+      #include <X11/Xutil.h>
+      #include <X11/extensions/sync.h>
     ],
     [
-      Display *d;
-      int i;
-      XF86VidModeQueryExtension(d, &i, &i);
-      XF86VidModeGetViewPort(d, i, &i, &i);
+      XSyncValueType foo;
     ],
     [
       AC_MSG_RESULT([yes])
-      VIDMODE="yes"
-      AC_DEFINE([VIDMODE], [1], [Found the VidMode extension])
+      SYNC="yes"
+      AC_DEFINE([SYNC], [1], [Found the XSync extension])
 
-      VIDMODE_CFLAGS=""
-      VIDMODE_LIBS="-lXext -lXxf86vm"
-      AC_SUBST(VIDMODE_CFLAGS)
-      AC_SUBST(VIDMODE_LIBS)
+      XSYNC_CFLAGS=""
+      XSYNC_LIBS="-lXext"
+      AC_SUBST(XSYNC_CFLAGS)
+      AC_SUBST(XSYNC_LIBS)
     ],
     [ 
       AC_MSG_RESULT([no])
-      VIDMODE="no"
+      SYNC="no"
     ])
   )
 
   LIBS=$OLDLIBS
   CPPFLAGS=$OLDCPPFLAGS
-
-  AC_MSG_CHECKING([for the VidMode extension])
-  if test "$VIDMODE" = "yes"; then
+ 
+  AC_MSG_CHECKING([for the Sync extension])
+  if test "$SYNC" = "yes"; then
     AC_MSG_RESULT([yes])
   else
     AC_MSG_RESULT([no])
@@ -462,7 +460,8 @@ AC_DEFUN([X11_SM],
   AC_REQUIRE([X11_DEVEL])
 
   AC_ARG_ENABLE([session-management],
-  [  --disable-session-management  build without support for session managers],
+  AC_HELP_STRING(
+  [--disable-session-management], [build without support for session managers [[default=enabled]]]),
   [SM=$enableval], [SM="yes"])
   
   if test "$SM" = "yes"; then
@@ -479,7 +478,7 @@ AC_DEFUN([X11_SM],
       AC_CHECK_HEADERS([X11/SM/SMlib.h], [
         SM_CFLAGS="$X_CFLAGS"
         SM_LIBS="-lSM -lICE"
-        AC_DEFINE(USE_SM)
+        AC_DEFINE(USE_SM, 1, [Use session management])
         AC_SUBST(SM_CFLAGS)
         AC_SUBST(SM_LIBS)
         SM="yes"