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

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     07/05/27 18:30:42

Modified files:
        .              : ChangeLog 
        macros         : kde.m4 

Log message:
        When detecting QT, also allow for the check for
                the possibility that the QTDIR environment variable points to
                the base QT directory, no strings attached (and no version
                numbers required).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3372&r2=1.3373
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3372
retrieving revision 1.3373
diff -u -b -r1.3372 -r1.3373
--- ChangeLog   27 May 2007 14:22:03 -0000      1.3372
+++ ChangeLog   27 May 2007 18:30:41 -0000      1.3373
@@ -5,6 +5,10 @@
        server/sprite_instance.h, server/vm/VM.h: Mark symbols which are
        used across DSOs as DSOEXPORT. This allows compilation with
        -fvisibility=hidden.
+       * macros/kde.m4: When detecting QT, also allow for the check for
+       the possibility that the QTDIR environment variable points to
+       the base QT directory, no strings attached (and no version
+       numbers required).
 
 2007-05-27 Ann Barcomb <address@hidden>
 

Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- macros/kde.m4       26 May 2007 18:17:32 -0000      1.30
+++ macros/kde.m4       27 May 2007 18:30:42 -0000      1.31
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: kde.m4,v 1.30 2007/05/26 18:17:32 bjacques Exp $
+dnl $Id: kde.m4,v 1.31 2007/05/27 18:30:42 bjacques Exp $
 
 AC_DEFUN([GNASH_PATH_KDE],
 [
@@ -176,7 +176,7 @@
   dnl QT stores it's headers in ../lib/qt-3.3/include for example, so use 
libslist
   dnl instead of incllist
   for i in $QTDIR $libslist $incllist; do
-    for j in `ls -dr $i/qt-[[0-9]].[[0-9]] 2>/dev/null`; do
+    for j in $QTDIR `ls -dr $i/qt-[[0-9]].[[0-9]] 2>/dev/null`; do
       if test -f $j/include/qobject.h; then
         gnash_qt_topdir=$j
         gnash_qt_version=`echo ${gnash_qt_topdir} | sed -e 's:qt-::'`