X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=configure;h=f5273296505eb1fdc393e610354aff75426276e5;hp=8f47eb9a0ce2ff943adf0d56b8740d53b25dc6be;hb=ec8d2b32b63649e6d32bdfb306eda062769af823;hpb=1d7308dd9032b39a92fda86e8c2db04218b45fbf

diff --git a/configure b/configure
index 8f47eb9a..f5273296 100755
--- a/configure
+++ b/configure
@@ -17048,6 +17048,16 @@ $as_echo "adding \"$osx_crud\" to GL_LIBS" >&6; }
 $as_echo "adding \"$osx_crud\" to GL_LIBS" >&6; }
       GL_LIBS="$GL_LIBS $osx_crud"
       unset osx_crud
+
+      # New lossage in 10.6.8: we can't allow -L/opt/local/lib to be in the
+      # link line, or at runtime XQueryExtension gets a segv due to some kind
+      # of library version skew.  Libs must come from /usr/X11/lib even if
+      # $prefix and/or $exec_prefix are set to /opt/local/.
+      #
+      { $as_echo "$as_me:$LINENO: result: omitting \"$libdir\" from LDFLAGS" >&5
+$as_echo "omitting \"$libdir\" from LDFLAGS" >&6; }
+      libdir=''
+
     fi
 
 
@@ -17361,7 +17371,7 @@ if test "${ac_cv_mesagl_version_string+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17368 "configure"
+#line 17378 "configure"
 #include "confdefs.h"
 #include <GL/gl.h>
 #ifndef MESA_MAJOR_VERSION
@@ -20748,11 +20758,14 @@ $as_echo "no" >&6; }
       "/usr/share/doc/xserver-common/copyright"	   \
       "/usr/share/doc/xserver-xorg-core/copyright" \
       "/usr/X11R6/README"			   \
+      "/usr/share/doc/libX11*/COPYING"		   \
+      "/usr/X11/share/X11/doc/README*"		   \
       "/usr/share/doc/debian/debian-manifesto"     \
     ; do
       if test -z "$with_textfile"; then
         { $as_echo "$as_me:$LINENO: checking for text file $f" >&5
 $as_echo_n "checking for text file $f... " >&6; }
+	f=`/bin/ls $f 2>&- | head -1`
         if test -f "$f" ; then
           { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }