[Ocfs2-tools-commits] manish commits r586 - trunk

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-01-25 20:53:22 -0600 (Tue, 25 Jan 2005)
New Revision: 586

Modified:
   trunk/configure.in
Log:
enable ocfs2console by default


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-01-26 02:37:20 UTC (rev 585)
+++ trunk/configure.in	2005-01-26 02:53:22 UTC (rev 586)
@@ -155,8 +155,7 @@
 AC_SUBST(BUILD_DEBUGOCFS2)
 
 BUILD_OCFS2CONSOLE=
-dnl AC_ARG_ENABLE(ocfs2console, [  --enable-ocfs2console=[yes/no]    Build GUI frontend [default=yes]],,enable_ocfs2console=yes)
-AC_ARG_ENABLE(ocfs2console, [  --enable-ocfs2console=[yes/no]    Build GUI frontend [default=no]],,enable_ocfs2console=no)
+AC_ARG_ENABLE(ocfs2console, [  --enable-ocfs2console=[yes/no]    Build GUI frontend [default=yes]],,enable_ocfs2console=yes)
 
 if test "x$have_glib" != "xyes"; then
   enable_ocfs2console=no
@@ -164,10 +163,23 @@
 
 if test "x$enable_ocfs2console" = "xyes"; then
   dnl check for Python
-  AM_PATH_PYTHON(2.2)
-  AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+  AM_PATH_PYTHON(2.2, have_python=yes, have_python=no)
 
-  BUILD_OCFS2CONSOLE=yes
+  if test "x$have_python" = "xyes"; then
+    AM_CHECK_PYTHON_HEADERS(have_pythondev=yes, have_pythondev=no)
+
+    if test "x$have_pythondev" = "xyes"; then
+      if $PYTHON -c 'import pygtk' >/dev/null 2>&1; then
+        BUILD_OCFS2CONSOLE=yes
+      else
+        AC_MSG_WARN([could not find PyGTK, ocfs2console will not be built])
+      fi 
+    else
+      AC_MSG_WARN([could not find Python headers, ocfs2console will not be built])
+    fi
+  else
+    AC_MSG_WARN([could not find Python 2.2 or higher, ocfs2console will not be built])
+  fi
 fi
 
 AC_SUBST(BUILD_OCFS2CONSOLE)