[Gnash-commit] gnash configure.ac ChangeLog

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/04/30 03:36:28

Modified files:
        .              : configure.ac ChangeLog 

Log message:
                * configure.ac: Don't look for mallinfo() when using jemalloc().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.524&r2=1.525
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6451&r2=1.6452

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -b -r1.524 -r1.525
--- configure.ac        29 Apr 2008 16:50:48 -0000      1.524
+++ configure.ac        30 Apr 2008 03:36:28 -0000      1.525
@@ -288,8 +288,17 @@
   else
     jemalloc=no
   fi
+else
+  AC_TRY_COMPILE([#include <malloc.h>], [
+    struct mallinfo x = mallinfo(); ],
+    mallinfo=yes, mallinfo=no
+  )
+  if test x"${mallinfo}" = x"yes"; then
+    AC_DEFINE(HAVE_MALLINFO, [1], [Has mallinfo()])
+  fi
 fi
 AM_CONDITIONAL(JEMALLOC, test x$jemalloc = xyes)
+AM_CONDITIONAL(HAVE_MALLINFO, [test x$mallinfo = xyes])
 
 AC_ARG_ENABLE(debugger,
   AC_HELP_STRING([--enable-debugger],[Enable the Flash debugger]),
@@ -1170,7 +1179,6 @@
 dnl GNASH_PKG_FIND(dmalloc, [dmalloc.h], [dmalloc], mallinfo)
 AM_CONDITIONAL(HAVE_DMALLOC, [ test x$has_dmalloc = xyes ])
 
-AC_CHECK_FUNCS(mallinfo)
 AC_PATH_TOOL([AUTOTRACE], [autotrace])
 AC_PATH_TOOL([NETCAT], [netcat])
 AC_HEADER_DIRENT
@@ -1279,13 +1287,6 @@
   AC_CHECK_LIB(X11, XDisableAccessControl)
 dnl fi
 AM_CONDITIONAL(HAVE_X11, [test x$x11 = xyes])
-
-AC_TRY_COMPILE([#include <malloc.h>], [
-  struct mallinfo x = mallinfo(); ],
-  AC_DEFINE(HAVE_MALLINFO, [1], [Has mallinfo()])
-)
-AM_CONDITIONAL(HAVE_MALLINFO, [test x$HAVE_MALLINFO = xyes -a x$jemalloc = 
xyes])
-
 AC_CHECK_LIB(rt, shm_unlink)
 AC_CHECK_FUNCS(shm_open shm_unlink)
 AC_TRY_COMPILE([#include <strings.h>], [

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6451
retrieving revision 1.6452
diff -u -b -r1.6451 -r1.6452
--- ChangeLog   30 Apr 2008 03:35:30 -0000      1.6451
+++ ChangeLog   30 Apr 2008 03:36:28 -0000      1.6452
@@ -1,5 +1,7 @@
 2008-04-29  Rob Savoye  <address@hidden>
 
+       * configure.ac: Don't look for mallinfo() when using jemalloc().
+       
        * libamf/amf.h: Use _AMF0* on Element types.
        * libamf/amf.cpp: Use AMF0_* instead of just AMF_*. Remove junk
        that's been commented out for awhile. Rename *Variable to