X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=configure.in;h=7c3e8b4e1546d14a9b837675e8c42c64a4ae7fbd;hp=0beeff1aabbc8c3cd1fac5c7b13ac781a875ddb4;hb=ec8d2b32b63649e6d32bdfb306eda062769af823;hpb=1d7308dd9032b39a92fda86e8c2db04218b45fbf

diff --git a/configure.in b/configure.in
index 0beeff1a..7c3e8b4e 100644
--- a/configure.in
+++ b/configure.in
@@ -2829,6 +2829,15 @@ if test "$with_gl" = yes; then
       AC_MSG_RESULT(adding "$osx_crud" to GL_LIBS)
       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/.
+      #
+      AC_MSG_RESULT(omitting "$libdir" from LDFLAGS)
+      libdir=''
+
     fi
 
 
@@ -3506,10 +3515,13 @@ case "$with_textfile" in
       "/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
         AC_MSG_CHECKING([for text file $f])
+	f=`/bin/ls $f 2>&- | head -1`
         if test -f "$f" ; then
           AC_MSG_RESULT(yes)
           with_textfile="$f"