X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=m4%2Fx11.m4;h=5a4a35ddd62d6d220212de6ccb19a8c6d50b0c68;hb=79a352a40bd16924b1ca3df49f6c82d77e956a0e;hp=80c413c5217e396e22a701a86734ad5623155ac4;hpb=2a18a4b222f828969a3a9de3f6b7f84da7b840a1;p=chaz%2Fopenbox

diff --git a/m4/x11.m4 b/m4/x11.m4
index 80c413c5..5a4a35dd 100644
--- a/m4/x11.m4
+++ b/m4/x11.m4
@@ -1,15 +1,19 @@
 # X11_DEVEL()
 #
 # Check for the presence of the X Window System headers and libraries.
-# Sets the CXXFLAGS and LIBS variables as appropriate.
+# Sets the CPPFLAGS and LIBS variables as appropriate.
 AC_DEFUN([X11_DEVEL],
 [
-  AC_PATH_X
   AC_PATH_XTRA
   test "$no_x" = "yes" && \
     AC_MSG_ERROR([The X Window System could not be found.])
+
+  # Store these
+  OLDLIBS=$LIBS
+  OLDCPPFLAGS=$CPPFLAGS
      
-  CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+  X_LIBS="$X_LIBS -lX11"
   LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
 
   # Check for required functions in -lX11
@@ -18,6 +22,11 @@ AC_DEFUN([X11_DEVEL],
     ,
     AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.])
   )
+
+  # Restore the old values. Use X_CFLAGS and X_PRE_LIBS X_LIBS X_EXTRA_LIBS in
+  # the Makefiles
+  LIBS=$OLDLIBS
+  CPPFLAGS=$OLDCPPFLAGS
 ])
 
 
@@ -73,14 +82,14 @@ AC_DEFUN([XFT_DEVEL],
 
   # Store these
   OLDLIBS=$LIBS
-  OLDCXXFLAGS=$CXXFLAGS
+  OLDCPPFLAGS=$CPPFLAGS
 
   XFT_CFLAGS="`pkg-config --cflags xft`"
   XFT_LIBS="`pkg-config --libs xft`"
 
   # Set these for checking with the tests below. They'll be restored after
   LIBS="$LIBS $XFT_LIBS"
-  CXXFLAGS="$XFT_CFLAGS $CXXFLAGS"
+  CPPFLAGS="$XFT_CFLAGS $CPPFLAGS"
 
   AC_CHECK_LIB([Xft], [XftGetVersion], # this was not defined in < 2.0
     if test "$XFT_MIN"; then
@@ -160,9 +169,9 @@ AC_DEFUN([XFT_DEVEL],
     ])
   )
 
-# Restore the old values. Use XFT_CFLAGS and XFT_LIBS in the Makefile.am's
+  # Restore the old values. Use XFT_CFLAGS and XFT_LIBS in the Makefiles
   LIBS=$OLDLIBS
-  CXXFLAGS=$OLDCXXFLAGS
+  CPPFLAGS=$OLDCPPFLAGS
 
   AC_SUBST([XFT_CFLAGS])
   AC_SUBST([XFT_LIBS])
@@ -178,6 +187,13 @@ AC_DEFUN([X11_EXT_XKB],
 [
   AC_REQUIRE([X11_DEVEL])
 
+  # Store these
+  OLDLIBS=$LIBS
+  OLDCPPFLAGS=$CPPFLAGS
+     
+  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+  LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
+
   AC_CHECK_LIB([X11], [XkbBell],
     AC_MSG_CHECKING([for X11/XKBlib.h])
     AC_TRY_LINK(
@@ -201,6 +217,10 @@ AC_DEFUN([X11_EXT_XKB],
       XKB="no"
     ])
   )
+
+  LIBS=$OLDLIBS
+  CPPFLAGS=$OLDCPPFLAGS
+
   AC_MSG_CHECKING([for the Xkb extension])
   if test "$XKB" = "yes"; then
     AC_MSG_RESULT([yes])
@@ -218,6 +238,13 @@ AC_DEFUN([X11_EXT_SHAPE],
 [
   AC_REQUIRE([X11_DEVEL])
 
+  # Store these
+  OLDLIBS=$LIBS
+  OLDCPPFLAGS=$CPPFLAGS
+     
+  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+  LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
+
   AC_CHECK_LIB([Xext], [XShapeCombineShape],
     AC_MSG_CHECKING([for X11/extensions/shape.h])
     AC_TRY_LINK(
@@ -240,7 +267,11 @@ AC_DEFUN([X11_EXT_SHAPE],
       SHAPE="no"
     ])
   )
-  AC_MSG_CHECKING([for the Shape extension])
+
+  LIBS=$OLDLIBS
+  CPPFLAGS=$OLDCPPFLAGS
+ 
+ AC_MSG_CHECKING([for the Shape extension])
   if test "$SHAPE" = "yes"; then
     AC_MSG_RESULT([yes])
   else
@@ -258,6 +289,13 @@ AC_DEFUN([X11_EXT_XINERAMA],
 [
   AC_REQUIRE([X11_DEVEL])
 
+  # Store these
+  OLDLIBS=$LIBS
+  OLDCPPFLAGS=$CPPFLAGS
+     
+  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+  LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS -lXext"
+
   AC_CHECK_LIB([Xinerama], [XineramaQueryExtension],
   [
     AC_MSG_CHECKING([for X11/extensions/Xinerama.h])
@@ -273,13 +311,18 @@ AC_DEFUN([X11_EXT_XINERAMA],
       AC_MSG_RESULT([yes])
       XINERAMA="yes"
       AC_DEFINE([XINERAMA], [1], [Enable support of the Xinerama extension])
-      LIBS="$LIBS -lXinerama"
+      XINERAMA_LIBS="-lXext -lXinerama"
+      AC_SUBST(XINERAMA_LIBS)
     ],
     [
       AC_MSG_RESULT([no])
       XINERAMA="no"
     ])
   ])
+
+  LIBS=$OLDLIBS
+  CPPFLAGS=$OLDCPPFLAGS
+
   AC_MSG_CHECKING([for the Xinerama extension])
   if test "$XINERAMA" = "yes"; then
     AC_MSG_RESULT([yes])