[Ocfs2-tools-commits] manish commits r234 - in trunk: . debugfs.ocfs2 vendor/common

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-09-14 19:32:09 -0500 (Tue, 14 Sep 2004)
New Revision: 234

Modified:
   trunk/configure.in
   trunk/debugfs.ocfs2/Makefile
   trunk/vendor/common/ocfs2-tools.spec.in
Log:
Start using glib 2.0.x


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2004-09-14 00:28:53 UTC (rev 233)
+++ trunk/configure.in	2004-09-15 00:32:09 UTC (rev 234)
@@ -123,10 +123,10 @@
 AC_SUBST(OCFS2_DEBUG_EXE)
 AC_MSG_RESULT($enable_debugexe)
 
-GLIB_REQUIRED_VERSION=1.2.8
-GTK_REQUIRED_VERSION=1.2.8
+GLIB_REQUIRED_VERSION=2.0.6
+GTK_REQUIRED_VERSION=2.0.6
 
-AM_PATH_GLIB($GLIB_REQUIRED_VERSION, :,
+AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :,
   AC_MSG_ERROR([Glib $GLIB_REQUIRED_VERSION or better is required.]))
 
 BUILD_DEBUGOCFS2=
@@ -144,10 +144,10 @@
 
 BUILD_OCFSTOOL=
 dnl AC_ARG_ENABLE(ocfstool, [  --enable-ocfstool=[yes/no]       Build GUI frontend [default=yes]],,enable_ocfstool=yes)
-
+dnl
 dnl if test "x$enable_ocfstool" = "xyes"; then
-dnl   AM_PATH_GTK($GTK_REQUIRED_VERSION, have_gtk=yes, have_gtk=no)
-
+dnl   AM_PATH_GTK_2_0($GTK_REQUIRED_VERSION, have_gtk=yes, have_gtk=no)
+dnl
 dnl   if test "x$have_gtk" = "xyes"; then
 dnl     BUILD_OCFSTOOL=yes
 dnl   else

Modified: trunk/debugfs.ocfs2/Makefile
===================================================================
--- trunk/debugfs.ocfs2/Makefile	2004-09-14 00:28:53 UTC (rev 233)
+++ trunk/debugfs.ocfs2/Makefile	2004-09-15 00:32:09 UTC (rev 234)
@@ -4,7 +4,7 @@
 
 SBIN_PROGRAMS = debugfs.ocfs2
 
-DEFINES = -DLINUX -DDEBUGOCFS -DDEBUG -DDEBUGOCFS_VERSION=\"0.0.1\"
+DEFINES = -DG_DISABLE_DEPRECATED -DLINUX -DDEBUGOCFS -DDEBUG -DDEBUGOCFS_VERSION=\"0.0.1\"
 
 INCLUDES = -Iinclude -I$(TOPDIR)/libocfs2/include
 INCLUDES += $(GLIB_CFLAGS)

Modified: trunk/vendor/common/ocfs2-tools.spec.in
===================================================================
--- trunk/vendor/common/ocfs2-tools.spec.in	2004-09-14 00:28:53 UTC (rev 233)
+++ trunk/vendor/common/ocfs2-tools.spec.in	2004-09-15 00:32:09 UTC (rev 234)
@@ -20,9 +20,8 @@
 Vendor: Oracle Corporation
 Packager: nobody <nobody at oracle.com>
 Exclusiveos: Linux
-Requires: ocfs2-support >= @DIST_VERSION@
-#Requires: ocfs2-support >= @DIST_VERSION@, %{gtk_name} >= 1.2.8
-#BuildRequires: %{gtk_name}-devel >= 1.2.8
+Requires: ocfs2-support >= @DIST_VERSION@, glib2 >= 2.0.6
+BuildRequires: glib2-devel >= 2.0.6
 
 BuildRoot: %{_tmppath}/ocfs2-tools-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root