[Gnash-commit] gnash ./ChangeLog ./configure.ac libbase/utilit...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/01/23 20:37:19

Modified files:
        .              : ChangeLog configure.ac 
        libbase        : utility.cpp 
        backend        : Makefile.am 
        plugin         : Makefile.am 
        server         : Makefile.am 
        utilities      : Makefile.am 
Added files:
        macros         : dmalloc.m4 

Log message:
        * configure.ac: Use new DMALLOC test.
        * macros/dmalloc.m4: New macro for dmalloc support.
        * utilities/Makefile.am: Add support for dmalloc.
        * server/Makefile.am: Add support for dmalloc.
        * backend/Makefile.am: Add support for dmalloc.
        * plugin/Makefile.am: Add support for dmalloc.
        * libbase/utility.cpp: Only build if we have mallinfo.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/utility.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/Makefile.am.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/Makefile.am.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.am.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/utilities/Makefile.am.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/dmalloc.m4?rev=1.1

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.35 gnash/ChangeLog:1.36
--- gnash/ChangeLog:1.35        Mon Jan 23 17:21:25 2006
+++ gnash/ChangeLog     Mon Jan 23 20:37:19 2006
@@ -1,3 +1,13 @@
+2006-01-23  Rob Savoye  <address@hidden>
+
+       * configure.ac: Use new DMALLOC test.
+       * macros/dmalloc.m4: New macro for dmalloc support.
+       * utilities/Makefile.am: Add support for dmalloc.
+       * server/Makefile.am: Add support for dmalloc.
+       * backend/Makefile.am: Add support for dmalloc.
+       * plugin/Makefile.am: Add support for dmalloc.
+       * libbase/utility.cpp: Only build if we have mallinfo. 
+
 2006-01-23 Michael Carlson <address@hidden>
 
        * server/action.h: Create utility funcs as_value::is_inf, is_nan
Index: gnash/backend/Makefile.am
diff -u gnash/backend/Makefile.am:1.7 gnash/backend/Makefile.am:1.8
--- gnash/backend/Makefile.am:1.7       Mon Jan 23 05:30:57 2006
+++ gnash/backend/Makefile.am   Mon Jan 23 20:37:19 2006
@@ -37,6 +37,7 @@
         $(SDL_CFLAGS)          \
         $(SDL_MIXER_LIBS)      \
         $(OPENGL_LIBS)         \
+       $(DMALLOC_LIBS)         \
        $(MP3_LIBS)             \
         $(OGG_LIBS)            \
         $(VORBIS_LIBS)
@@ -49,6 +50,7 @@
         $(SDL_MIXER_CFLAGS)    \
        $(LIBXML_CFLAGS)        \
        $(OPENGL_CFLAGS)        \
+       $(DMALLOC_CFLAGS)               \
        $(MP3_CFLAGS)           \
        $(OGG_CFLAGS)           \
        $(VORBIS_CFLAGS)
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.16 gnash/configure.ac:1.17
--- gnash/configure.ac:1.16     Mon Jan 23 16:47:00 2006
+++ gnash/configure.ac  Mon Jan 23 20:37:19 2006
@@ -28,13 +28,13 @@
 AM_MAINTAINER_MODE
 AC_PROG_MAKE_SET
 
-dnl Use the POSIX Threads library, if specified.
-AC_ARG_ENABLE(pthreads, [  --enable-pthreads       Enable support for 
pthreads],
-[case "${enableval}" in
-  yes) pthreads=yes ;;
-  no)  pthreads=no ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for enable-pthreads option]) ;;
-esac], pthreads=yes)
+dnl dnl Use the POSIX Threads library, if specified.
+dnl AC_ARG_ENABLE(pthreads, [  --enable-pthreads       Enable support for 
pthreads],
+dnl [case "${enableval}" in
+dnl   yes) pthreads=yes ;;
+dnl   no)  pthreads=no ;;
+dnl   *)   AC_MSG_ERROR([bad value ${enableval} for enable-pthreads option]) ;;
+dnl esac], pthreads=yes)
 
 dnl if test x$pthreads = xyes; then
 dnl     AC_DEFINE([HAVE_PTHREADS], [], [Use POSIX Threads])
@@ -65,22 +65,6 @@
     AC_DEFINE([FIX_I810_LOD_BIAS], [], [Fix i810 LOD bias problem])
 fi
 
-dnl Use the DMalloc library, if specified.
-AC_ARG_ENABLE(dmalloc, [  --enable-dmalloc        Enable support for DMalloc],
-[case "${enableval}" in
-  yes) dmalloc=yes ;;
-  no)  dmalloc=no ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for enable-malloc option]) ;;
-esac])
-
-if test x$dmalloc = xyes; then
-    AC_DEFINE([USE_DMALLOC], [], [Use DMalloc])
-    DMALLOC_LIB="-ldmallocxx"
-else
-    DMALLOC_LIB=""
-fi
-AC_SUBST(DMALLOC_LIB)
-
 dnl Use the Dom parser from libxml2, not the xmlReader one
 dnl The default is to use the Dom parser
 dom=yes
@@ -140,15 +124,16 @@
 AC_PROG_CC
 AC_PROG_CXX
 AC_EXEEXT
-AM_COMPILER_LIB
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
+AM_COMPILER_LIB
+GNASH_PATH_DMALLOC
+AC_CHECK_FUNCS(mallinfo)
 
+AC_PATH_XTRA
 AM_PATH_ZLIB
 AM_PATH_JPEG
 AM_PATH_PNG
-AM_PATH_MP3
-AC_PATH_XTRA
 
 AC_CHECK_HEADER(X11/Xmu/Xmu.h)
 LIBS_SAVE="$LIBS"
@@ -160,6 +145,7 @@
 ]))
 LIBS="$LIBS_SAVE"
 
+AM_PATH_MP3
 XIPH_PATH_OGG
 XIPH_PATH_VORBIS
 AM_PATH_SDL
@@ -223,8 +209,8 @@
 
 if test x"$dmalloc" = x"yes"; then
   echo "        DMalloc support enabled"
-  echo "        For a list of the command-line options enter: dmalloc --usa"
-  dnl dmalloc
+  echo "        For a list of the command-line options enter: dmalloc --usage"
+
 else
   echo "        DMalloc support disabled (default)"
 fi
Index: gnash/libbase/utility.cpp
diff -u gnash/libbase/utility.cpp:1.1 gnash/libbase/utility.cpp:1.2
--- gnash/libbase/utility.cpp:1.1       Tue Dec 20 20:57:00 2005
+++ gnash/libbase/utility.cpp   Mon Jan 23 20:37:19 2006
@@ -1,28 +1,28 @@
-// utility.cpp -- by Thatcher Ulrich <address@hidden>
+//   Copyright (C) 2005, 2006 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
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-// This source code has been donated to the Public Domain.  Do
-// whatever you want with it.
-
-// Various little utility functions, macros & typedefs.
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "utility.h"
 #include "dlmalloc.h"
 
-#ifdef _WIN32
-#ifndef NDEBUG
-
-int    tu_testbed_assert_break(const char* filename, int linenum, const char* 
expression)
-{
-       // @@ TODO output print error message
-       __asm { int 3 }
-       return 0;
-}
-
-#endif // not NDEBUG
-#endif // _WIN32
-
-
-#ifdef USE_DL_MALLOC
+#ifdef HAVE_DMALLOC
 
 // Overrides of new/delete that use Doug Lea's malloc.  Very helpful
 // on certain lame platforms.
@@ -46,20 +46,18 @@
 {
        if (ptr) dlfree(ptr);
 }
-
-#endif // USE_DL_MALLOC
+// end of HAVE_DMALLOC
+#endif
 
 
 void dump_memory_stats(const char *from, int line, const char *label) 
 // Dump the internal statistics from malloc() so we can track memory leaks
 {
 
-// This doesn't compile on Windows.
-#if  !defined(_WIN32) && !defined(__APPLE_CC__)
   
 // This does not work with DMALLOC, since the internal data structures
 // differ.
-#ifndef USE_DMALLOC
+#ifdef HAVE_MALLINFO
 
        struct mallinfo mi;
        static int allocated = 0;
@@ -87,9 +85,11 @@
        //  allocated = mi.uordblks;
        //}  
 
-// USE_DMALLOC
-#endif
-
-// _WIN32
+// HAVE_MALLINFO
 #endif
 }
+
+// Local Variables:
+// mode: C++
+// indent-tabs-mode: t
+// End:
Index: gnash/plugin/Makefile.am
diff -u gnash/plugin/Makefile.am:1.4 gnash/plugin/Makefile.am:1.5
--- gnash/plugin/Makefile.am:1.4        Mon Jan 23 05:30:57 2006
+++ gnash/plugin/Makefile.am    Mon Jan 23 20:37:19 2006
@@ -26,6 +26,11 @@
 MP3_LIBS = $(MAD_LIBS)
 endif
 
+# if DMALLOC
+# MALL_CFLAGS = $(DMALLOC_CFLAGS)
+# MALL_LIBS = $(DMALLOC_LIBS)
+# endif
+
 plugindir   = $(FIREFOX_PLUGINS)
 
 INCLUDES = -I.. \
@@ -39,6 +44,7 @@
        $(SDL_CFLAGS)           \
        $(SDL_MIXER_CFLAGS)     \
        $(X_CFLAGS)             \
+       $(DMALLOC_CFLAGS)               \
        $(MP3_CFLAGS)           \
        $(OGG_CFLAGS)           \
        $(VORBIS_CFLAGS)
@@ -57,14 +63,15 @@
        $(LIBXML_LIBS)          \
        $(JPEG_LIBS)            \
        $(PNG_LIBS)             \
-       $(MP3_LIBS)             \
+       $(DMALLOC_LIBS)         \
+       $(DMALLOC_LIBS)         \
        $(OGG_LIBS)             \
         $(VORBIS_LIBS)
 
 
 plugin_LTLIBRARIES = libgnash.la
 
-noinst_HEADERS = plugin.h
+noinst_HEADERS = plugin.h ogl_sdl.h
 
 libgnash_la_SOURCES  = plugin.cpp
 libgnash_la_LIBADD   =         $(AM_LDFLAGS) \
Index: gnash/server/Makefile.am
diff -u gnash/server/Makefile.am:1.7 gnash/server/Makefile.am:1.8
--- gnash/server/Makefile.am:1.7        Mon Jan 23 16:04:19 2006
+++ gnash/server/Makefile.am    Mon Jan 23 20:37:19 2006
@@ -26,12 +26,13 @@
 
 # Only enable if we're configured with --enable-mp3
 INCLUDES = -I.. \
-        -I$(top_srcdir) \
+        -I$(top_srcdir)                \
         -I$(top_srcdir)/libbase \
-        -I$(top_srcdir) \
-        $(ENGINE_INCLUDE) \
-        $(ZLIB_CFLAGS) \
-        $(SDL_MIXER_CFLAGS) \
+        -I$(top_srcdir)                \
+        $(ENGINE_INCLUDE)      \
+        $(ZLIB_CFLAGS)         \
+        $(SDL_MIXER_CFLAGS)    \
+       $(DMALLOC_CFLAGS)       \
         $(LIBXML_CFLAGS)
 
 if MP3
Index: gnash/utilities/Makefile.am
diff -u gnash/utilities/Makefile.am:1.4 gnash/utilities/Makefile.am:1.5
--- gnash/utilities/Makefile.am:1.4     Mon Jan 23 05:30:57 2006
+++ gnash/utilities/Makefile.am Mon Jan 23 20:37:19 2006
@@ -35,17 +35,19 @@
        $(JPEG_LIBS)        \
        $(PNG_LIBS)         \
         $(LIBXML_LIBS)      \
+       $(DMALLOC_LIBS)     \
        $(MP3_LIBS)         \
        $(OGG_LIBS)         \
         $(VORBIS_LIBS)
 
 INCLUDES = -I.. \
-        -I$(top_srcdir) \
+        -I$(top_srcdir)                \
         -I$(top_srcdir)/libbase \
-        -I$(top_srcdir)/server \
+        -I$(top_srcdir)/server  \
         -I$(top_srcdir)/libgeometry \
        $(LIBXML_CFLAGS)        \
        $(OPENGL_CFLAGS)        \
+       $(DMALLOC_CFLAGS)       \
        $(MP3_CFLAGS)           \
        $(OGG_CFLAGS)           \
        $(VORBIS_CFLAGS)        \