← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnash/saucy-proposed

« back to all changes in this revision

Viewing changes to macros/qt4.m4

  • Committer: Package Import Robot
  • Author(s): Micah Gersten
  • Date: 2012-03-04 03:19:06 UTC
  • mfrom: (1.1.18) (3.1.24 sid)
  • Revision ID: package-import@ubuntu.com-20120304031906-p6q5rnb0xhgpof7o
Tags: 0.8.10-3ubuntu1
https://launchpad.net/bugs/940876
* Merge from Debian testing (FFe: LP: #940876), remaining changes:
  - Use mozilla-flashplugin as the alternative for now
  - Change xulrunner-dev build dep to firefox-dev
* Drop the plugin API porting patch, this has been fixed upstream
  - drop debian/patches*
* Drop the following change as we want Adobe's player to take priority
  if it's installed
  - Set alternative priority to 50 so that it matches Adobe Flash's priority

Show diffs side-by-side

added added

removed removed

Lines of Context:
macros/qt4.m4
66
66
     AC_MSG_CHECKING([for QT 4.x headers])
67
67
    if test x$cross_compiling = xno; then
68
68
      if test x"${PKG_CONFIG}" != x -a x"${ac_cv_path_qt4_incl}" = x; then
69
 
        if test ${PKG_CONFIG} --exists QtOpenGL; then
70
 
          ac_cv_path_qt4_incl="`$PKG_CONFIG --cflags-only-I QtOpenGL`"
71
 
        else
72
 
          ac_cv_path_qt4_incl="`$PKG_CONFIG --cflags-only-I QtGui`"
73
 
        fi
 
69
        if ${PKG_CONFIG} --exists QtOpenGL; then
 
70
          ac_cv_path_qt4_incl="`$PKG_CONFIG --cflags-only-I QtCore QtGui QtOpenGL`"
 
71
        else
 
72
          ac_cv_path_qt4_incl="`$PKG_CONFIG --cflags-only-I QtCore QtGui`"
 
73
        fi
74
74
        gnash_qt4_topdir=`echo "${ac_cv_path_qt4_incl}"`
75
75
      fi
76
76
    fi