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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/02/01 05:48:35

Modified files:
        .              : ChangeLog 
        macros         : pthreads.m4 qt.m4 
        utilities      : Makefile.am 
        gui            : Makefile.am 
        gui/images     : GnashG.png 

Log message:
                * macros/qt.m4: Set the topdir if pkg-config exists, so it can 
be
                used later.
                * macros/pthreads.m4: Don't use host_cpu to match a platform. 
Look
                for pthreads, it turns out the check has been disabled by 
accident
                for quite a while... but BSD needs the -pthread flag.
                * utilities/Makefile.am: Add PTHREAD_CFLAGS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5544&r2=1.5545
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pthreads.m4?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/qt.m4?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/images/GnashG.png?cvsroot=gnash&rev=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5544
retrieving revision 1.5545
diff -u -b -r1.5544 -r1.5545
--- ChangeLog   1 Feb 2008 01:42:40 -0000       1.5544
+++ ChangeLog   1 Feb 2008 05:48:33 -0000       1.5545
@@ -1,5 +1,12 @@
 2008-01-31  Rob Savoye  <address@hidden>
 
+       * macros/qt.m4: Set the topdir if pkg-config exists, so it can be
+       used later.
+       * macros/pthreads.m4: Don't use host_cpu to match a platform. Look
+       for pthreads, it turns out the check has been disabled by accident
+       for quite a while... but BSD needs the -pthread flag.
+       * utilities/Makefile.am: Add PTHREAD_CFLAGS.
+
        * libamf/amf.cpp: Oops, return original pointer as returned by
        new, not the incremented pointer. Use :encodeElement() for
        strings. Encode an array of AMF objects.

Index: macros/pthreads.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pthreads.m4,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- macros/pthreads.m4  29 Oct 2007 16:38:08 -0000      1.33
+++ macros/pthreads.m4  1 Feb 2008 05:48:34 -0000       1.34
@@ -15,14 +15,13 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 dnl Copyright (C) 2006 Steven G. Johnson <address@hidden>.
-dnl $Id: pthreads.m4,v 1.33 2007/10/29 16:38:08 eh9 Exp $
+dnl $Id: pthreads.m4,v 1.34 2008/02/01 05:48:34 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_PTHREADS],
 [
 AC_REQUIRE([AC_CANONICAL_HOST])
 AC_LANG_SAVE
 AC_LANG_C
-pthreads=no
 PTHREAD_LIBS=""
 PTHREAD_CFLAGS=""
 
@@ -81,7 +80,7 @@
 dnl --thread-safe: KAI C++
 dnl pth(read)-config: use pthread-config program (for GNU Pth library)
 
-case "${host_cpu}-${host_os}" in
+case "${host_os}" in
   *linux* | *openbsd*)
     pthread_flags="-pthread"
     ;;
@@ -105,9 +104,7 @@
     ;;
 esac
 
-if test x"$pthreads" = xno; then
-  for flag in $pthread_flags; do
-
+for flag in $pthread_flags; do\
     case $flag in
       none)
         AC_MSG_CHECKING([whether pthreads work without any flags])
@@ -115,6 +112,7 @@
       -*)
         AC_MSG_CHECKING([whether pthreads work with $flag])
         PTHREAD_CFLAGS="$flag"
+        CXXFLAGS="$CXXFLAGS $flag"
        PTHREAD_LIBS=""
         ;;
 
@@ -170,9 +168,7 @@
     if test "x$pthreads" = xyes; then
        break;
     fi
-
-  done
-fi
+done
 
 dnl Try a manual search, useful for cross-compiling
 if test x"${PTHREAD_LIBS}" = "x"; then
@@ -256,7 +252,6 @@
   PTHREAD_CXX="$CXX"
 fi
 
-  
 AC_SUBST(PTHREAD_LIBS)
 AC_SUBST(PTHREAD_CFLAGS)
 AC_SUBST(PTHREAD_CC)

Index: macros/qt.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/qt.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- macros/qt.m4        1 Feb 2008 01:30:30 -0000       1.5
+++ macros/qt.m4        1 Feb 2008 05:48:34 -0000       1.6
@@ -107,6 +107,8 @@
         break;
       fi
     done
+  else
+    gnash_qt_topdir="`echo ${ac_cv_path_qt_incl} | sed -e 's:-I::' -e 
's:/lib/qt.*::'`"
   fi
 dnl On Debian the dir is /usr/include/qt3 with /usr/lib/libqt-mt.*
 dnl so we set topdir to /usr so that $topdir/lib/libqt-mt.* works below,
@@ -165,7 +167,7 @@
   AC_ARG_WITH(qt_lib, AC_HELP_STRING([--with-qt-lib], [directory where qt 
libraries are]), with_qt_lib=${withval})
   AC_CACHE_VAL(ac_cv_path_qt_lib, [
     if test x"${with_qt_lib}" != x ; then
-      if test `ls -C1 ${gnash_qt_topdir}/lib/libqt*-mt.*| wc -l` -gt 0 ; then
+      if test `ls -C1 ${gnash_qt_topdir}/lib/libqt*-mt.* | wc -l` -gt 0 ; then
        ac_cv_path_qt_lib="-L`(cd ${with_qt_lib}; pwd)` ${qt3support} -lqt-mt"
       else
              AC_MSG_ERROR([${with_qt_lib} directory doesn't contain qt 
libraries.])

Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- utilities/Makefile.am       21 Jan 2008 23:29:46 -0000      1.62
+++ utilities/Makefile.am       1 Feb 2008 05:48:34 -0000       1.63
@@ -58,6 +58,7 @@
         -I$(top_srcdir)/libmedia/sdl \
         -I$(top_srcdir)/libmedia/gst \
         -DLOCALEDIR=\"$(localedir)\" \
+       $(PTHREAD_CFLAGS) \
        $(BOOST_CFLAGS) \
         $(LIBXML_CFLAGS) \
         $(MYSQL_CFLAGS) \
@@ -81,6 +82,7 @@
 #check_PROGRAMS = gdebug.swf
 
 gprocessor_SOURCES = processor.cpp
+gprocessor_CPPFLAGS = $(AM_CPPFLAGS)
 # export our symbols so they can be used by Gnash plugins
 gprocessor_LDFLAGS = -export-dynamic $(LIBLTDL)
 gprocessor_LDADD = $(GNASH_LIBS) 

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- gui/Makefile.am     25 Jan 2008 19:14:27 -0000      1.116
+++ gui/Makefile.am     1 Feb 2008 05:48:34 -0000       1.117
@@ -1,6 +1,6 @@
 ## Process this file with automake to generate Makefile.in
 # 
-#   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

Index: gui/images/GnashG.png
===================================================================
RCS file: /sources/gnash/gnash/gui/images/GnashG.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvs23M2PP and /tmp/cvs1WPTHj differ