Ticket #69290: patch-configure.diff
File patch-configure.diff, 2.8 KB (added by DanielO (Daniel O'Connor), 9 months ago) |
---|
-
configure
old new 7391 7391 pkg_cv_GTK_MAC_CFLAGS="$GTK_MAC_CFLAGS" 7392 7392 elif test -n "$PKG_CONFIG"; then 7393 7393 if test -n "$PKG_CONFIG" && \ 7394 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration >= 2.0.0\""; } >&57395 ($PKG_CONFIG --exists --print-errors "gtk-mac-integration >= 2.0.0") 2>&57394 { { $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 7396 7396 ac_status=$? 7397 7397 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 7398 7398 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` 7400 7400 test "x$?" != "x0" && pkg_failed=yes 7401 7401 else 7402 7402 pkg_failed=yes … … 7408 7408 pkg_cv_GTK_MAC_LIBS="$GTK_MAC_LIBS" 7409 7409 elif test -n "$PKG_CONFIG"; then 7410 7410 if test -n "$PKG_CONFIG" && \ 7411 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration >= 2.0.0\""; } >&57412 ($PKG_CONFIG --exists --print-errors "gtk-mac-integration >= 2.0.0") 2>&57411 { { $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 7413 7413 ac_status=$? 7414 7414 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 7415 7415 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` 7417 7417 test "x$?" != "x0" && pkg_failed=yes 7418 7418 else 7419 7419 pkg_failed=yes … … 7434 7434 _pkg_short_errors_supported=no 7435 7435 fi 7436 7436 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` 7438 7438 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` 7440 7440 fi 7441 7441 # Put the nasty error message in config.log where it belongs 7442 7442 echo "$GTK_MAC_PKG_ERRORS" >&5 7443 7443 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: 7445 7445 7446 7446 $GTK_MAC_PKG_ERRORS 7447 7447