[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1202-gdef1562

[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  def15623bace152e7599792bea2a2cea81f1068b (commit)
      from  f9fae87a2c02b2656f8660ac599ead8aa5141829 (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=def15623bace152e7599792bea2a2cea81f1068b


commit def15623bace152e7599792bea2a2cea81f1068b
Author: Gabriele Giacone <address@hidden>
Date:   Sat Oct 1 19:13:23 2011 +0200

    Fix qt4 include paths - see bug #34452.

diff --git a/macros/qt4.m4 b/macros/qt4.m4
index ba47e77..e55b40c 100644
--- a/macros/qt4.m4
+++ b/macros/qt4.m4
@@ -66,7 +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
-        ${PKG_CONFIG} --exists  QtOpenGL QtCore QtGui && 
ac_cv_path_qt4_incl="`$PKG_CONFIG --cflags-only-I QtOpenGL QtCore QtGui`"
+       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
        gnash_qt4_topdir=`echo "${ac_cv_path_qt4_incl}"`
       fi
     fi

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

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


hooks/post-receive
-- 
Gnash