gnue/geas configure.in src/Makefile.am src/exce...

[Reinhard Mueller]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/05/25 07:47:08

Modified files:
        geas           : configure.in 
        geas/src       : Makefile.am exceptions.c 

Log message:
        removed dmalloc references (dmalloc is no longer used)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/configure.in.diff?cvsroot=OldCVS&tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/Makefile.am.diff?cvsroot=OldCVS&tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/exceptions.c.diff?cvsroot=OldCVS&tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: gnue/geas/configure.in
diff -u gnue/geas/configure.in:1.25 gnue/geas/configure.in:1.26
--- gnue/geas/configure.in:1.25 Thu May 24 14:53:28 2001
+++ gnue/geas/configure.in      Fri May 25 07:47:08 2001
@@ -45,7 +45,6 @@
 AC_DEFUN(PGSQL_INC_CHK,[if test -r $i$1/libpq-fe.h; then PGSQL_DIR=$i; 
PGSQL_INCDIR=$i$1])
 AC_DEFUN(MYSQL_INC_CHK,[if test -r $i$1/mysql.h; then MYSQL_DIR=$i; 
MYSQL_INCDIR=$i$1])
 AC_DEFUN(LIBGDA_INC_CHK,[if test -r $i$1/gda.h; then LIBGDA_DIR=$i; 
LIBGDA_INCDIR=$i$1])
-AC_DEFUN(DMALLOC_INC_CHK,[if test -r $i$1/dmalloc.h; then DMALLOC_DIR=$i; 
DMALLOC_INCDIR=$i$1])
 
 dnl Figure out the requested database
 
@@ -182,40 +181,6 @@
   AC_MSG_RESULT(no)
 fi
 
-dnl DMALLOC tests
-AC_MSG_CHECKING( for dmalloc)
-AC_ARG_WITH(dmalloc,
-    [  --with-dmalloc=DIR       dmalloc location ],
-    [ with_dmalloc=$withval ],
-    [ with_dmalloc=no ]
-    )
-if test "$with_dmalloc" != "no"; then
-    for i in /usr /usr/local /usr/local/dmalloc $with_dmalloc; do
-        DMALLOC_INC_CHK(/include)
-        el[]DMALLOC_INC_CHK(/include/dmalloc)
-       fi
-    done
-
-    if test -z "$DMALLOC_DIR"; then
-       AC_MSG_RESULT(Cannot find dmalloc.h.  Please specify the installation 
path of dmalloc)
-    else
-
-       DMALLOC_INCLUDE="-I$DMALLOC_INCDIR"
-
-       DMALLOC_LIBDIR=$DMALLOC_DIR/lib
-       test -d $DMALLOC_DIR/lib/dmalloc && 
DMALLOC_LIBDIR=$DMALLOC_DIR/lib/dmalloc
-
-       AC_DEFINE(HAS_DMALLOC,1,[ ])
-
-       DMALLOC_CFLAGS="$DMALLOC_INCLUDE"
-       DMALLOC_LIBS="-L$DMALLOC_LIBDIR -ldmalloc"
-  
-       AC_MSG_RESULT(found)
-    fi
-else
-  AC_MSG_RESULT(no)
-fi
-
 if test "x$DB_TYPE" = "x"; then
   AC_MSG_ERROR(No database backend was found.  Please check that you have the 
proper client libraries installed)
 fi
@@ -378,8 +343,6 @@
 AC_SUBST(MYSQL_CFLAGS)
 AC_SUBST(LIBGDA_LIBS)
 AC_SUBST(LIBGDA_CFLAGS)
-AC_SUBST(DMALLOC_LIBS)
-AC_SUBST(DMALLOC_CFLAGS)
 AC_SUBST(NAMESERVICE_LIBS)
 AC_SUBST(METHOD_LIBS)
 AC_SUBST(METHOD_CFLAGS)
@@ -405,5 +368,3 @@
        src/methods/Makefile     \
        tools/Makefile
 )
-
-
Index: gnue/geas/src/Makefile.am
diff -u gnue/geas/src/Makefile.am:1.32 gnue/geas/src/Makefile.am:1.33
--- gnue/geas/src/Makefile.am:1.32      Wed May 16 08:55:16 2001
+++ gnue/geas/src/Makefile.am   Fri May 25 07:47:08 2001
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.32 2001/05/16 15:55:16 reinhard Exp $
+## $Id: Makefile.am,v 1.33 2001/05/25 14:47:08 reinhard Exp $
 
 SUBDIRS        = config objectstore oql objectcache methods datamonitor
 
@@ -32,14 +32,12 @@
        $(GLIB_CFLAGS)    \
        $(DB_CFLAGS)      \
        $(ORBIT_CFLAGS)   \
-       $(DMALLOC_CFLAGS) \
        $(PYTHON_CFLAGS)
 
 LDADD = \
        $(GLIB_LIBS)                               \
        $(DB_LIBS)                                 \
        $(ORBIT_LIBS)                              \
-       $(DMALLOC_LIBS)                            \
        $(NAMESERVICE_LIBS)                        \
        $(top_builddir)/lib/md5/libmd5.a           \
        $(MODULES)                                 \
Index: gnue/geas/src/exceptions.c
diff -u gnue/geas/src/exceptions.c:1.13 gnue/geas/src/exceptions.c:1.14
--- gnue/geas/src/exceptions.c:1.13     Wed Apr 11 21:47:53 2001
+++ gnue/geas/src/exceptions.c  Fri May 25 07:47:08 2001
@@ -28,10 +28,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 
-#ifdef HAS_DMALLOC
-#include <dmalloc.h>
-#endif
-
 #include "geas.h"
 #include "exceptions.h"