[Gnash-commit] gnash ChangeLog configure.ac gui/Makefile.am [release-0-8-0]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release-0-8-0
Changes by:     Sandro Santilli <strk>  07/06/07 15:42:27

Modified files:
        .              : ChangeLog configure.ac 
        gui            : Makefile.am 

Log message:
                * configure.ac: disable klash if QT lib aren't found.
                * gui/Makefile.am: add kde_glue.h  in KDE_SRCS (hopefully this 
adds
                  to distribution).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.3451.2.41&r2=1.3451.2.42
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.331.4.5&r2=1.331.4.6
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.75.4.2&r2=1.75.4.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3451.2.41
retrieving revision 1.3451.2.42
diff -u -b -r1.3451.2.41 -r1.3451.2.42
--- ChangeLog   7 Jun 2007 15:10:31 -0000       1.3451.2.41
+++ ChangeLog   7 Jun 2007 15:42:25 -0000       1.3451.2.42
@@ -1,5 +1,11 @@
 2007-06-07 Sandro Santilli <address@hidden>
 
+       * configure.ac: disable klash if QT lib aren't found.
+       * gui/Makefile.am: add kde_glue.h  in KDE_SRCS (hopefully this adds
+         to distribution).
+
+2007-06-07 Sandro Santilli <address@hidden>
+
        * configure.ac: hint user about using AGG if framebuffer gui is
          requested.
        * server/Makefile.am, utilities/Makefile.am:

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.331.4.5
retrieving revision 1.331.4.6
diff -u -b -r1.331.4.5 -r1.331.4.6
--- configure.ac        7 Jun 2007 15:10:32 -0000       1.331.4.5
+++ configure.ac        7 Jun 2007 15:42:26 -0000       1.331.4.6
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.331.4.5 2007/06/07 15:10:32 strk Exp $
+dnl $Id: configure.ac,v 1.331.4.6 2007/06/07 15:42:26 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -775,6 +775,12 @@
     klash=no
   fi
 fi
+if test x$has_qt != xyes; then
+  if test x$klash = xyes; then
+    echo "WARNING: No QT development package installed, disabling klash"
+    klash=no
+  fi
+fi
 
 AM_CONDITIONAL(KLASH, [test x$klash = xyes])
 

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.75.4.2
retrieving revision 1.75.4.3
diff -u -b -r1.75.4.2 -r1.75.4.3
--- gui/Makefile.am     5 Jun 2007 10:09:33 -0000       1.75.4.2
+++ gui/Makefile.am     7 Jun 2007 15:42:27 -0000       1.75.4.3
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.75.4.2 2007/06/05 10:09:33 strk Exp $
+# $Id: Makefile.am,v 1.75.4.3 2007/06/07 15:42:27 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 localedir = $(datadir)/locale
@@ -156,7 +156,7 @@
 
 #if USE_GUI_KDE
 if KLASH
-  KDE_SRCS = kde.cpp kdesup.h $(KDE_CAIRO_SRCS) $(KDE_OPENGL_SRCS)
+  KDE_SRCS = kde.cpp kdesup.h kde_glue.h $(KDE_CAIRO_SRCS) $(KDE_OPENGL_SRCS)
   AM_CPPFLAGS += -I$(kde_includes)/kio $(all_includes) 
 else
   KDE_SRCS =