[Gnash-commit] /srv/bzr/gnash/trunk r11500: Don't build the find* utilities when cross compiling. Add the XML flags to keep cross-compiling with gstreamer.

[Rob Savoye]

------------------------------------------------------------
revno: 11500
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Wed 2009-09-09 13:46:50 -0600
message:
  Don't build the find* utilities when cross compiling. Add the XML flags to 
keep cross-compiling with gstreamer.
modified:
  utilities/Makefile.am
  utilities/findmicrophones.cpp
  utilities/findwebcams.cpp

=== modified file 'utilities/Makefile.am'
--- a/utilities/Makefile.am     2009-07-24 20:42:41 +0000
+++ b/utilities/Makefile.am     2009-09-09 19:46:50 +0000
@@ -63,6 +63,8 @@
         -DLOCALEDIR=\"$(localedir)\" \
        $(GSTREAMER_CFLAGS) \
        $(GSTREAMER_PLUGINS_BASE_CFLAGS) \
+       $(LIBXML2_CFLAGS) \
+       $(GLIB_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(PTHREAD_CFLAGS) \
        $(MYSQL_CFLAGS) \
@@ -81,15 +83,21 @@
 if USE_GST_ENGINE
  AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
                -I$(top_srcdir)/libmedia/gst
- GNASH_LIBS += $(GLIB_LIBS) $(GSTREAMER_LIBS)
+ GNASH_LIBS += $(GLIB_LIBS) $(GSTREAMER_LIBS) $(LIBXML2_LIBS)
+if CROSS_COMPILING
+  GNASH_LIBS +=        $(LIBXML2_LIBS) $(GLIB_LIBS)
+endif
 endif
 
 bin_PROGRAMS = gprocessor soldumper dumpshm flvdumper
 #check_PROGRAMS = gdebug.swf
 
 if USE_GST_ENGINE
- bin_PROGRAMS += findwebcams
- bin_PROGRAMS += findmicrophones
+ # seems kindof silly to build these for an embedded target
+if !CROSS_COMPILING
+   bin_PROGRAMS += findwebcams
+   bin_PROGRAMS += findmicrophones
+endif
 endif
 
 gprocessor_SOURCES = processor.cpp

=== modified file 'utilities/findmicrophones.cpp'
--- a/utilities/findmicrophones.cpp     2009-08-07 19:56:42 +0000
+++ b/utilities/findmicrophones.cpp     2009-09-09 19:46:50 +0000
@@ -82,7 +82,7 @@
         gst_element_set_state (element, GST_STATE_PLAYING);
         g_object_get (element, "device-name", &dev_name, NULL);
         gst_element_set_state (element, GST_STATE_NULL);
-        if (g_strcmp0(dev_name, "null") == 0) {
+        if (strcmp(dev_name, "null") == 0) {
             g_print("no pulse audio sources found\n");
         }
         else if ((strstr(dev_name, "Monitor") != NULL)) {

=== modified file 'utilities/findwebcams.cpp'
--- a/utilities/findwebcams.cpp 2009-08-07 19:56:42 +0000
+++ b/utilities/findwebcams.cpp 2009-09-09 19:46:50 +0000
@@ -84,7 +84,7 @@
         gst_element_set_state (element, GST_STATE_PLAYING);
         g_object_get (element, "device-name", &dev_name, NULL);
         gst_element_set_state (element, GST_STATE_NULL);
-        if (g_strcmp0(dev_name, "null") == 0) {
+        if (strcmp(dev_name, "null") == 0) {
             g_print("no v4l video sources found\n");
         }
         else { 
@@ -118,7 +118,7 @@
         gst_element_set_state (element, GST_STATE_PLAYING);
         g_object_get (element, "device-name", &dev_name, NULL);
         gst_element_set_state (element, GST_STATE_NULL);
-        if (g_strcmp0(dev_name, "null") == 0) {
+        if (strcmp(dev_name, "null") == 0) {
             g_print("no v4l2 video sources found.\n");
         }
         else {
@@ -129,7 +129,7 @@
             //mark duplicates (we like v4l2 sources more than v4l, so if
             //they're both detected, mark the v4l source as a duplicate)
             for (g=1; g < (vidVect.size()-1); g++) {
-                if (g_strcmp0(vidVect[numdevs]->deviceName,
+                if (strcmp(vidVect[numdevs]->deviceName,
                         vidVect[g]->deviceName) == 0) {
                     vidVect[g]->duplicate = true;
                     numDuplicates += 1;