[cairo-commit] pycairo ChangeLog, 1.36, 1.37 configure.ac, 1.9, 1.10 README, 1.4, 1.5

[Steve Chaplin]

Committed by: stevech1097

Update of /cvs/cairo/pycairo
In directory gabe:/tmp/cvs-serv7006

Modified Files:
	ChangeLog configure.ac README 
Log Message:
SC 28/12/2004

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/pycairo/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ChangeLog	14 Dec 2004 07:38:22 -0000	1.36
+++ ChangeLog	27 Dec 2004 23:54:57 -0000	1.37
@@ -1,3 +1,9 @@
+2004-12-28  Steve Chaplin  <steve1097 at yahoo.com.au>
+
+	* cairo/Makefile.am: Change HAVE_GTK to WITH_PYGTK
+	* configure.ac: add --without-pygtk option
+	* README: add './configure --without-pygtk' example
+
 2004-12-14  Steve Chaplin  <steve1097 at yahoo.com.au>
 
 	* README: added notes to describe compiling and how to avoid PYTHONPATH
@@ -5,6 +11,7 @@
 	* configure.ac: report the 'prefix' at the end of configure
 
 2004-12-10  Steve Chaplin  <steve1097 at yahoo.com.au>
+	
 	Add libsvg-cairo support
 	* configure.ac: add checks for libsvg-cairo
 	* cairo/Makefile.am: add libsvg-cairo support

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/pycairo/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- configure.ac	14 Dec 2004 07:38:22 -0000	1.9
+++ configure.ac	27 Dec 2004 23:54:57 -0000	1.10
@@ -25,10 +25,16 @@
 
 AM_INIT_AUTOMAKE([1.7 -Wall])
 
+# Options
+AC_ARG_WITH(pygtk,
+            [AC_HELP_STRING([--with-pygtk],
+                            [support pygtk [default=yes]])],,
+	    [with_pygtk="yes"])
+
+
 # put the ACLOCAL flags in the makefile
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
-
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
@@ -46,16 +52,20 @@
 fi
 
 # cairo + gtk + pygtk
-PKG_CHECK_MODULES(CAIRO_GTK, dnl
-  gtk+-2.0 >= gtk_required_version dnl
-  pygtk-2.0 >= pygtk_required_version,
-  [have_gtk=true],[have_gtk=false])
-if test -n "$export_dynamic"; then
-  CAIRO_GTK_LIBS=`echo $CAIRO_GTK_LIBS | sed -e "s/$export_dynamic//"`
+if test x"$with_pygtk" = xno; then
+  with_pygtk=false
+else
+  PKG_CHECK_MODULES(CAIRO_GTK,
+    [gtk+-2.0 >= gtk_required_version dnl
+    pygtk-2.0 >= pygtk_required_version],
+    [with_pygtk=true], [with_pygtk=false])
+  if test -n "$export_dynamic"; then
+    CAIRO_GTK_LIBS=`echo $CAIRO_GTK_LIBS | sed -e "s/$export_dynamic//"`
+  fi
 fi
-AM_CONDITIONAL(HAVE_GTK, $have_gtk)
+AM_CONDITIONAL(WITH_PYGTK, $with_pygtk)
 
-# checks to see if Numeric Python is installed.
+# Numeric Python
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
 AC_CHECK_HEADER([Numeric/arrayobject.h],
@@ -67,7 +77,7 @@
 fi
 AM_CONDITIONAL(HAVE_NUMPY, $have_numpy)
 
-dnl is libsvg-cairo installed?
+# is libsvg-cairo installed?
 PKG_CHECK_MODULES(LIBSVG_CAIRO, dnl
   libsvg-cairo >= libsvg_cairo_required_version,
   [have_libsvg_cairo=true],[have_libsvg_cairo=false])
@@ -103,7 +113,7 @@
 Installation prefix             ${prefix}
 
 Additional modules:
-	build cairo.gtk   ?	${have_gtk}
+	build cairo.gtk   ?	${with_pygtk}
 	build cairo.numpy ?	${have_numpy}
 	build cairo.svg   ?     ${have_libsvg_cairo}
 "

Index: README
===================================================================
RCS file: /cvs/cairo/pycairo/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- README	14 Dec 2004 07:42:03 -0000	1.4
+++ README	27 Dec 2004 23:54:57 -0000	1.5
@@ -3,11 +3,11 @@
 
 Dependencies
 ------------
-	cairo  0.2.0 or higher
-	Python 2.2   or higher
-
-Also, additional modules are compiled if libsvg-cairo, pygtk or Numeric Python 
-are detected.
+    cairo  		0.2.0 or higher
+    Python 		2.2   or higher
+    libsvg-cairo	optional
+    Numeric Python	optional
+    PyGTK		optional
 
 Compiling
 ---------
@@ -20,3 +20,8 @@
 If you're installing to another prefix than the one where Python is installed
 Python will not be able to find the cairo module until you add
 $prefix/lib/pythonX.Y/site-packages to the PYTHONPATH variable.
+
+If libsvg-cairo, PyGTK or Numeric Python are detected optional modules will
+be compiled. To disable PyGTK support use
+
+    $ ./configure --without-pygtk