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

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-01-25 20:18:40 -0600 (Tue, 25 Jan 2005)
New Revision: 581

Added:
   trunk/aclocal.m4
   trunk/pythondev.m4
Removed:
   trunk/acinclude.m4
Modified:
   trunk/Config.make.in
   trunk/Makefile
   trunk/autogen.sh
   trunk/configure.in
Log:
Dist README.O2CB


Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2005-01-26 02:05:08 UTC (rev 580)
+++ trunk/Config.make.in	2005-01-26 02:18:40 UTC (rev 581)
@@ -43,20 +43,10 @@
 
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-
 PYTHON = @PYTHON@
 PYTHON_INCLUDES = @PYTHON_INCLUDES@
 
-PYGTK_CFLAGS = @PYGTK_CFLAGS@
-PYGTK_LIBS = @PYGTK_LIBS@
-
-PYGTK_CODEGEN = @PYGTK_CODEGEN@
-PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
-
 BUILD_OCFS2CONSOLE = @BUILD_OCFS2CONSOLE@
 
 BUILD_OCFS2CDSL = @BUILD_OCFS2CDSL@

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-01-26 02:05:08 UTC (rev 580)
+++ trunk/Makefile	2005-01-26 02:18:40 UTC (rev 581)
@@ -37,6 +37,7 @@
 DIST_FILES = \
 	COPYING		\
 	README		\
+	README.O2CB	\
 	Config.make.in	\
 	Preamble.make	\
 	Postamble.make	\

Deleted: trunk/acinclude.m4
===================================================================
--- trunk/acinclude.m4	2005-01-26 02:05:08 UTC (rev 580)
+++ trunk/acinclude.m4	2005-01-26 02:18:40 UTC (rev 581)
@@ -1,29 +0,0 @@
-## Add your own autoconf macros here.
-
-## Find the install dirs for the python installation.
-##  By James Henstridge
-
-dnl a macro to check for ability to create python extensions
-dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
-dnl function also defines PYTHON_INCLUDES
-AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
-[AC_REQUIRE([AM_PATH_PYTHON])
-AC_MSG_CHECKING(for headers required to compile python extensions)
-dnl deduce PYTHON_INCLUDES
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-if test "$py_prefix" != "$py_exec_prefix"; then
-  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-fi
-AC_SUBST(PYTHON_INCLUDES)
-dnl check if the headers exist:
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-AC_TRY_CPP([#include <Python.h>],dnl
-[AC_MSG_RESULT(found)
-$1],dnl
-[AC_MSG_RESULT(not found)
-$2])
-CPPFLAGS="$save_CPPFLAGS"
-])

Added: trunk/aclocal.m4
===================================================================
--- trunk/aclocal.m4	2005-01-26 02:05:08 UTC (rev 580)
+++ trunk/aclocal.m4	2005-01-26 02:18:40 UTC (rev 581)
@@ -0,0 +1,4 @@
+m4_include([glib-2.0.m4])
+m4_include([runlog.m4])
+m4_include([python.m4])
+m4_include([pythondev.m4])

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2005-01-26 02:05:08 UTC (rev 580)
+++ trunk/autogen.sh	2005-01-26 02:18:40 UTC (rev 581)
@@ -2,24 +2,5 @@
 
 PROJECT=ocfs2-tools
 
-if (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-1.9
-elif (automake-1.8 --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-1.8
-elif (automake-1.7 --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-1.7
-elif (automake-1.6 --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-1.6
-else
-    echo
-    echo "  You must have automake 1.6 or newer installed to compile $PROJECT."
-    echo "  Download the appropriate package for your distribution,"
-    echo "  or get the source tarball at ftp://ftp.gnu.org/pub/gnu/automake/"
-    echo
-    exit 1
-fi
-
-rm -rf autom4te.cache
-$ACLOCAL
 autoconf
 ./configure "$@"

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-01-26 02:05:08 UTC (rev 580)
+++ trunk/configure.in	2005-01-26 02:18:40 UTC (rev 581)
@@ -167,13 +167,6 @@
   AM_PATH_PYTHON(2.2)
   AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 
-  dnl check for GTK
-  PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
-
-  dnl check for PyGTK
-  PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= $PYGTK_REQUIRED_VERSION)
-  AC_SUBST(PYGTK_CFLAGS)
-
   BUILD_OCFS2CONSOLE=yes
 fi
 

Copied: trunk/pythondev.m4 (from rev 580, trunk/acinclude.m4)
===================================================================
--- trunk/acinclude.m4	2005-01-26 02:05:08 UTC (rev 580)
+++ trunk/pythondev.m4	2005-01-26 02:18:40 UTC (rev 581)
@@ -0,0 +1,27 @@
+## Find the install dirs for the python installation.
+##  By James Henstridge
+
+dnl a macro to check for ability to create python extensions
+dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+fi
+AC_SUBST(PYTHON_INCLUDES)
+dnl check if the headers exist:
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_TRY_CPP([#include <Python.h>],dnl
+[AC_MSG_RESULT(found)
+$1],dnl
+[AC_MSG_RESULT(not found)
+$2])
+CPPFLAGS="$save_CPPFLAGS"
+])