[Gnash-commit] gnash ChangeLog README configure.ac

[Martin Guy]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Martin Guy <martinwguy> 07/01/29 23:21:01

Modified files:
        .              : ChangeLog README configure.ac 

Log message:
        Remove code and documentation for unimplemented --disable-xml

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2189&r2=1.2190
http://cvs.savannah.gnu.org/viewcvs/gnash/README?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.241&r2=1.242

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2189
retrieving revision 1.2190
diff -u -b -r1.2189 -r1.2190
--- ChangeLog   29 Jan 2007 21:28:10 -0000      1.2189
+++ ChangeLog   29 Jan 2007 23:21:01 -0000      1.2190
@@ -1,6 +1,12 @@
 2007-01-25 Martin Guy <address@hidden>
 
-       *  Remove broken --enable-xmlreader and --enable-dom leaving only dom.
+       * configure.ac, README: Remove code and documentation for
+         --disable-xml
+
+2007-01-25 Martin Guy <address@hidden>
+
+       * configure.ac, server/asobj/xml.cpp: Remove broken
+         --enable-xmlreader and --enable-dom leaving only dom.
 
 2007-01-29 Sandro Santilli <address@hidden>
 

Index: README
===================================================================
RCS file: /sources/gnash/gnash/README,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- README      21 Jan 2007 22:41:02 -0000      1.24
+++ README      29 Jan 2007 23:21:01 -0000      1.25
@@ -1,4 +1,4 @@
-$Id: README,v 1.24 2007/01/21 22:41:02 rsavoye Exp $
+$Id: README,v 1.25 2007/01/29 23:21:01 martinwguy Exp $
 
                    Gnash: the GNU Flash Player
 
@@ -113,8 +113,7 @@
 The GTK support is more developed and featureful, while the SDL
 support has less dependancies on other packages.
 
-Other required packages are libxml2, libpng, libjpeg.  The use of
-libxml2 can be dropped if configured with --disable-xml.
+Other required packages are libxml2, libpng and libjpeg.
 
 At this time the sound support is experimental until the new sound
 support is completed. This will support both Gstreamer and

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -b -r1.241 -r1.242
--- configure.ac        29 Jan 2007 21:28:10 -0000      1.241
+++ configure.ac        29 Jan 2007 23:21:01 -0000      1.242
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.241 2007/01/29 21:28:10 martinwguy Exp $
+dnl $Id: configure.ac,v 1.242 2007/01/29 23:21:01 martinwguy Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -77,26 +77,6 @@
   AC_DEFINE([WRITE_FILE], [], [Write files while streaming])
 fi
 
-dnl Add XML support, if specified.
-AC_ARG_ENABLE(xml, AC_HELP_STRING([--disable-xml], [Disable support for XML 
and XMLSocket]),
-[case "${enableval}" in
-  yes) xml=yes ;;
-  no)  xml=no ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for disable-xml option]) ;;
-esac],xml=yes)
-
-AM_CONDITIONAL(XML, test x$xml = xyes)
-
-dnl Add XML support, if specified.
-AC_ARG_ENABLE(xml, AC_HELP_STRING([--disable-xml], [Disable support for XML 
and XMLSocket]),
-[case "${enableval}" in
-  yes) xml=yes ;;
-  no)  xml=no ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for disable-xml option]) ;;
-esac],xml=yes)
-
-AM_CONDITIONAL(XML, test x$xml = xyes)
-
 dnl Don't build the extensions if specified.
 AC_ARG_ENABLE(extensions, AC_HELP_STRING([--enable-extensions], [Enable 
support for Gnash EXTENSIONS]),
 [case "${enableval}" in
@@ -873,12 +853,6 @@
   echo "        DMalloc support disabled (default). Use --enable-dmalloc to 
enable."
 fi
 
-if test x$xml = xno; then
-  echo "        XML and XMLSocket disabled"
-else
-  echo "        XML and XMLSocket enabled (default). Use --disable-xml to 
disable."
-fi
-
 if test x"$plugin" = x"yes"; then
   echo "        Firefox plugin enabled (default). Use --disable-plugin to 
disable."
 else
@@ -938,8 +912,10 @@
     echo "        XML flags are: $LIBXML_CFLAGS"
     echo "        XML libs are: $LIBXML_LIBS"
   else
-    echo "        ERROR: No libxml2 development package installed!"
-    echo "               Reconfigure with --disable-xml to continue"
+    echo "        ERROR: No libxml2 development package installed!\
+ You need to have the libmesa development package installed\
+ to compile this project or install libxml2-dev (using apt-get)\
+ or libxml2-devel (using yum or rpm)."
     nogo=true
   fi
 fi