Ticket #69290: patch-configure.diff

File patch-configure.diff, 2.8 KB (added by DanielO (Daniel O'Connor), 8 months ago)

gtk2 version

  • configure

    old new  
    73917391    pkg_cv_GTK_MAC_CFLAGS="$GTK_MAC_CFLAGS"
    73927392 elif test -n "$PKG_CONFIG"; then
    73937393    if test -n "$PKG_CONFIG" && \
    7394     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration >= 2.0.0\""; } >&5
    7395   ($PKG_CONFIG --exists --print-errors "gtk-mac-integration >= 2.0.0") 2>&5
     7394    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration-gtk2 >= 2.0.0\""; } >&5
     7395  ($PKG_CONFIG --exists --print-errors "gtk-mac-integration-gtk2 >= 2.0.0") 2>&5
    73967396  ac_status=$?
    73977397  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    73987398  test $ac_status = 0; }; then
    7399   pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags "gtk-mac-integration >= 2.0.0" 2>/dev/null`
     7399  pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags "gtk-mac-integration-gtk2 >= 2.0.0" 2>/dev/null`
    74007400                      test "x$?" != "x0" && pkg_failed=yes
    74017401else
    74027402  pkg_failed=yes
     
    74087408    pkg_cv_GTK_MAC_LIBS="$GTK_MAC_LIBS"
    74097409 elif test -n "$PKG_CONFIG"; then
    74107410    if test -n "$PKG_CONFIG" && \
    7411     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration >= 2.0.0\""; } >&5
    7412   ($PKG_CONFIG --exists --print-errors "gtk-mac-integration >= 2.0.0") 2>&5
     7411    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration-gtk2 >= 2.0.0\""; } >&5
     7412  ($PKG_CONFIG --exists --print-errors "gtk-mac-integration-gtk2 >= 2.0.0") 2>&5
    74137413  ac_status=$?
    74147414  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    74157415  test $ac_status = 0; }; then
    7416   pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs "gtk-mac-integration >= 2.0.0" 2>/dev/null`
     7416  pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs "gtk-mac-integration-gtk2 >= 2.0.0" 2>/dev/null`
    74177417                      test "x$?" != "x0" && pkg_failed=yes
    74187418else
    74197419  pkg_failed=yes
     
    74347434        _pkg_short_errors_supported=no
    74357435fi
    74367436        if test $_pkg_short_errors_supported = yes; then
    7437                 GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk-mac-integration >= 2.0.0" 2>&1`
     7437                GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk-mac-integration-gtk2 >= 2.0.0" 2>&1`
    74387438        else
    7439                 GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk-mac-integration >= 2.0.0" 2>&1`
     7439                GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk-mac-integration-gtk2 >= 2.0.0" 2>&1`
    74407440        fi
    74417441        # Put the nasty error message in config.log where it belongs
    74427442        echo "$GTK_MAC_PKG_ERRORS" >&5
    74437443
    7444         as_fn_error $? "Package requirements (gtk-mac-integration >= 2.0.0) were not met:
     7444        as_fn_error $? "Package requirements (gtk-mac-integration-gtk2 >= 2.0.0) were not met:
    74457445
    74467446$GTK_MAC_PKG_ERRORS
    74477447