From 41165ca3640ebf0edf97a783f057b572efbe94af Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 2 Jun 2006 19:46:24 +0000 Subject: Whoops. Apply a working version of the libX11/libXv locator fix. CVS patchset: 8006 CVS date: 2006/06/02 19:46:24 --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index d766ac03c..bff84ff7e 100644 --- a/configure.ac +++ b/configure.ac @@ -449,10 +449,10 @@ dnl --------------------------------------------- dnl Locate libraries needed for X health check dnl --------------------------------------------- -x_lib_location="`ls "$x_libraries/libX11.so"* | sed -e '/[0-9]$/! d; s%^.*/%%; t q; b; :q q'`" -AC_DEFINE([LIBX11_SO], [${x_lib_location:-libX11.so}], [Filename of libX11, for use in dlopen() by the health check code]) -x_lib_location="`ls "$x_libraries/libXv.so"* | sed -e '/[0-9]$/! d; s%^.*/%%; t q; b; :q q'`" -AC_DEFINE([LIBXV_SO], [${x_lib_location:-libXv.so}], [Filename of libXv, for use in dlopen() by the health check code]) +x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libX11.so"* "${x_libraries:-/usr/lib}/libX11.so"* 2>/dev/null | sed -e '/[[0-9]]$/! d; s%^.*/%%; t q; b; :q q'`" +AC_DEFINE_UNQUOTED([LIBX11_SO], "${x_lib_location:-libX11.so}", [The soname of libX11, needed for dlopen()]) +x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.so"* "${x_libraries:-/usr/lib}/libXv.so"* 2>/dev/null | sed -e '/[[0-9]]$/! d; s%^.*/%%; t q; b; :q q'`" +AC_DEFINE_UNQUOTED([LIBXV_SO], "${x_lib_location:-libXv.so}", [The soname of libXv, needed for dlopen()]) dnl --------------------------------------------- -- cgit v1.2.3