[Commit-gnue] gnue/objectserver Makefile.am configure.in serv...

[Jade Meskill]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jade Meskill <address@hidden>   00/09/21 10:08:54

Modified files:
        objectserver   : Makefile.am configure.in 
        objectserver/server: Makefile.am 
Added files:
        objectserver/idl: .cvsignore Makefile.am 

Log message:
        Added Makefile.am to idl directory so the idl files will be picked up 
in a make dist
        Added more dependency checks in configure.in
        Modified server/Makefile.am to use dependency check variables from 
configure

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/objectserver/Makefile.am.diff?r1=1.2&r2=1.3
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/objectserver/configure.in.diff?r1=1.6&r2=1.7
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/objectserver/idl/.cvsignore.diff?r1=NONE&r2=1.1
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/objectserver/idl/Makefile.am.diff?r1=NONE&r2=1.1
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/objectserver/server/Makefile.am.diff?r1=1.3&r2=1.4

Patches:
Index: gnue/objectserver/Makefile.am
diff -u gnue/objectserver/Makefile.am:1.2 gnue/objectserver/Makefile.am:1.3
--- gnue/objectserver/Makefile.am:1.2   Wed Sep 20 16:21:36 2000
+++ gnue/objectserver/Makefile.am       Thu Sep 21 10:08:53 2000
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS    = demo lib cld_parser server
+SUBDIRS    = idl demo lib cld_parser server
 
-EXTRA_DIST = TODO autogen.sh
+EXTRA_DIST = TODO
Index: gnue/objectserver/configure.in
diff -u gnue/objectserver/configure.in:1.6 gnue/objectserver/configure.in:1.7
--- gnue/objectserver/configure.in:1.6  Thu Sep 21 09:36:27 2000
+++ gnue/objectserver/configure.in      Thu Sep 21 10:08:53 2000
@@ -48,6 +48,7 @@
 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(DOTCONF_INC_CHK,[if test -r $i$1/dotconf.h; then DOTCONF_DIR=$i; 
DOTCONF_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
 
@@ -135,7 +136,7 @@
        MYSQL_LIBDIR=$MYSQL_DIR/lib
        test -d $MYSQL_DIR/lib/mysql && MYSQL_LIBDIR=$MYSQL_DIR/lib/mysql
 
-        MYSQL_CFLAGS="$MYSQL_INCLUDE"
+       MYSQL_CFLAGS="$MYSQL_INCLUDE"
        MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient"
   
        AC_DEFINE(USE_MYSQL,1,[ ])
@@ -186,6 +187,40 @@
 dotconf not found.  Please download and install the latest dotconf from 
http://azzit.de/dotconf.])
 fi
 
+dnl DMALLOC tests
+AC_MSG_CHECKING( for dmalloc)
+AC_ARG_WITH(dmalloc,
+    [  --with-dmalloc=DIR       dmalloc location ],
+    [ with_dmalloc=$withval ],
+    [ with_dmalloc=yes ]
+    )
+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(USE_DMALLOC,1,[ ])
+
+       DMALLOC_CFLAGS="$DMALLOC_INCLUDE -DUSE_DMALLOC"
+       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
@@ -202,8 +237,11 @@
 AC_SUBST(MYSQL_CFLAGS)
 AC_SUBST(DOTCONF_LIBS)
 AC_SUBST(DOTCONF_CFLAGS)
+AC_SUBST(DMALLOC_LIBS)
+AC_SUBST(DMALLOC_CFLAGS)
 
 AC_OUTPUT(Makefile \
+         idl/Makefile \
          lib/Makefile \
          lib/ddlparse/Makefile \
           cld_parser/Makefile \
Index: gnue/objectserver/server/Makefile.am
diff -u gnue/objectserver/server/Makefile.am:1.3 
gnue/objectserver/server/Makefile.am:1.4
--- gnue/objectserver/server/Makefile.am:1.3    Thu Sep 21 09:36:27 2000
+++ gnue/objectserver/server/Makefile.am        Thu Sep 21 10:08:54 2000
@@ -7,7 +7,8 @@
        $(GLIB_CFLAGS) \
        $(DB_CFLAGS)   \
        $(ORBIT_CFLAGS) \
-       $(DOTCONF_CFLAGS)
+       $(DOTCONF_CFLAGS) \
+       $(DMALLOC_CFLAGS)
 
 LDADD = \
         $(top_builddir)/lib/ddlparse/libddlparse.a \
@@ -15,8 +16,8 @@
        $(DB_LIBS)      \
        $(ORBIT_LIBS)   \
        $(DOTCONF_LIBS) \
-       -ll             \
-       -ldmalloc
+       $(DMALLOC_CFLAGS) \
+       -ll
 
 IDL_FILES = \
        $(top_builddir)/idl/gedi.idl \