* Merged from HEAD

openlink · Oct 15, 2009 · 07259c4 · 07259c4
1 parent 9b11661
commit 07259c4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -20,6 +20,8 @@
 #  
 
 AUTOMAKE_OPTIONS	= gnu
+ACLOCAL_AMFLAGS 	= -I binsrc/config
+
 
 SUBDIRS = . docsrc libsrc binsrc appsrc
 

diff --git a/appsrc/ODS-Framework/vad_version b/appsrc/ODS-Framework/vad_version
@@ -1 +1 @@
-1.62.83
+1.62.85
diff --git a/appsrc/ODS-Framework/version.curr b/appsrc/ODS-Framework/version.curr
@@ -1 +1 @@
-6283
+6285
diff --git a/configure.in b/configure.in
@@ -1579,7 +1579,7 @@ AC_HELP_STRING([--with-malloc-debug], [extra malloc debugging code])],
 
 if test "x$with_malloc_debug" = "xyes"; then
     BUILD_OPTS="$BUILD_OPTS malloc_debug"
-    CCDEBUG="$CCDEBUG -DMTX_DEBUG -DMALLOC_DEBUG"
+    CCDEBUG="$CCDEBUG -DMALLOC_DEBUG"
     CCOPT="$CCOPT -g"
     AM_LDFLAGS="$AM_LDFLAGS -g"
 fi