[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1206-gcf58cc3

[Gabriele Giacone]

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  cf58cc3a601167277096929feb70ab42f6d8f3b1 (commit)
      from  43e7d505fb7ffbddc0dd42d20c4862780aff752b (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=cf58cc3a601167277096929feb70ab42f6d8f3b1


commit cf58cc3a601167277096929feb70ab42f6d8f3b1
Author: Gabriele Giacone <address@hidden>
Date:   Sat Oct 8 04:04:25 2011 +0200

    Fix qt4 include paths again.

diff --git a/macros/qt4.m4 b/macros/qt4.m4
index e55b40c..f353b75 100644
--- a/macros/qt4.m4
+++ b/macros/qt4.m4
@@ -66,11 +66,11 @@ dnl     fi
      AC_MSG_CHECKING([for QT 4.x headers])
     if test x$cross_compiling = xno; then
       if test x"${PKG_CONFIG}" != x -a x"${ac_cv_path_qt4_incl}" = x; then
-       if test ${PKG_CONFIG} --exists QtOpenGL; then
-         ac_cv_path_qt4_incl="`$PKG_CONFIG --cflags-only-I QtOpenGL`"
-       else
-         ac_cv_path_qt4_incl="`$PKG_CONFIG --cflags-only-I QtGui`"
-       fi
+        for i in "QtCore QtGui QtOpenGL"; do
+          if ${PKG_CONFIG} --exists $i; then
+            ac_cv_path_qt4_incl="${ac_cv_path_qt4_incl} `$PKG_CONFIG 
--cflags-only-I $i`"
+          fi
+        done
        gnash_qt4_topdir=`echo "${ac_cv_path_qt4_incl}"`
       fi
     fi

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

Summary of changes:
 macros/qt4.m4 |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash