Fix configure with --x-includes and --x-libraries (thanks to Peter Hyman).

SVN revision: 28466

configure.in

@@ -130,7 +130,8 @@ if test "x$enable_sound" = "xyes"; then
   ])
 fi
 
-LDFLAGS="$LDFLAGS -L$prefix/lib"
+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
+LDFLAGS="$X_LIBS $LDFLAGS -L$prefix/lib"
 
 PKG_CHECK_MODULES(IMLIB2, imlib2 >= 1.2.0, have_good_imlib2=yes)
 AC_CHECK_LIB(Imlib2, imlib_context_set_mask_alpha_threshold,
@@ -167,7 +168,7 @@ fi
 AC_CHECK_LIB(Xext, XShapeQueryExtension,
   E_X_LIBS="-lXext $E_X_LIBS",
   AC_MSG_ERROR([Shape support is required but was not found]),
-  $X_LIBS -lX11)
+  -lX11)
 
 AC_ARG_ENABLE(xinerama,
   [  --enable-xinerama       compile with xinerama support @<:@default=yes@:>@],,
@@ -178,7 +179,7 @@ if test "x$enable_xinerama" = "xyes"; then
     XINERAMA_LIBS="-lXinerama",
     enable_xinerama=no
     AC_MSG_WARN([Xinerama support was requested but not found]),
-    $X_LIBS -lXext -lX11)
+    -lXext -lX11)
 fi
 AC_SUBST(XINERAMA_LIBS)
 
@@ -191,7 +192,7 @@ if test "x$enable_zoom" = "xyes"; then
     E_X_LIBS="-lXxf86vm $E_X_LIBS",
     enable_zoom=no
     AC_MSG_WARN([Zoom support was requested but not found]),
-    $X_LIBS -lXext -lX11)
+    -lXext -lX11)
 fi
 
 AC_ARG_ENABLE(xsync,
@@ -202,7 +203,7 @@ if test "x$enable_xsync" = "xyes"; then
     AC_DEFINE(HAVE_XSYNC, 1, [SYNC support]),
     enable_xsync=no
     AC_MSG_WARN([Sync support was requested but not found]),
-    $X_LIBS -lX11)
+    -lX11)
 fi
 
 AC_ARG_ENABLE(xscrnsaver,
@@ -214,7 +215,7 @@ if test "x$enable_xscrnsaver" = "xyes"; then
     E_X_LIBS="-lXss $E_X_LIBS",
     enable_xscrnsaver=no
     AC_MSG_WARN([ScreenSaver support was requested but not found]),
-    $X_LIBS -lXss -lXext -lX11)
+    -lXss -lXext -lX11)
 fi
 
 AC_ARG_ENABLE(xrandr,
@@ -226,7 +227,7 @@ if test "x$enable_xrandr" = "xyes"; then
     E_X_LIBS="-lXrandr -lXrender $E_X_LIBS",
     enable_xrandr=no
     AC_MSG_WARN([RandR support was requested but not found]),
-    $X_LIBS -lXrender -lXext -lX11)
+    -lXrender -lXext -lX11)
   AC_CHECK_HEADERS(X11/extensions/Xrandr.h,,,[#include <X11/Xlib.h>])
 fi
 
@@ -239,7 +240,7 @@ if test "x$enable_composite" = "xyes"; then
     AC_DEFINE(HAVE_COMPOSITE, 1, [Composite support])
     E_X_LIBS="-lXcomposite -lXdamage -lXfixes -lXrender $E_X_LIBS",
     enable_composite=no,
-    $X_LIBS -lXext -lX11)
+    -lXext -lX11)
   AC_CHECK_HEADERS(X11/extensions/Xcomposite.h ,, enable_composite=no, [#include <X11/Xlib.h>])
   AC_CHECK_HEADERS(X11/extensions/Xdamage.h    ,, enable_composite=no, [#include <X11/Xlib.h>])
   AC_CHECK_HEADERS(X11/extensions/Xfixes.h     ,, enable_composite=no, [#include <X11/Xlib.h>])