[Ocfs-tools-commits] manish commits r145 - in trunk: . ocfs2

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-07-07 13:00:52 -0500 (Wed, 07 Jul 2004)
New Revision: 145

Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/ocfs2/Makefile
Log:
Add check for readline, and don't build debugfs.ocfs2 if it's not there


Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2004-07-07 01:17:25 UTC (rev 144)
+++ trunk/Config.make.in	2004-07-07 18:00:52 UTC (rev 145)
@@ -45,6 +45,7 @@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 
+DEBUGOCFS2 = @DEBUGOCFS2@
 OCFSTOOL = @OCFSTOOL@
 
 OCFS_DEBUG = @OCFS_DEBUG@

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2004-07-07 01:17:25 UTC (rev 144)
+++ trunk/configure.in	2004-07-07 18:00:52 UTC (rev 145)
@@ -148,6 +148,17 @@
 AM_PATH_GLIB($GLIB_REQUIRED_VERSION, :,
   AC_MSG_ERROR([Glib $GLIB_REQUIRED_VERSION or better is required.]))
 
+DEBUGOCFS2=
+
+ocfs_tools_save_LIBS=$LIBS
+LIBS="$LIBS -lncurses"
+AC_CHECK_LIB(readline, readline,
+  [AC_CHECK_HEADER(readline/readline.h,
+    DEBUGOCFS2=yes,
+    [AC_MSG_WARN([readline not found, debugfs.ocfs2 will not be built])])],
+  [AC_MSG_WARN([readline not found, debugfs.ocfs2 will not be built])])
+LIBS=$ocfs_tools_save_LIBS
+
 OCFSTOOL=
 
 AC_ARG_ENABLE(ocfstool, [  --enable-ocfstool=[yes/no]       Build GUI frontend [default=yes]],,enable_ocfstool=yes)

Modified: trunk/ocfs2/Makefile
===================================================================
--- trunk/ocfs2/Makefile	2004-07-07 01:17:25 UTC (rev 144)
+++ trunk/ocfs2/Makefile	2004-07-07 18:00:52 UTC (rev 145)
@@ -2,6 +2,10 @@
 
 include $(TOPDIR)/Preamble.make
 
-SUBDIRS = mkfs.ocfs2 debugfs.ocfs2 libocfs2
+SUBDIRS = mkfs.ocfs2 libocfs2
 
+ifdef DEBUGOCFS2
+SUBDIRS += debugfs.ocfs2
+endif
+
 include $(TOPDIR)/Postamble.make