[Gnash-commit] gnash macros/qt.m4 ChangeLog

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/01/26 01:24:30

Modified files:
        macros         : qt.m4 
        .              : ChangeLog 

Log message:
                * macros/qt.m4: Ubuntu hardy puts QT headers in different
                location, breaking using QTDIR to find them.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/qt.m4?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5501&r2=1.5502

Patches:
Index: macros/qt.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/qt.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- macros/qt.m4        29 Nov 2007 03:47:05 -0000      1.3
+++ macros/qt.m4        26 Jan 2008 01:24:28 -0000      1.4
@@ -56,9 +56,16 @@
         fi
       fi
     else
+      dnl Look for qt4 first, if qt3 exists, we prefer that, so override this
+      if test -f /usr/include/qt4/qobject.h; then
       qt_pkg="QtCore"
       gnash_qt_version=4
     fi
+      if test -f /usr/include/qt3/qobject.h; then
+        qt_pkg="qt-mt"       
+        gnash_qt_version=3
+      fi
+    fi
   fi
 
   if test x$cross_compiling = xno; then
@@ -92,7 +99,7 @@
          if test "${gnash_qt_version} " -eq 0; then
             gnash_qt_version=4
          fi
-          ac_cv_path_qt_incl="-I$j/Qt"
+            ac_cv_path_qt_incl="-I$j -I$j/Qt"
          fi
         fi
       done
@@ -110,7 +117,7 @@
       for j in  $QTDIR `ls -dr $i/qt[[0-9]] 2>/dev/null`; do
         if test -f $j/qobject.h -o -f $j/Qt/qobject.h; then
 dnl          gnash_qt_version=`echo "$j" | sed "s:$i/qt::"`
-          ac_cv_path_qt_incl="-I$j"
+          ac_cv_path_qt_incl="-I$j -I$j/Qt"
           break
         fi
       done

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5501
retrieving revision 1.5502
diff -u -b -r1.5501 -r1.5502
--- ChangeLog   25 Jan 2008 21:11:18 -0000      1.5501
+++ ChangeLog   26 Jan 2008 01:24:29 -0000      1.5502
@@ -6,6 +6,9 @@
 
 2008-01-25  Rob Savoye  <address@hidden>
 
+       * macros/qt.m4: Ubuntu hardy puts QT headers in different
+       location, breaking using QTDIR to find them.
+
        * configure.ac: Add test to use gst-inspect to look for installed
        codecs for Gstreamer.