[Gnash-commit] gnash ChangeLog configure.ac

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/28 08:26:17

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        look for QT libs if kde gui is requested;
        don't bail out if QTOPIA is not found, unless qtopia gui is requested.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4990&r2=1.4991
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.443&r2=1.444

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4990
retrieving revision 1.4991
diff -u -b -r1.4990 -r1.4991
--- ChangeLog   28 Nov 2007 03:34:26 -0000      1.4990
+++ ChangeLog   28 Nov 2007 08:26:16 -0000      1.4991
@@ -1,3 +1,9 @@
+2007-11-28 Sandro Santilli <address@hidden>
+
+       * configure.ac: look for QT libs if kde gui is requested;
+         don't bail out if QTOPIA is not found, unless qtopia gui is
+         requested.
+
 2007-11-27  Rob Savoye  <address@hidden>
 
        * macros/qtopia.m4: New file to find Qtopia bits. Current supports

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -b -r1.443 -r1.444
--- configure.ac        28 Nov 2007 03:34:26 -0000      1.443
+++ configure.ac        28 Nov 2007 08:26:17 -0000      1.444
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.443 2007/11/28 03:34:26 rsavoye Exp $
+dnl $Id: configure.ac,v 1.444 2007/11/28 08:26:17 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1118,7 +1118,7 @@
 if test x$build_kde = xyes -o x$kparts = xyes; then
   GNASH_PATH_KDE
 fi
-if test x$build_qt = xyes -o x$build_qtopia = xyes; then
+if test x$build_qt = xyes -o x$build_qtopia = xyes -o x$build_kde = xyes; then
   GNASH_PATH_QT
   if test x$build_qtopia = xyes; then
     GNASH_PATH_QTOPIA
@@ -1779,7 +1779,7 @@
   fi
 fi
 
-if test x"$has_qt" = xyes; then
+if test x"$build_qtopia" = xyes; then
   if test x"${QTOPIA_LIBS}" != x ; then
     if test x"${QTOPIA_CFLAGS}" != x ; then
       echo "        QTOPIA flags are: $QTOPIA_CFLAGS"