[Gnash-commit] /srv/bzr/gnash/trunk r10635: Drop empty DMALLOC and LIBXML flags everywhere and unused

[Benjamin Wolsey]

------------------------------------------------------------
revno: 10635
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Fri 2009-02-27 07:46:40 +0100
message:
  Drop empty DMALLOC and LIBXML flags everywhere and unused
  checks from configure.ac
modified:
  configure.ac
  cygnal/Makefile.am
  extensions/gtk2/Makefile.am
  gui/Makefile.am
  libamf/Makefile.am
  libbase/Makefile.am
  libcore/Makefile.am
  libcore/asobj/Makefile.am
  libcore/parser/Makefile.am
  libcore/vm/Makefile.am
  libmedia/Makefile.am
  libnet/Makefile.am
  plugin/win32/Makefile.am
  pythonmodule/Makefile.am
  testsuite/actionscript.all/Makefile.am
  testsuite/libamf.all/Makefile.am
  testsuite/libbase/Makefile.am

=== modified file 'configure.ac'
--- a/configure.ac      2009-02-26 18:54:43 +0000
+++ b/configure.ac      2009-02-27 06:46:40 +0000
@@ -129,9 +129,9 @@
     darwin=yes
     AC_DEFINE([DARWIN], [1], [this is a Darwin platform])
     ;;
-    dnl Unfortunately, all BSD distributions are not identical, so as tacky as 
it is
-    dnl to look for the distribution name, we don't have much choice. The use 
of these
-    dnl should be avoid as much as possible.
+    dnl Unfortunately, all BSD distributions are not identical, so 
+    dnl as tacky as it is to look for the distribution name, we don't
+    dnl have much choice. The use of these should be avoid as much as possible.
   *-openbsd*)
     bsd=yes
     openbsd=yes
@@ -356,7 +356,7 @@
 AM_CONDITIONAL(SWFTREE, test x$swftree = xyes)
 
 dnl Disable running any tests for "make check". This may sound stupid, but
-dnl this option is designed to soley be used by maintainers in the 
+dnl this option is designed to solely be used by maintainers in the 
 dnl DISTCHECK_CONFIGURE_FLAGS when building packages. Gnash's testing 
infrastructure
 dnl is complex, and often the the testsuites will work, but due to some 
obscure reason,
 dnl make distcheck fails.
@@ -1616,15 +1616,9 @@
 AM_CONDITIONAL(HAVE_SDL, [ test x$has_SDL = xyes ])
 
 dnl
-dnl NOTE: make sure to check for GLIB and LIBXML2 
-dnl before checking for gstreamer
+dnl gstreamer should take care of libxml2 and glib cflags/libs
 dnl
 
-AC_CHECK_SIZEOF(size_t) dnl set SIZEOF_SIZE_T.
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(short)
-
 GNASH_PATH_QT3
 GNASH_PATH_KDE3
 

=== modified file 'cygnal/Makefile.am'
--- a/cygnal/Makefile.am        2009-02-17 03:18:15 +0000
+++ b/cygnal/Makefile.am        2009-02-27 06:46:40 +0000
@@ -40,7 +40,6 @@
        ../libamf/libgnashamf.la \
        $(LIBLTDL) \
        $(GLIB_LIBS) \
-       $(LIBXML_LIBS) \
        $(CURL_LIBS) \
        $(BOOST_LIBS) \
        $(LIBINTL) \
@@ -61,7 +60,6 @@
         -I$(top_srcdir)/libcore/parser \
         -I$(top_srcdir)/libcore/vm \
         -DLOCALEDIR=\"$(localedir)\" \
-        $(LIBXML_CFLAGS) \
        $(CURL_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(PTHREAD_CFLAGS)

=== modified file 'extensions/gtk2/Makefile.am'
--- a/extensions/gtk2/Makefile.am       2009-02-25 22:30:19 +0000
+++ b/extensions/gtk2/Makefile.am       2009-02-27 06:46:40 +0000
@@ -30,9 +30,7 @@
        -I$(top_srcdir)/libcore/vm \
        -I$(top_srcdir)/libcore/parser \
        -I$(top_srcdir)/libcore/asobj \
-       $(LIBXML_CFLAGS) \
        $(SDL_CFLAGS) \
-       $(DMALLOC_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(PTHREAD_CFLAGS) \
        $(GTK2_CFLAGS) \

=== modified file 'gui/Makefile.am'
--- a/gui/Makefile.am   2009-02-25 22:33:03 +0000
+++ b/gui/Makefile.am   2009-02-27 06:46:40 +0000
@@ -49,11 +49,9 @@
        -DLOCALEDIR=\"$(localedir)\" \
        -DPLUGINSDIR=\"$(pluginsdir)\" \
        -DLIBAVCODEC_IDENT=\"$(LIBAVCODEC_IDENT)\" \
-        $(LIBXML_CFLAGS) \
-        $(DMALLOC_CFLAGS) \
        $(LIRC_CFLAGS) \
        $(BOOST_CFLAGS) \
-        $(PTHREAD_CFLAGS) \
+       $(PTHREAD_CFLAGS) \
        $(NULL)
 
 GTK_CFLAGS = \
@@ -86,7 +84,6 @@
        $(GLIB_LIBS) \
        $(LIBLTDL) \
        $(CURL_LIBS) \
-       $(LIBXML_LIBS) \
        $(INCLTDL) \
        $(LIRC_LIBS) \
        $(MYSQL_LIBS) \

=== modified file 'libamf/Makefile.am'
--- a/libamf/Makefile.am        2009-02-25 22:33:03 +0000
+++ b/libamf/Makefile.am        2009-02-27 06:46:40 +0000
@@ -44,8 +44,7 @@
        -I$(top_srcdir)/libcore \
        -I$(top_srcdir)/libbase \
        $(BOOST_CFLAGS) \
-       $(PTHREAD_CFLAGS) \
-        $(LIBXML_CFLAGS)
+       $(PTHREAD_CFLAGS)
 
 AM_LDFLAGS = $(BOOST_LIBS)
 

=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am       2009-02-09 09:29:52 +0000
+++ b/libbase/Makefile.am       2009-02-27 06:46:40 +0000
@@ -55,7 +55,6 @@
        -I$(top_srcdir)/libcore \
        -I$(top_srcdir)/libcore/swf     \
        $(PTHREAD_CFLAGS) \
-       $(LIBXML_CFLAGS) \
        $(PNG_CFLAGS) \
        $(GIF_CFLAGS) \
        $(GLIB_CFLAGS) \

=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am       2009-02-25 22:33:03 +0000
+++ b/libcore/Makefile.am       2009-02-27 06:46:40 +0000
@@ -41,10 +41,8 @@
        -I$(top_srcdir)/libsound \
        -I$(top_srcdir)/libamf \
        $(PTHREAD_CFLAGS) \
-       $(DMALLOC_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(BOOST_CFLAGS) \
-       $(LIBXML_CFLAGS) \
        $(FREETYPE2_CFLAGS) \
        $(FONTCONFIG_CFLAGS) \
        $(NULL)
@@ -220,7 +218,6 @@
        $(top_builddir)/libcore/asobj/libgnashasobjs.la \
        $(top_builddir)/libcore/parser/libgnashparser.la \
        $(top_builddir)/libcore/vm/libgnashvm.la \
-       $(LIBXML_LIBS) \
        $(BOOST_LIBS) \
        $(PTHREAD_LIBS) \
        $(FREETYPE2_LIBS) \

=== modified file 'libcore/asobj/Makefile.am'
--- a/libcore/asobj/Makefile.am 2009-01-22 20:10:39 +0000
+++ b/libcore/asobj/Makefile.am 2009-02-27 06:46:40 +0000
@@ -33,10 +33,8 @@
        -I$(top_srcdir)/libmedia \
        -I$(top_srcdir)/libsound \
        $(PTHREAD_CFLAGS) \
-       $(DMALLOC_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(BOOST_CFLAGS) \
-       $(LIBXML_CFLAGS) \
        $(FREETYPE2_CFLAGS) \
        $(NULL)
 
@@ -176,8 +174,7 @@
 
 libgnashasobjs_la_LIBADD = \
        $(top_builddir)/libamf/libgnashamf.la \
-       $(top_builddir)/libbase/libgnashbase.la \
-       $(LIBXML_LIBS)
+       $(top_builddir)/libbase/libgnashbase.la
 
 if USE_FFMPEG_ENGINE
 AM_CPPFLAGS += $(FFMPEG_CFLAGS) \

=== modified file 'libcore/parser/Makefile.am'
--- a/libcore/parser/Makefile.am        2009-02-25 22:33:03 +0000
+++ b/libcore/parser/Makefile.am        2009-02-27 06:46:40 +0000
@@ -37,10 +37,8 @@
        -I$(top_srcdir)/libmedia \
        -I$(top_srcdir)/libsound \
        -I$(top_srcdir)/libamf \
-       $(LIBXML_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(PTHREAD_CFLAGS) \
-       $(DMALLOC_CFLAGS) \
         $(BOOST_CFLAGS) \
        $(FREETYPE2_CFLAGS) \
        $(NULL)

=== modified file 'libcore/vm/Makefile.am'
--- a/libcore/vm/Makefile.am    2009-02-25 22:33:03 +0000
+++ b/libcore/vm/Makefile.am    2009-02-27 06:46:40 +0000
@@ -34,9 +34,7 @@
     -I$(top_srcdir)/libltdl \
        $(GLIB_CFLAGS) \
        $(PTHREAD_CFLAGS) \
-       $(DMALLOC_CFLAGS) \
        $(BOOST_CFLAGS) \
-       $(LIBXML_CFLAGS) \
        $(FFMPEG_CFLAGS) \
        $(NULL)
 

=== modified file 'libmedia/Makefile.am'
--- a/libmedia/Makefile.am      2009-02-25 22:33:03 +0000
+++ b/libmedia/Makefile.am      2009-02-27 06:46:40 +0000
@@ -35,9 +35,7 @@
        -I$(top_srcdir)/libbase \
        -I$(top_srcdir)/libcore \
        $(PTHREAD_CFLAGS) \
-       $(DMALLOC_CFLAGS) \
        $(OPENGL_CFLAGS) \
-       $(LIBXML_CFLAGS) \
        $(PNG_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(CURL_CFLAGS) \
@@ -51,11 +49,6 @@
 # These headers get installed
 # include_HEADERS = log.h err.h proc.h serial.h xantrex.h outback.h
 
-# Don't build Dmalloc support if it's not configured in
-if HAVE_DMALLOC
-DMALLOC_FILE = dlmalloc.c
-endif
-
 libgnashmedia_la_LIBADD = \
        $(PNG_LIBS) \
        $(JPEG_LIBS) \

=== modified file 'libnet/Makefile.am'
--- a/libnet/Makefile.am        2009-02-25 22:33:03 +0000
+++ b/libnet/Makefile.am        2009-02-27 06:46:40 +0000
@@ -27,7 +27,6 @@
        ../libamf/libgnashamf.la \
        $(LIBLTDL) \
        $(GLIB_LIBS) \
-       $(LIBXML_LIBS) \
        $(CURL_LIBS) \
        $(BOOST_LIBS) \
        $(PTHREAD_LIBS)
@@ -39,8 +38,6 @@
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/libcore \
         -DLOCALEDIR=\"$(localedir)\" \
-        $(LIBXML_CFLAGS) \
-       $(DMALLOC_CFLAGS) \
        $(CURL_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(PTHREAD_CFLAGS)

=== modified file 'plugin/win32/Makefile.am'
--- a/plugin/win32/Makefile.am  2009-02-25 22:33:03 +0000
+++ b/plugin/win32/Makefile.am  2009-02-27 06:46:40 +0000
@@ -54,7 +54,6 @@
        $(EXPAT_LIBS) \
        $(FFMPEG_LIBS) \
        $(JPEG_LIBS) \
-       $(LIBXML_LIBS) \
        $(PNG_LIBS) \
        $(SDL_LIBS) \
        $(NSPR_LIBS) \

=== modified file 'pythonmodule/Makefile.am'
--- a/pythonmodule/Makefile.am  2009-02-25 22:33:03 +0000
+++ b/pythonmodule/Makefile.am  2009-02-27 06:46:40 +0000
@@ -36,7 +36,6 @@
        $(FFMPEG_LIBS) \
        $(GSTREAMER_LIBS) \
        $(CURL_LIBS) \
-       $(LIBXML_LIBS) \
        $(INCLTDL) \
        $(BOOST_LIBS) \
        $(PTHREAD_LIBS) \
@@ -54,8 +53,6 @@
        -I$(top_srcdir)/libmedia/gst \
        -DLOCALEDIR=\"$(localedir)\" \
        $(BOOSTPYTHON_CFLAGS) \
-        $(LIBXML_CFLAGS) \
-        $(DMALLOC_CFLAGS) \
        $(LIRC_CFLAGS) \
        $(BOOST_CFLAGS) \
         $(PTHREAD_CFLAGS) \
@@ -87,8 +84,6 @@
        -DLOCALEDIR=\"$(localedir)\" \
        -DBOOST_PYTHON_DYNAMIC_LIB \
        $(BOOSTPYTHON_CFLAGS) \
-        $(LIBXML_CFLAGS) \
-        $(DMALLOC_CFLAGS) \
        $(LIRC_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(NULL)

=== modified file 'testsuite/actionscript.all/Makefile.am'
--- a/testsuite/actionscript.all/Makefile.am    2009-01-22 20:10:39 +0000
+++ b/testsuite/actionscript.all/Makefile.am    2009-02-27 06:46:40 +0000
@@ -59,9 +59,7 @@
         -I$(top_srcdir)/libcore/vm  \
         -I$(top_srcdir)/libcore/asobj \
        -I$(top_srcdir)/testsuite \
-       $(LIBXML_CFLAGS)        \
        $(OPENGL_CFLAGS)        \
-       $(DMALLOC_CFLAGS)       \
        $(MP3_CFLAGS)           \
        $(OGG_CFLAGS)           \
         $(MING_CFLAGS)         \

=== modified file 'testsuite/libamf.all/Makefile.am'
--- a/testsuite/libamf.all/Makefile.am  2009-02-25 22:33:03 +0000
+++ b/testsuite/libamf.all/Makefile.am  2009-02-27 06:46:40 +0000
@@ -23,7 +23,6 @@
        ../../libamf/libgnashamf.la \
        $(LIBLTDL) \
        $(GLIB_LIBS) \
-       $(LIBXML_LIBS) \
        $(CURL_LIBS) \
        $(BOOST_LIBS) \
        $(DEJAGNU_CFLAGS) \
@@ -37,8 +36,6 @@
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/libcore \
        -I$(top_srcdir)/testsuite \
-        $(LIBXML_CFLAGS) \
-       $(DMALLOC_CFLAGS) \
        $(CURL_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(DEJAGNU_CFLAGS) \

=== modified file 'testsuite/libbase/Makefile.am'
--- a/testsuite/libbase/Makefile.am     2009-02-25 22:33:03 +0000
+++ b/testsuite/libbase/Makefile.am     2009-02-27 06:46:40 +0000
@@ -27,7 +27,6 @@
         -I$(top_srcdir)/libcore  \
         -I$(top_srcdir)/testsuite \
         $(MING_CFLAGS) \
-       $(LIBXML_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(DEJAGNU_CFLAGS) \
        $(NULL)