From 753fbd6127fd4457e777b61799003b9ebbc4b558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Thu, 12 Apr 2007 18:02:38 +0200
Subject: Set xv_path before rewriting X_LIBS if we're not using pkg-config to
 discover X libraries.

---
 configure.ac | 6 ++++++
 m4/xv.m4     | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4ecb5bce7..73bade8c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -499,6 +499,12 @@ if test "x$with_x" != "xno"; then
    PKG_CHECK_MODULES([X], [x11 xext], , [
      AC_PATH_XTRA
    
+     dnl Set xv_path if its not done already
+     dnl we do it here before rewriting X_LIBS
+     if test x$xv_path = x; then
+     	xv_path=`echo $X_LIBS | sed -e 's/\-L\(.*\)/\1/'`
+     fi
+     
      dnl ----------------------------------------------
      dnl Check for XShm support (required with X)
      dnl ----------------------------------------------
diff --git a/m4/xv.m4 b/m4/xv.m4
index 6d58cd0e7..91380a1de 100644
--- a/m4/xv.m4
+++ b/m4/xv.m4
@@ -68,11 +68,6 @@ AC_DEFUN([AC_FIND_LIBXV],
   # Ensure that AC_PATH_XTRA is executed before this
   AC_REQUIRE([AC_PATH_XTRA])
 
-  # Set xv_path if its not done already
-  if test x$xv_path = x; then
-    xv_path=`echo $X_LIBS | sed -e 's/\-L\(.*\)/\1/'`
-  fi
-
   if test x$xv_path = x; then
     xv_path=/usr/X11R6/lib
   fi
-- 
cgit v1.2.3