[Ocfs-tools-commits] jlbec commits r149 - trunk

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-07-08 15:03:00 -0500 (Thu, 08 Jul 2004)
New Revision: 149

Modified:
   trunk/Config.make.in
   trunk/Makefile
   trunk/configure.in
Log:

o Add enable/disable of ocfs/ocfs2 building.



Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2004-07-08 19:10:25 UTC (rev 148)
+++ trunk/Config.make.in	2004-07-08 20:03:00 UTC (rev 149)
@@ -35,8 +35,7 @@
 
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-
+LDFLAGS = @LDFLAGS@ 
 COM_ERR_LIBS = @COM_ERR_LIBS@
 
 GLIB_CFLAGS = @GLIB_CFLAGS@
@@ -45,8 +44,11 @@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 
+BUILD_OCFS = @BUILD_OCFS@
+BUILD_OCFS2 = @BUILD_OCFS2@
+BUILD_OCFSTOOL = @BUILD_OCFSTOOL@
+
 DEBUGOCFS2 = @DEBUGOCFS2@
-OCFSTOOL = @OCFSTOOL@
 
 OCFS_DEBUG = @OCFS_DEBUG@
 OCFS_MEMDEBUG = @OCFS_MEMDEBUG@

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2004-07-08 19:10:25 UTC (rev 148)
+++ trunk/Makefile	2004-07-08 20:03:00 UTC (rev 149)
@@ -22,9 +22,17 @@
 $(error could not detect architecture for tools)
 endif
 
-SUBDIRS = ocfs ocfs2 load_ocfs ocfs_uid_gen
+SUBDIRS = load_ocfs ocfs_uid_gen
 
-ifdef OCFSTOOL
+ifdef BUILD_OCFS
+SUPDIRS += ocfs
+endif
+
+ifdef BUILD_OCFS2
+SUBDIRS += ocfs2
+endif
+
+ifdef BUILD_OCFSTOOL
 SUBDIRS += ocfstool
 endif
 

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2004-07-08 19:10:25 UTC (rev 148)
+++ trunk/configure.in	2004-07-08 20:03:00 UTC (rev 149)
@@ -133,6 +133,24 @@
 
 AC_C_BIGENDIAN()
 
+AC_MSG_CHECKING(if tools should be built for OCFS)
+AC_ARG_ENABLE(ocfs, [  --enable-ocfs=[yes/no]    Enable building of tools for OCFS filesystems [default=yes]],,enable_ocfs=yes)
+BUILD_OCFS=
+if test "x$enable_ocfs" = "xyes"; then
+    BUILD_OCFS=yes
+fi
+AC_SUBST(BUILD_OCFS)
+AC_MSG_RESULT($enable_ocfs)
+
+AC_MSG_CHECKING(if tools should be built for OCFS2)
+AC_ARG_ENABLE(ocfs2, [  --enable-ocfs2=[yes/no]    Enable building of tools for OCFS2 filesystems [default=yes]],,enable_ocfs2=yes)
+BUILD_OCFS2=
+if test "x$enable_ocfs2" = "xyes"; then
+    BUILD_OCFS2=yes
+fi
+AC_SUBST(BUILD_OCFS2)
+AC_MSG_RESULT($enable_ocfs2)
+
 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=
@@ -159,21 +177,20 @@
   [AC_MSG_WARN([readline not found, debugfs.ocfs2 will not be built])])
 LIBS=$ocfs_tools_save_LIBS
 
-OCFSTOOL=
-
+BUILD_OCFSTOOL=
 AC_ARG_ENABLE(ocfstool, [  --enable-ocfstool=[yes/no]       Build GUI frontend [default=yes]],,enable_ocfstool=yes)
 
 if test "x$enable_ocfstool" = "xyes"; then
   AM_PATH_GTK($GTK_REQUIRED_VERSION, have_gtk=yes, have_gtk=no)
 
   if test "x$have_gtk" = "xyes"; then
-    OCFSTOOL=yes
+    BUILD_OCFSTOOL=yes
   else
     AC_MSG_WARN([GTK+ $GTK_REQUIRED_VERSION or better not found, ocfstool will not be built])
   fi
 fi
 
-AC_SUBST(OCFSTOOL)
+AC_SUBST(BUILD_OCFSTOOL)
 
 AC_OUTPUT([
 Config.make