diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | 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 ---------------------------------------------- @@ -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 |