[Gnash-commit] gnash configure.ac macros/dmalloc.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/11/25 18:38:33

Modified files:
        .              : configure.ac 
Removed files:
        macros         : dmalloc.m4 

Log message:
        Got rid of this one too.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.207&r2=1.208
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/dmalloc.m4?cvsroot=gnash&r1=1.8&r2=0

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -b -r1.207 -r1.208
--- configure.ac        25 Nov 2006 18:35:36 -0000      1.207
+++ configure.ac        25 Nov 2006 18:38:33 -0000      1.208
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.207 2006/11/25 18:35:36 nihilus Exp $
+dnl $Id: configure.ac,v 1.208 2006/11/25 18:38:33 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -303,7 +303,7 @@
 AC_EXEEXT
 AC_PROG_INSTALL
 AM_COMPILER_LIB
-GNASH_PATH_DMALLOC
+GNASH_PKG_FIND(dmalloc, [dmalloc.h], [dmalloc], mallinfo)
 AC_CHECK_FUNCS(mallinfo)
 PKG_PROG_PKG_CONFIG
 dnl LIBS+="-L/usr/lib64"

Index: macros/dmalloc.m4
===================================================================
RCS file: macros/dmalloc.m4
diff -N macros/dmalloc.m4
--- macros/dmalloc.m4   29 Oct 2006 18:34:10 -0000      1.8
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,134 +0,0 @@
-dnl  
-dnl    Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl  
-dnl  This program is free software; you can redistribute it and/or modify
-dnl  it under the terms of the GNU General Public License as published by
-dnl  the Free Software Foundation; either version 2 of the License, or
-dnl  (at your option) any later version.
-dnl  
-dnl  This program is distributed in the hope that it will be useful,
-dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl  GNU General Public License for more details.
-dnl  You should have received a copy of the GNU General Public License
-dnl  along with this program; if not, write to the Free Software
-dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-dnl  
-dnl 
-
-AC_DEFUN([GNASH_PATH_DMALLOC],
-[
-  AC_ARG_ENABLE(dmalloc, AC_HELP_STRING([--enable-dmalloc], [Enable support 
for dmalloc]),
-  [case "${enableval}" in
-    yes) dmalloc=yes ;;
-    no)  dmalloc=no ;;
-    *)   AC_MSG_ERROR([bad value ${enableval} for enable-dmalloc option]) ;;
-  esac], dmalloc=no)
-
-  if test x"$dmalloc" = x"yes"; then
-    dnl Look for the header
-  AC_ARG_WITH(dmalloc_incl, AC_HELP_STRING([--with-dmalloc-incl], [directory 
where libdmalloc header is]), with_dmalloc_incl=${withval})
-    AC_CACHE_VAL(ac_cv_path_dmalloc_incl,[
-    if test x"${with_dmalloc_incl}" != x ; then
-      if test -f ${with_dmalloc_incl}/dmalloc.h ; then
-       ac_cv_path_dmalloc_incl=`(cd ${with_dmalloc_incl}; pwd)`
-      else
-       AC_MSG_ERROR([${with_dmalloc_incl} directory doesn't contain dmalloc.h])
-      fi
-    fi
-    ])
-
-    dnl If the path hasn't been specified, go look for it.
-    if test x"${ac_cv_path_dmalloc_incl}" = x; then
-      AC_CHECK_HEADERS(dmalloc.h, [ac_cv_path_dmalloc_incl=""],[
-      if test x"${ac_cv_path_dmalloc_incl}" = x; then
-        AC_MSG_CHECKING([for libdmalloc header])
-        incllist="/sw/include /usr/local/include /home/latest/include 
/opt/include /usr/include .. ../.."
-
-        for i in $incllist; do
-         if test -f $i/dmalloc.h; then
-           if test x"$i" != x"/usr/include"; then
-             ac_cv_path_dmalloc_incl="-I$i"
-             break
-            else
-             ac_cv_path_dmalloc_incl=""
-             break
-           fi
-         fi
-        done
-      fi])
-    else
-      AC_MSG_RESULT(-I${ac_cv_path_dmalloc_incl})
-      if test x"${ac_cv_path_dmalloc_incl}" != x"/usr/include"; then
-       ac_cv_path_dmalloc_incl="-I${ac_cv_path_dmalloc_incl}"
-       else
-       ac_cv_path_dmalloc_incl=""
-      fi
-    fi
-
-    if test x"${ac_cv_path_dmalloc_incl}" != x ; then
-      DMALLOC_CFLAGS="${ac_cv_path_dmalloc_incl}"
-      AC_MSG_RESULT(${ac_cv_path_dmalloc_incl})
-    else
-      DMALLOC_CFLAGS=""
-    fi
-
-      dnl Look for the library
-      AC_ARG_WITH(dmalloc_lib, AC_HELP_STRING([--with-dmalloc-lib], [directory 
where dmalloc library is]), with_dmalloc_lib=${withval})
-      AC_CACHE_VAL(ac_cv_path_dmalloc_lib,[
-      if test x"${with_dmalloc_lib}" != x ; then
-        if test -f ${with_dmalloc_lib}/libdmalloc.a -o -f 
${with_dmalloc_lib}/libdmalloc.so; then
-         ac_cv_path_dmalloc_lib=`(cd ${with_dmalloc_incl}; pwd)`
-        else
-         AC_MSG_ERROR([${with_dmalloc_lib} directory doesn't contain 
libdmalloc.])
-        fi
-      fi
-      ])
-
-      dnl If the header doesn't exist, there is no point looking for the 
library.
-      if test x"${ac_cv_path_dmalloc_lib}" = x; then
-        AC_CHECK_LIB(dmalloc, mallinfo, [ac_cv_path_dmalloc_lib="-ldmalloc"],[
-          AC_MSG_CHECKING([for libdmalloc library])
-          libslist="/usr/lib64 /usr/lib /sw/lib /usr/local/lib 
/home/latest/lib /opt/lib .. ../.."
-          for i in $libslist; do
-           if test -f $i/libdmalloc.a -o -f $i/libdmalloc.so; then
-             if test x"$i" != x"/usr/lib"; then
-               ac_cv_path_dmalloc_lib="-L$i"
-                AC_MSG_RESULT(${ac_cv_path_dmalloc_lib})
-               break
-              else
-               ac_cv_path_dmalloc_lib=""
-                AC_MSG_RESULT(yes)
-               break
-             fi
-           fi
-          done])
-      else
-        if test -f ${ac_cv_path_dmalloc_lib}/libdmalloc.a -o -f 
${ac_cv_path_dmalloc_lib}/libdmalloc.so; then
-
-          if test x"${ac_cv_path_dmalloc_lib}" != x"/usr/lib"; then
-           ac_cv_path_dmalloc_lib="-I${ac_cv_path_dmalloc_lib}"
-           else
-           ac_cv_path_dmalloc_lib=""
-          fi
-        fi
-      fi
-
-      if test x"${ac_cv_path_dmalloc_lib}" != x ; then
-        DMALLOC_LIBS="${ac_cv_path_dmalloc_lib}"
-      else
-        DMALLOC_LIBS=""
-      fi
-    fi
-
-  if test x"${ac_cv_path_dmalloc_lib}" != x ; then
-      DMALLOC_LIBS="${ac_cv_path_dmalloc_lib}"
-      AC_DEFINE(HAVE_DMALLOC, , [Defined if DMALLOC usage is enabled])
-  fi
-
-  AM_CONDITIONAL(DMALLOC, [test x$dmalloc = xyes])
-
-  AC_SUBST(DMALLOC_CFLAGS)
-  AC_SUBST(DMALLOC_LIBS)
-])