[Gnash-commit] gnash libbase/Makefile.am server/Makefile.am se...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/02/11 06:21:30

Modified files:
        libbase        : Makefile.am 
        server         : Makefile.am debugger.cpp 
        server/parser  : Makefile.am 
        server/vm      : Makefile.am 
        utilities      : Makefile.am 
        .              : ChangeLog 
        macros         : gnashpkgtool.m4 pkg.m4 

Log message:
                * libbase/Makefile.am: Add glib and gstreamer cflags, needed 
when
                cross compiling with Gstreamer support.
                * macros/gnashpkgtool.m4: Search_libs after a directory search. 
                * macros/pkg.m4: Use pathlist to find pkg-config.
                * server/Makefile.am:  Add glib and gstreamer cflags, needed 
when
                cross compiling with Gstreamer support.
                * server/debugger.cpp,: Tweak usage 
                * server/parser/Makefile.am: Add libxml, glib, and gstreamer
                cflags, needed when cross compiling with Gstreamer support.
                * server/vm/Makefile.am: Add glib and gstreamer cflags, needed
                when cross compiling with Gstreamer support.
                * utilities/Makefile.am: With GST for sound, include glib and
                gstreamer libraries.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/Makefile.am?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2307&r2=1.2308
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pkg.m4?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- libbase/Makefile.am 9 Feb 2007 16:40:42 -0000       1.57
+++ libbase/Makefile.am 11 Feb 2007 06:21:29 -0000      1.58
@@ -27,11 +27,14 @@
        -I.. -I$(srcdir) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/server  \
+       -I$(top_srcdir)/server/swf      \
        $(PTHREAD_CFLAGS) \
        $(OPENGL_CFLAGS) \
        $(LIBXML_CFLAGS) \
        $(PNG_CFLAGS) \
        $(SDL_CFLAGS) \
+       $(GLIB_CFLAGS) \
+       $(GSTREAMER_CFLAGS) \
        $(CURL_CFLAGS) \
        $(Z_CFLAGS) \
        $(JPEG_CFLAGS) \

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- server/Makefile.am  6 Feb 2007 17:46:24 -0000       1.100
+++ server/Makefile.am  11 Feb 2007 06:21:29 -0000      1.101
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.100 2007/02/06 17:46:24 rsavoye Exp $
+# $Id: Makefile.am,v 1.101 2007/02/11 06:21:29 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -41,6 +41,8 @@
        -I$(top_srcdir) \
        $(PTHREAD_CFLAGS) \
        $(DMALLOC_CFLAGS) \
+       $(GLIB_CFLAGS) \
+       $(GSTREAMER_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(LIBXML_CFLAGS) \
        $(NULL)

Index: server/debugger.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/debugger.cpp 10 Feb 2007 01:30:32 -0000      1.10
+++ server/debugger.cpp 11 Feb 2007 06:21:29 -0000      1.11
@@ -90,8 +90,9 @@
     cerr << "\ti i - Dump Movie Info" << endl;
     cerr << "\ti f - Dump Stack Frame" << endl;
     cerr << "\ti s - Dump symbols" << endl;
-    cerr << "\ti g - Global Regs" << endl;
-    cerr << "\ti l - Local Variables" << endl;
+    cerr << "\ti g - Dump Global Regs" << endl;
+    cerr << "\ti r - Dump Local Regs" << endl;
+    cerr << "\ti l - Dump Local Variables" << endl;
     cerr << "\ti w - Dump watch points" << endl;
     cerr << "\ti b - Dump break points" << endl;
     cerr << "\ti c - Dump Function Call Stack" << endl;

Index: server/parser/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/parser/Makefile.am   9 Feb 2007 16:40:42 -0000       1.21
+++ server/parser/Makefile.am   11 Feb 2007 06:21:29 -0000      1.22
@@ -15,10 +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.21 2007/02/09 16:40:42 tgc Exp $
+# $Id: Makefile.am,v 1.22 2007/02/11 06:21:29 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -39,6 +36,9 @@
         -I$(top_srcdir)/libgeometry \
         -I$(top_srcdir)/libamf \
         -I$(top_srcdir)        \
+       $(LIBXML_CFLAGS) \
+       $(GLIB_CFLAGS) \
+       $(GSTREAMER_CFLAGS) \
        $(PTHREAD_CFLAGS) \
        $(DMALLOC_CFLAGS) \
         $(BOOST_CFLAGS)

Index: server/vm/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/vm/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/vm/Makefile.am       17 Dec 2006 20:24:58 -0000      1.6
+++ server/vm/Makefile.am       11 Feb 2007 06:21:29 -0000      1.7
@@ -1,6 +1,6 @@
 ## Process this file with automake to generate Makefile.in
 # 
-#   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2006, 2007 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
@@ -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.6 2006/12/17 20:24:58 rsavoye Exp $
+# $Id: Makefile.am,v 1.7 2007/02/11 06:21:29 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -31,6 +31,8 @@
         -I$(top_srcdir)/libgeometry \
         -I$(top_srcdir)/libamf \
         -I$(top_srcdir)        \
+       $(GLIB_CFLAGS) \
+       $(GSTREAMER_CFLAGS) \
        $(PTHREAD_CFLAGS) \
        $(DMALLOC_CFLAGS) \
        $(BOOST_CFLAGS) \

Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- utilities/Makefile.am       21 Jan 2007 22:41:02 -0000      1.46
+++ utilities/Makefile.am       11 Feb 2007 06:21:29 -0000      1.47
@@ -64,6 +64,10 @@
  GNASH_LIBS += $(MAD_LIBS)
 endif
 
+#if USE_SOUND_GST
+ GNASH_LIBS += $(GLIB_LIBS) $(GSTREAMER_LIBS)
+#endif
+
 bin_PROGRAMS = gparser gprocessor
 noinst_PROGRAMS = dumpshm
 

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2307
retrieving revision 1.2308
diff -u -b -r1.2307 -r1.2308
--- ChangeLog   10 Feb 2007 18:54:16 -0000      1.2307
+++ ChangeLog   11 Feb 2007 06:21:29 -0000      1.2308
@@ -1,3 +1,19 @@
+2007-02-10  Rob Savoye  <address@hidden>
+
+       * libbase/Makefile.am: Add glib and gstreamer cflags, needed when
+       cross compiling with Gstreamer support.
+       * macros/gnashpkgtool.m4: Search_libs after a directory search. 
+       * macros/pkg.m4: Use pathlist to find pkg-config.
+       * server/Makefile.am:  Add glib and gstreamer cflags, needed when
+       cross compiling with Gstreamer support.
+       * server/debugger.cpp,: Tweak usage 
+       * server/parser/Makefile.am: Add libxml, glib, and gstreamer
+       cflags, needed when cross compiling with Gstreamer support.
+       * server/vm/Makefile.am: Add glib and gstreamer cflags, needed
+       when cross compiling with Gstreamer support.
+       * utilities/Makefile.am: With GST for sound, include glib and
+       gstreamer libraries.
+
 2007-02-10 Markus Gothe <address@hidden>
 
        * server/asobj/Math.cpp: using namespace std;

Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- macros/gnashpkgtool.m4      2 Feb 2007 01:57:57 -0000       1.37
+++ macros/gnashpkgtool.m4      11 Feb 2007 06:21:30 -0000      1.38
@@ -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: gnashpkgtool.m4,v 1.37 2007/02/02 01:57:57 rsavoye Exp $
+dnl $Id: gnashpkgtool.m4,v 1.38 2007/02/11 06:21:30 rsavoye Exp $
 
 dnl Generic macros for finding and setting include-paths and library-path
 dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS().
@@ -174,6 +174,7 @@
        ])
 
        dnl If the header doesn't exist, there is no point looking for the 
library.
+  if test x$cross_compiling = xno; then
        if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_$1_lib}" = x; then
                $PKG_CONFIG --exists libDOWN[] && 
ac_cv_path_$1_lib=`$PKG_CONFIG --libs libDOWN[]`
                $PKG_CONFIG --exists DOWN[] && ac_cv_path_$1_lib=`$PKG_CONFIG 
--libs DOWN[]`
@@ -182,11 +183,11 @@
                AC_MSG_CHECKING([for lib$1 library])      
                AC_MSG_RESULT(${ac_cv_path_$1_lib})
        fi
+  fi
 
        if test x"${ac_cv_path_$1_lib}" = x; then
                ac_save_LIBS=$LIBS
                LIBS=""
-               AC_SEARCH_LIBS($2, $1 $name, [ac_cv_path_$1_lib="$LIBS $5"],[
                for i in $libslist; do
                        if test -f $i/lib$1.a -o -f $i/lib$1.so; then
                                if test -f "$i/lib$1.a" -o -f "$i/lib$1.so"; 
then
@@ -209,10 +210,14 @@
                                        fi
                                fi
                        fi
-               done])      
+               done
                LIBS=$ac_save_LIBS
        fi
 
+       if test x"${ac_cv_path_$1_lib}" = x ; then
+    AC_SEARCH_LIBS($2, $1 $name, [ac_cv_path_$1_lib="$LIBS $5"])
+  fi
+
        if test x"${ac_cv_path_$1_lib}" != x ; then
                UP[]_LIBS="${ac_cv_path_$1_lib}"
                has_$1=yes

Index: macros/pkg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pkg.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- macros/pkg.m4       9 Jan 2007 00:43:43 -0000       1.6
+++ macros/pkg.m4       11 Feb 2007 06:21:30 -0000      1.7
@@ -21,7 +21,7 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# $Id: pkg.m4,v 1.6 2007/01/09 00:43:43 rsavoye Exp $
+# $Id: pkg.m4,v 1.7 2007/02/11 06:21:30 rsavoye Exp $
 
 # PKG_PROG_PKG_CONFIG([MIN-VERSION])
 # ----------------------------------
@@ -31,7 +31,7 @@
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
 if test x$cross_compiling = xno; then
   if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-       AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+    AC_PATH_TOOL([PKG_CONFIG], [pkg-config], ,[${pathlist}])
   fi
   if test -n "$PKG_CONFIG"; then
        _pkg_min_version=m4_ifval([$1], [$1], [0.9.0])