[Python-gtkextra-commits] CVS: python-gtkextra2 autogen.sh,1.1.1.1,1.2 configure.in,1.1.1.1,1.2
Status: Beta
Brought to you by:
treeves
From: <pyt...@li...> - 2002-07-22 13:06:57
|
Update of /cvsroot/python-gtkextra/python-gtkextra2 In directory usw-pr-cvs1:/tmp/cvs-serv27698 Modified Files: autogen.sh configure.in Log Message: More examples mostly run. GtkExtra fixes Index: autogen.sh =================================================================== RCS file: /cvsroot/python-gtkextra/python-gtkextra2/autogen.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** autogen.sh 10 Jul 2002 19:06:49 -0000 1.1.1.1 --- autogen.sh 22 Jul 2002 13:06:54 -0000 1.2 *************** *** 13,16 **** --- 13,17 ---- DIE=0 + test -z "$AUTOMAKE" && AUTOMAKE=automake test -z "$ACLOCAL" && ACLOCAL=aclocal *************** *** 78,81 **** --- 79,85 ---- done fi + + # Delete all symbolic links to files rooted at "/" + find $srcdir -lname "/*" -exec rm {} \; #echo "Running gettextize... Ignore non-fatal messages." Index: configure.in =================================================================== RCS file: /cvsroot/python-gtkextra/python-gtkextra2/configure.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** configure.in 10 Jul 2002 19:06:49 -0000 1.1.1.1 --- configure.in 22 Jul 2002 13:06:54 -0000 1.2 *************** *** 9,20 **** dnl versions of packages we require ... - m4_define(glib_required_version, 2.0.0) - m4_define(pango_required_version, 1.0.0) - m4_define(atk_required_version, 1.0.0) m4_define(gtk_required_version, 2.0.0) ! m4_define(pygtk_required_version, 0.12.0) AC_INIT(python-gtkextra, python_gtkextra_version, ! [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-python&component=python-gtkextra]) AC_DEFINE(PYTHON_GTKEXTRA_MAJOR_VERSION, python_gtkextra_major_version, [Python GtkExtra major version]) --- 9,18 ---- dnl versions of packages we require ... m4_define(gtk_required_version, 2.0.0) ! m4_define(pygtk_required_version, 1.99.8) ! m4_define(gtkextra_required_version, 1.1.0) AC_INIT(python-gtkextra, python_gtkextra_version, ! [http://sourceforge.net/tracker/?group_id=35371]) AC_DEFINE(PYTHON_GTKEXTRA_MAJOR_VERSION, python_gtkextra_major_version, [Python GtkExtra major version]) *************** *** 51,63 **** AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) - #dnl glib - #AM_PATH_GLIB_2_0(glib_required_version,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)],gobject $extra_mods) - - #dnl atk - #PKG_CHECK_MODULES(ATK, atk >= atk_required_version,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)]) - #AC_SUBST(ATK_CFLAGS) - #AC_SUBST(ATK_LIBS) - - #dnl pango #PKG_CHECK_MODULES(PANGO, pango >= pango_required_version,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)]) #AC_SUBST(PANGO_CFLAGS) --- 49,52 ---- *************** *** 68,85 **** dnl gtk+extra ! # HACK/TODO/FIXME: build and submit patch so gtk+extra uses pkg-config ! # Does not check version but should ! AC_PATH_PROG(GTKEXTRA_CONFIG, gtkextra-config, no) ! if test x$GTKEXTRA_CONFIG = xno ; then ! AC_MSG_ERROR(could not find gtk+extra) ! fi ! #AC_MSG_CHECKING(GTKEXTRA_CFLAGS) ! #GTKEXTRA_CFLAGS=`$GTKEXTRA_CONFIG --cflags` ! #AC_MSG_RESULT($GTKEXTRA_CFLAGS) ! #AC_MSG_CHECKING(GTKEXTRA_LIBS) ! #GTKEXTRA_LIBS=`$GTKEXTRA_CONFIG --libs` ! #AC_MSG_RESULT($GTKEXTRA_LIBS) ! #AC_SUBST(GTKEXTRA_CFLAGS) ! #AC_SUBST(GTKEXTRA_LIBS) dnl pygtk --- 57,63 ---- dnl gtk+extra ! PKG_CHECK_MODULES(GTKEXTRA, gtkextra-2.0 >= gtkextra_required_version,,[AC_MSG_ERROR(maybe you want gtk+extra for gtk-gnome-1-2 branch)]) ! AC_SUBST(GTKEXTRA_CFLAGS) ! AC_SUBST(GTKEXTRA_LIBS) dnl pygtk |