[Python-gtkextra-commits] CVS: python-gtkextra2 autogen.sh,1.3,1.4 configure.in,1.4,1.5

[<pyt...@li...>]

Update of /cvsroot/python-gtkextra/python-gtkextra2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8776

Modified Files:
	autogen.sh configure.in 
Log Message:
First cut at building with Python-2.4.1, gtk+-2.6.7, pygtk-2.6.2.
Test programs testgtkplot.py and testrealtime.py run but not exactly as the C version yet.

Index: autogen.sh
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/autogen.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** autogen.sh	30 Dec 2002 20:42:12 -0000	1.3
--- autogen.sh	26 May 2005 15:12:23 -0000	1.4
***************
*** 1,107 ****
  #!/bin/sh
- # Run this to generate all the initial makefiles, etc.
- 
- srcdir=`dirname $0`
- test -z "$srcdir" && srcdir=.
- 
- ORIGDIR=`pwd`
- cd $srcdir
- PROJECT=python-gtkextra2
- TEST_TYPE=-d
- FILE=gtkextra
- 
- DIE=0
- 
- 
- test -z "$AUTOMAKE" && AUTOMAKE=automake
- test -z "$ACLOCAL" && ACLOCAL=aclocal
- test -z "$AUTOCONF" && AUTOCONF=autoconf
- test -z "$AUTOHEADER" && AUTOHEADER=autoheader
- 
- (autoconf --version) < /dev/null > /dev/null 2>&1 || {
- 	echo
- 	echo "You must have autoconf 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/"
- 	DIE=1
- }
- 
- (libtool --version) < /dev/null > /dev/null 2>&1 || {
-         echo
-         echo "You must have libtool installed to compile gnome-xml."
-         echo "Get ftp://ftp.gnu.org/gnu/libtool/libtool-1.4.tar.gz"
-         echo "(or a newer version if it is available)"
-         DIE=1
- }
- 
- ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
- 	echo
- 	echo "You must have automake installed to compile $PROJECT."
- 	echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz"
- 	echo "(or a newer version if it is available)"
- 	DIE=1
- }
- 
- if test "$DIE" -eq 1; then
- 	exit 1
- fi
- 
- test $TEST_TYPE $FILE || {
- 	echo "You must run this script in the top-level $PROJECT directory"
- 	exit 1
- }
- 
- if test -z "$*"; then
- 	echo "I am going to run ./configure with no arguments - if you wish "
-         echo "to pass any to it, please specify them on the $0 command line."
- fi
- 
- case $CC in
- *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
- esac
- 
- if test -z "$ACLOCAL_FLAGS"; then
- 
- 	acdir=`$ACLOCAL --print-ac-dir`
-         m4list="glib-2.0.m4 gtk-2.0.m4 gettext.m4"
  
! 	for file in $m4list
! 	do
! 		if [ ! -f "$acdir/$file" ]; then
! 			echo "WARNING: aclocal's directory is $acdir, but..."
! 			echo "         no file $acdir/$file"
! 			echo "         You may see fatal macro warnings below."
! 			echo "         If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
! 			echo "         environment variable to \"-I /some/dir\", or install"
! 			echo "         $acdir/$file."
! 			echo ""
! 		fi
! 	done
! fi
! 
! # Delete all symbolic links to files rooted at "/"
! find $srcdir  -lname "/*" -exec rm {} \;
! 
! #echo "Running gettextize...  Ignore non-fatal messages."
! # Hmm, we specify --force here, since otherwise things dont'
! # get added reliably, but we don't want to overwrite intl
! # while making dist.
! #echo "no" | gettextize --copy --force
! 
! $ACLOCAL $ACLOCAL_FLAGS
  
! # optionally feature autoheader
! ($AUTOHEADER --version)  < /dev/null > /dev/null 2>&1 && $AUTOHEADER
  
! # run libtoolize ...
! libtoolize --force
  
! $AUTOMAKE -a $am_opt
! #$AUTOHEADER
! $AUTOCONF
! cd $ORIGDIR
  
! $srcdir/configure --enable-maintainer-mode "$@"
  
! echo 
! echo "Now type 'make' to compile $PROJECT."
--- 1,36 ----
  #!/bin/sh
  
! export AUTOMAKE=/usr/bin/automake
! export AUTOCONF=/usr/bin/autoconf
! export ACLOCAL=/usr/bin/aclocal
! export LIBTOOLIZE=/usr/bin/libtoolize
  
! FILES="
!  stamp-h*
!  INSTALL
!  config.cache
!  decomp
!  config.guess
!  missing
!  mkinstalldirs
!  mdate-sh
!  ltconfig
!  ltmain.sh
!  install-sh
!  compile
!  ltcf-c.sh
!  ltcf-cxx.sh
!  ltcf-gcj.sh
!  libtool
! "
  
! rm -f ${FILES}
  
! find .  -lname "/*" -exec rm {} \;
  
! ${LIBTOOLIZE} --force
! ${ACLOCAL}
! ${AUTOCONF}
! ${AUTOMAKE} -a
  
! ./configure --enable-static=no $@

Index: configure.in
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure.in	7 Jan 2003 17:06:11 -0000	1.4
--- configure.in	26 May 2005 15:12:23 -0000	1.5
***************
*** 75,92 ****
  
  dnl checks to see if Numeric Python is installed.
! if test "x$enable_numpy" != xno; then
!   save_CPPFLAGS="$CPPFLAGS"
!   CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
!   AC_CHECK_HEADER(arrayobject.h,
!     [AC_DEFINE(HAVE_NUMPY)
!      AC_DEFINE(HAVE_ARRAYOBJECT_H)],
!     [AC_CHECK_HEADER(Extensions/arrayobject.h,
!       [AC_DEFINE(HAVE_NUMPY)
!        AC_DEFINE(HAVE_EXTENSIONS_ARRAYOBJECT_H)],
!       [AC_CHECK_HEADER(Numeric/arrayobject.h,
!         [AC_DEFINE(HAVE_NUMPY)
!          AC_DEFINE(HAVE_NUMERIC_ARRAYOBJECT_H)])])])
!   CPPFLAGS="$save_CPPFLAGS"
! fi
  
  dnl add debugging options ...
--- 75,92 ----
  
  dnl checks to see if Numeric Python is installed.
! #if test "x$enable_numpy" != xno; then
! #  save_CPPFLAGS="$CPPFLAGS"
! #  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
! #  AC_CHECK_HEADER(arrayobject.h,
! #    [AC_DEFINE(HAVE_NUMPY)
! #     AC_DEFINE(HAVE_ARRAYOBJECT_H)],
! #    [AC_CHECK_HEADER(Extensions/arrayobject.h,
! #      [AC_DEFINE(HAVE_NUMPY)
! #       AC_DEFINE(HAVE_EXTENSIONS_ARRAYOBJECT_H)],
! #      [AC_CHECK_HEADER(Numeric/arrayobject.h,
! #        [AC_DEFINE(HAVE_NUMPY)
! #         AC_DEFINE(HAVE_NUMERIC_ARRAYOBJECT_H)])])])
! #  CPPFLAGS="$save_CPPFLAGS"
! #fi
  
  dnl add debugging options ...