[Ocfs-tools-commits] jlbec commits r116 - in trunk: . ocfs2/libocfs2

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-06-29 13:04:59 -0500 (Tue, 29 Jun 2004)
New Revision: 116

Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/ocfs2/libocfs2/Makefile
   trunk/ocfs2/libocfs2/memory.c
   trunk/ocfs2/libocfs2/unix_io.c
Log:

o Some more OCFS2_DEBUG_EXE work, mostly in configure.
o Some features.h stuff.



Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2004-06-29 01:26:29 UTC (rev 115)
+++ trunk/Config.make.in	2004-06-29 18:04:59 UTC (rev 116)
@@ -51,3 +51,5 @@
 OCFS_MEMDEBUG = @OCFS_MEMDEBUG@
 OCFS_TRACE = @OCFS_TRACE@
 OCFS_PROCESSOR = @OCFS_PROCESSOR@
+
+OCFS2_DEBUG_EXE = @OCFS2_DEBUG_EXE@

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2004-06-29 01:26:29 UTC (rev 115)
+++ trunk/configure.in	2004-06-29 18:04:59 UTC (rev 116)
@@ -131,6 +131,15 @@
 fi
 AC_SUBST(COM_ERR_LIBS)
 
+AC_MSG_CHECKING(for debug executables)
+AC_ARG_ENABLE(debugexe, [  --enable-debugexe=[yes/no]     Enable debug executables for library source files [default=no]],,enable_debugexe=no)
+OCFS2_DEBUG_EXE=
+if test "x$enable_debugexe" = "xyes"; then
+    OCFS2_DEBUG_EXE=yes
+fi
+AC_SUBST(OCFS2_DEBUG_EXE)
+AC_MSG_RESULT($enable_debugexe)
+
 GLIB_REQUIRED_VERSION=1.2.8
 GTK_REQUIRED_VERSION=1.2.8
 

Modified: trunk/ocfs2/libocfs2/Makefile
===================================================================
--- trunk/ocfs2/libocfs2/Makefile	2004-06-29 01:26:29 UTC (rev 115)
+++ trunk/ocfs2/libocfs2/Makefile	2004-06-29 18:04:59 UTC (rev 116)
@@ -31,12 +31,12 @@
 CFLAGS += $(OPTIMIZE)
 
 ifneq ($(OCFS2_DEBUG_EXE),)
-DEFINES += -DDEBUG_EXE
-
 BIN_PROGRAMS += unix_io
 
-unix_io: unix_io.o memory.o ocfs2_err.o
-	$(LINK)	$(COM_ERR) $(COM_ERR_LIBS)
+unix_io: unix_io.c libocfs2.a
+	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(LOCAL_CPPFLAGS) \
+		$(INCLUDES) $(DEFINES) $(VERMAGIC) \
+		$(COM_ERR_LIBS) -DDEBUG_EXE -o $@ $^
 
 endif
 CFILES = 		\

Modified: trunk/ocfs2/libocfs2/memory.c
===================================================================
--- trunk/ocfs2/libocfs2/memory.c	2004-06-29 01:26:29 UTC (rev 115)
+++ trunk/ocfs2/libocfs2/memory.c	2004-06-29 18:04:59 UTC (rev 116)
@@ -28,7 +28,7 @@
  *  	2002 by Theodore Ts'o.
  */
 
-#define _XOPEN_SOURCE 600
+#define _XOPEN_SOURCE 600  /* Triggers XOPEN2K in features.h */
 #define _LARGEFILE64_SOURCE
 
 #include <string.h>

Modified: trunk/ocfs2/libocfs2/unix_io.c
===================================================================
--- trunk/ocfs2/libocfs2/unix_io.c	2004-06-29 01:26:29 UTC (rev 115)
+++ trunk/ocfs2/libocfs2/unix_io.c	2004-06-29 18:04:59 UTC (rev 116)
@@ -28,7 +28,7 @@
  *  	2002 by Theodore Ts'o.
  */
 
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 600  /* Triggers ISOC99, UNIX98 in features.h */
 #define _LARGEFILE64_SOURCE
 
 #include <string.h>
@@ -284,7 +284,7 @@
 
 static void dump_block(int64_t blkno, int blksize, char *buf)
 {
-	int offset, i;
+	int i;
 	uint32_t *vals = (uint32_t *)buf;
 
 	fprintf(stdout, "Dumping block %lld (%d bytes):\n", blkno,