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

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-03-18 01:07:38 -0600 (Fri, 18 Mar 2005)
New Revision: 672

Modified:
   trunk/configure.in
Log:
Make blkid config tests run conditionally


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-03-18 06:43:00 UTC (rev 671)
+++ trunk/configure.in	2005-03-18 07:07:38 UTC (rev 672)
@@ -53,20 +53,6 @@
   AC_MSG_ERROR(GCC is required)
 fi
 
-dnl checks needed for blkid
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
-SIZEOF_SHORT=$ac_cv_sizeof_short
-SIZEOF_INT=$ac_cv_sizeof_int
-SIZEOF_LONG=$ac_cv_sizeof_long
-SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
-AC_SUBST(SIZEOF_SHORT)
-AC_SUBST(SIZEOF_INT)
-AC_SUBST(SIZEOF_LONG)
-AC_SUBST(SIZEOF_LONG_LONG)
-
 AC_MSG_CHECKING(for debugging)
 AC_ARG_ENABLE(debug, [  --enable-debug=[yes/no]         Turn on debugging [default=no]],,enable_debug=no)
 OCFS_DEBUG=
@@ -94,7 +80,7 @@
 AC_SUBST(OCFS2_DEBUG_EXE)
 AC_MSG_RESULT($enable_debugexe)
 
-GLIB_REQUIRED_VERSION=2.0.6
+GLIB_REQUIRED_VERSION=2.2.3
 GTK_REQUIRED_VERSION=2.2.4
 PYGTK_REQUIRED_VERSION=1.99.16
 
@@ -150,6 +136,23 @@
           AC_CHECK_LIB(uuid, uuid_unparse, :,
             [AC_MSG_ERROR([could not find uuid library])])
         fi
+
+        AC_CHECK_SIZEOF(short)
+        AC_CHECK_SIZEOF(int)
+        AC_CHECK_SIZEOF(long)
+        AC_CHECK_SIZEOF(long long)
+
+        SIZEOF_SHORT=$ac_cv_sizeof_short
+        SIZEOF_INT=$ac_cv_sizeof_int
+        SIZEOF_LONG=$ac_cv_sizeof_long
+        SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
+
+        AC_SUBST(SIZEOF_SHORT)
+        AC_SUBST(SIZEOF_INT)
+        AC_SUBST(SIZEOF_LONG)
+        AC_SUBST(SIZEOF_LONG_LONG)
+
+        AC_CONFIG_FILES(ocfs2console/blkid/blkid_types.h)
       else
         AC_MSG_WARN([could not find PyGTK, ocfs2console will not be built])
       fi 
@@ -163,12 +166,11 @@
 
 AC_SUBST(BUILD_OCFS2CONSOLE)
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Config.make
 libocfs2/ocfs2_err.et
 libo2cb/o2cb_err.et
 libo2dlm/o2dlm_err.et
-ocfs2console/blkid/blkid_types.h
 debugfs.ocfs2/debugfs.ocfs2.8
 mkfs.ocfs2/mkfs.ocfs2.8
 fsck.ocfs2/fsck.ocfs2.8
@@ -176,3 +178,5 @@
 ocfs2console/ocfs2console.8
 vendor/common/ocfs2-tools.spec
 ])
+
+AC_OUTPUT