[Gnash-commit] [SCM] Gnash branch, master, updated. 8128020e8d4aae132930680d910907bebd1e6fea

[Markus Gothe]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  8128020e8d4aae132930680d910907bebd1e6fea (commit)
      from  298cc5dadef666bb3dec7021c82569e03ba8659a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=8128020e8d4aae132930680d910907bebd1e6fea


commit 8128020e8d4aae132930680d910907bebd1e6fea
Author: Markus Gothe <address@hidden>
Date:   Fri Jan 7 11:45:37 2011 +0100

    Fix x11-detection bug

diff --git a/macros/x11.m4 b/macros/x11.m4
index e85e324..1da0126 100644
--- a/macros/x11.m4
+++ b/macros/x11.m4
@@ -1,5 +1,5 @@
 dnl  
-dnl    Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
+dnl    Copyright (C) 2005, 2006, 2009, 2010, 2011 Free Software Foundation, 
Inc.
 dnl  
 dnl  This program is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
@@ -31,10 +31,11 @@ AC_DEFUN([GNASH_PATH_X11],
 
   dnl If the path hasn't been specified, go look for it.
   if test x"${ac_cv_path_x11_incl}" = x ; then
-    newlist="/Developer/SDKs/MacOSX10.5*.sdk/usr/include 
/Developer/SDKs/MacOSX10.4*.sdk/usr/include ${incllist}"
+    newlist="/Developer/SDKs/MacOSX10.6*.sdk/usr/include 
/Developer/SDKs/MacOSX10.5*.sdk/usr/include 
/Developer/SDKs/MacOSX10.4*.sdk/usr/include ${incllist}"
     for i in $newlist; do
        if test -f $i/X11/X.h; then
            ac_cv_path_x11_incl="-I$i"
+            break
        fi
     done
   fi
@@ -54,9 +55,9 @@ AC_DEFUN([GNASH_PATH_X11],
   AC_MSG_CHECKING([for X11 headers])
   if test x"${ac_cv_path_x11_incl}" != x ; then
     dnl Don't pass -I/usr/include
-    if test x"${ac_cv_path_x11_incl}" != "x-I/usr/include"; then
-      X11_CFLAGS="${ac_cv_path_x11_incl}"
-    fi
+    dnl if test x"${ac_cv_path_x11_incl}" != "x-I/usr/include"; then
+       X11_CFLAGS="${ac_cv_path_x11_incl}"
+    dnl fi
     AC_MSG_RESULT(${ac_cv_path_x11_incl})
   else
     X11_CFLAGS=""
@@ -77,7 +78,7 @@ AC_DEFUN([GNASH_PATH_X11],
 
   dnl If the header doesn't exist, there is no point looking for the library.
   if test x"${ac_cv_path_x11_incl}" != x ; then
-    newlist="/Developer/SDKs/MacOSX10.5*.sdk/usr/lib 
/Developer/SDKs/MacOSX10.5*.sdk/usr/X11R6/lib 
/Developer/SDKs/MacOSX10.4*.sdk/usr/lib 
/Developer/SDKs/MacOSX10.4*.sdk/usr/X11R6/lib ${libslist}"
+    newlist="/Developer/SDKs/MacOSX10.6*.sdk/usr/lib 
/Developer/SDKs/MacOSX10.6*.sdk/usr/X11R6/lib 
/Developer/SDKs/MacOSX10.5*.sdk/usr/lib 
/Developer/SDKs/MacOSX10.5*.sdk/usr/X11R6/lib 
/Developer/SDKs/MacOSX10.4*.sdk/usr/lib 
/Developer/SDKs/MacOSX10.4*.sdk/usr/X11R6/lib ${libslist}"
     for i in $newlist; do
       if test -f $i/libX11.a -o -f $i/libX11.${shlibext}; then
         if test ! x"${i}" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then

-----------------------------------------------------------------------

Summary of changes:
 macros/x11.m4 |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Gnash