Changeset 545

Show
Ignore:
Timestamp:
08/23/08 19:18:20 (3 months ago)
Author:
bjourne
Message:

pygtk-codegen-2.0 changed name to pygobject-codegen-2.0, see
http://bugzilla.gnome.org/show_bug.cgi?id=548535. So we need to check
for both those path names.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • pygtkimageview/configure.in

    r544 r545  
    2727AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers or library)]) 
    2828 
    29 AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no) 
    30 if test "x$PYGTK_CODEGEN" = xno; then 
    31   AC_MSG_ERROR(could not find pygtk-codegen-2.0 script) 
     29AC_PATH_PROG(PYGOBJECT_CODEGEN, pygobject-codegen-2.0, no) 
     30if test "x$PYGOBJECT_CODEGEN" = xno; then 
     31  dnl This is for compat with older releases when codegen was shipped 
     32  dnl in pygtk. It should be removed in future releases. 
     33  AC_PATH_PROG(PYGOBJECT_CODEGEN, pygtk-codegen-2.0, no) 
     34  if test "x$PYGOBJECT_CODEGEN" = xno; then 
     35    AC_MSG_ERROR(could not find pygobject-codegen-2.0 script) 
     36  fi 
    3237fi 
     38 
    3339AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums, no) 
    3440if test "x$GLIB_MKENUMS" = xno; then 
    …… 
    6874 
    6975        == PyGTK settings == 
    70         PYGTK_CFLAGS        ${PYGTK_CFLAGS} 
    71         PYGTK_CODEGEN:      ${PYGTK_CODEGEN} 
     76        PYGTK_CFLAGS:       ${PYGTK_CFLAGS} 
    7277        PYGTK_DEFSDIR:      ${PYGTK_DEFSDIR} 
     78        PYGOBJECT_CODEGEN:  ${PYGOBJECT_CODEGEN} 
    7379 
    7480        == Python settings == 

  • pygtkimageview/src/Makefile.am

    r466 r545  
    2525 
    2626.defs.c: 
    27         $(PYGTK_CODEGEN) \ 
     27        $(PYGOBJECT_CODEGEN) \ 
    2828            -r $(PYGTK_DEFSDIR)/gdk-types.defs \ 
    2929            -r $(PYGTK_DEFSDIR)/gtk-types.defs \