[Gnash-commit] /srv/bzr/gnash/trunk r11919: remove all references to libxml2, we don't need to have configure look for it, nor do we use it at all.

[Rob Savoye]

------------------------------------------------------------
revno: 11919
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Sun 2010-02-07 17:05:16 -0700
message:
  remove all references to libxml2, we don't need to have configure look for 
it, nor do we use it at all.
modified:
  configure.ac
  gui/Makefile.am
  libcore/Makefile.am
  libcore/asobj/Makefile.am
  libmedia/Makefile.am
  utilities/Makefile.am

=== modified file 'configure.ac'
--- a/configure.ac      2010-02-05 02:00:37 +0000
+++ b/configure.ac      2010-02-08 00:05:16 +0000
@@ -1835,15 +1835,6 @@
 
 AM_CONDITIONAL(HAVE_SDL, [ test x$has_SDL = xyes ])
 
-dnl
-dnl gstreamer should take care of libxml2 and glib cflags/libs
-dnl
-if test x$cross_compiling = xyes; then
-  if test x$media_handler = xgst; then
-    GNASH_PKG_FIND(libxml2, [libxml/parser.h], [XML2 library], init)   
-  fi
-fi
-
 GNASH_PATH_QT3
 GNASH_PATH_KDE3
 
@@ -1974,9 +1965,9 @@
   GNASH_PKG_FIND(Xft, [Xft.h], [xft library], XftGlyphRender)
 fi
 
-dnl Some systems have a pervered set of dependencies. Although Gnash itself 
uses libXML,
-dnl Fedora Core 6 appears to have a dependency on expat for fontconfig. We 
only need the
-dnl library, but this is the easy wind to find it.
+dnl Some systems have a pervered set of dependencies.
+dnl Fedora Core 6 appears to have a dependency on expat for fontconfig.
+dnl We only need the library, but this is the easy wind to find it.
 GNASH_PKG_FIND(expat, [expat.h], [Expat library], XML_ErrorString)
 
 dnl these conditionals were moved out of kde.m4

=== modified file 'gui/Makefile.am'
--- a/gui/Makefile.am   2010-01-29 04:27:07 +0000
+++ b/gui/Makefile.am   2010-02-08 00:05:16 +0000
@@ -162,8 +162,8 @@
 endif
 
 if USE_GST_ENGINE
-GST_STUFF = $(GSTPBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS) 
$(GSTREAMER_LIBS)  $(LIBXML2_LIBS)
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS) $(LIBXML2_CFLAGS)
+GST_STUFF = $(GSTPBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS) $(GSTREAMER_LIBS)
+AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
 AM_LDFLAGS += $(GST_STUFF)
 endif
 

=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am       2010-02-04 00:01:07 +0000
+++ b/libcore/Makefile.am       2010-02-08 00:05:16 +0000
@@ -42,7 +42,6 @@
        -I$(top_srcdir)/libmedia \
        -I$(top_srcdir)/libsound \
        -I$(top_srcdir)/libamf \
-       $(LIBXML2_CFLAGS) \
        $(PTHREAD_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(BOOST_CFLAGS) \

=== modified file 'libcore/asobj/Makefile.am'
--- a/libcore/asobj/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/libcore/asobj/Makefile.am 2010-02-08 00:05:16 +0000
@@ -48,7 +48,6 @@
        -I$(top_srcdir)/libmedia \
        -I$(top_srcdir)/libsound \
        $(PTHREAD_CFLAGS) \
-       $(LIBXML2_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(FREETYPE2_CFLAGS)

=== modified file 'libmedia/Makefile.am'
--- a/libmedia/Makefile.am      2010-02-03 12:23:38 +0000
+++ b/libmedia/Makefile.am      2010-02-08 00:05:16 +0000
@@ -32,7 +32,6 @@
 libgnashmedia_la_CPPFLAGS = \
        -I$(top_srcdir)/libbase \
        $(PTHREAD_CFLAGS) \
-       $(LIBXML2_CFLAGS) \
        $(OPENGL_CFLAGS) \
        $(PNG_CFLAGS) \
        $(GLIB_CFLAGS) \

=== modified file 'utilities/Makefile.am'
--- a/utilities/Makefile.am     2010-01-29 04:27:07 +0000
+++ b/utilities/Makefile.am     2010-02-08 00:05:16 +0000
@@ -76,7 +76,6 @@
         -DLOCALEDIR=\"$(localedir)\" \
        $(GSTREAMER_CFLAGS) \
        $(GSTREAMER_PLUGINS_BASE_CFLAGS) \
-       $(LIBXML2_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(PTHREAD_CFLAGS) \
@@ -96,9 +95,9 @@
 if USE_GST_ENGINE
  AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
                -I$(top_srcdir)/libmedia/gst
- GNASH_LIBS += $(GLIB_LIBS) $(GSTREAMER_LIBS) $(LIBXML2_LIBS)
+ GNASH_LIBS += $(GLIB_LIBS) $(GSTREAMER_LIBS)
 if CROSS_COMPILING
-  GNASH_LIBS +=        $(LIBXML2_LIBS) $(GLIB_LIBS)
+  GNASH_LIBS +=        $(GLIB_LIBS)
 endif
 endif