X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=m4%2Fx11.m4;h=2eae1db5f719dda94b7799a7bfeaa94ab22e3803;hb=140c5313cfe38aada8bd15892f74fc0d21d374c1;hp=494014f21d574bc63e7440ca4ae72904a59cac4b;hpb=373a4584d603a4dc14c64d5f27653c83a1fe686b;p=chaz%2Fopenbox

diff --git a/m4/x11.m4 b/m4/x11.m4
index 494014f2..2eae1db5 100644
--- a/m4/x11.m4
+++ b/m4/x11.m4
@@ -397,62 +397,6 @@ AC_DEFUN([X11_EXT_XINERAMA],
   fi
 ])
 
-# VIDMODE()
-#
-# 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],
-[
-  AC_REQUIRE([X11_DEVEL])
-
-  # Store these
-  OLDLIBS=$LIBS
-  OLDCPPFLAGS=$CPPFLAGS
-     
-  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-  LIBS="$LIBS $X_LIBS -lXext -lXxf86vm"
-
-  AC_CHECK_LIB([Xxf86vm], [XF86VidModeGetViewPort],
-    AC_MSG_CHECKING([for X11/extensions/xf86vmode.h])
-    AC_TRY_LINK(
-    [
-      #include <X11/Xlib.h>
-      #include <X11/extensions/xf86vmode.h>
-    ],
-    [
-      Display *d;
-      int i;
-      XF86VidModeQueryExtension(d, &i, &i);
-      XF86VidModeGetViewPort(d, i, &i, &i);
-    ],
-    [
-      AC_MSG_RESULT([yes])
-      VIDMODE="yes"
-      AC_DEFINE([VIDMODE], [1], [Found the VidMode extension])
-
-      VIDMODE_CFLAGS=""
-      VIDMODE_LIBS="-lXext -lXxf86vm"
-      AC_SUBST(VIDMODE_CFLAGS)
-      AC_SUBST(VIDMODE_LIBS)
-    ],
-    [ 
-      AC_MSG_RESULT([no])
-      VIDMODE="no"
-    ])
-  )
-
-  LIBS=$OLDLIBS
-  CPPFLAGS=$OLDCPPFLAGS
-
-  AC_MSG_CHECKING([for the VidMode extension])
-  if test "$VIDMODE" = "yes"; then
-    AC_MSG_RESULT([yes])
-  else
-    AC_MSG_RESULT([no])
-  fi
-])
-
 # X11_SM()
 #
 # Check for the presence of SMlib for session management.
@@ -462,7 +406,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 +424,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"