|
Lines 1-130
Link Here
|
| 1 |
--- configure.orig 2014-03-10 12:16:13.565833797 +0000 |
|
|
| 2 |
+++ configure 2014-03-10 12:18:02.733826506 +0000 |
| 3 |
@@ -668,8 +668,6 @@ |
| 4 |
INTROSPECTION_COMPILER |
| 5 |
INTROSPECTION_SCANNER |
| 6 |
GLIB_GENMARSHAL |
| 7 |
-TESTS_LIBS |
| 8 |
-TESTS_CFLAGS |
| 9 |
PACKAGE_LIBS |
| 10 |
PACKAGE_CFLAGS |
| 11 |
PKG_CONFIG_LIBDIR |
| 12 |
@@ -829,8 +827,6 @@ |
| 13 |
PKG_CONFIG_LIBDIR |
| 14 |
PACKAGE_CFLAGS |
| 15 |
PACKAGE_LIBS |
| 16 |
-TESTS_CFLAGS |
| 17 |
-TESTS_LIBS |
| 18 |
GTKDOC_DEPS_CFLAGS |
| 19 |
GTKDOC_DEPS_LIBS |
| 20 |
XMLTO |
| 21 |
@@ -1500,9 +1496,6 @@ |
| 22 |
C compiler flags for PACKAGE, overriding pkg-config |
| 23 |
PACKAGE_LIBS |
| 24 |
linker flags for PACKAGE, overriding pkg-config |
| 25 |
- TESTS_CFLAGS |
| 26 |
- C compiler flags for TESTS, overriding pkg-config |
| 27 |
- TESTS_LIBS linker flags for TESTS, overriding pkg-config |
| 28 |
GTKDOC_DEPS_CFLAGS |
| 29 |
C compiler flags for GTKDOC_DEPS, overriding pkg-config |
| 30 |
GTKDOC_DEPS_LIBS |
| 31 |
@@ -11830,99 +11823,6 @@ |
| 32 |
|
| 33 |
fi |
| 34 |
|
| 35 |
-tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION" |
| 36 |
- |
| 37 |
-pkg_failed=no |
| 38 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TESTS" >&5 |
| 39 |
-$as_echo_n "checking for TESTS... " >&6; } |
| 40 |
- |
| 41 |
-if test -n "$TESTS_CFLAGS"; then |
| 42 |
- pkg_cv_TESTS_CFLAGS="$TESTS_CFLAGS" |
| 43 |
- elif test -n "$PKG_CONFIG"; then |
| 44 |
- if test -n "$PKG_CONFIG" && \ |
| 45 |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$tests_modules\""; } >&5 |
| 46 |
- ($PKG_CONFIG --exists --print-errors "$tests_modules") 2>&5 |
| 47 |
- ac_status=$? |
| 48 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 49 |
- test $ac_status = 0; }; then |
| 50 |
- pkg_cv_TESTS_CFLAGS=`$PKG_CONFIG --cflags "$tests_modules" 2>/dev/null` |
| 51 |
- test "x$?" != "x0" && pkg_failed=yes |
| 52 |
-else |
| 53 |
- pkg_failed=yes |
| 54 |
-fi |
| 55 |
- else |
| 56 |
- pkg_failed=untried |
| 57 |
-fi |
| 58 |
-if test -n "$TESTS_LIBS"; then |
| 59 |
- pkg_cv_TESTS_LIBS="$TESTS_LIBS" |
| 60 |
- elif test -n "$PKG_CONFIG"; then |
| 61 |
- if test -n "$PKG_CONFIG" && \ |
| 62 |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$tests_modules\""; } >&5 |
| 63 |
- ($PKG_CONFIG --exists --print-errors "$tests_modules") 2>&5 |
| 64 |
- ac_status=$? |
| 65 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 66 |
- test $ac_status = 0; }; then |
| 67 |
- pkg_cv_TESTS_LIBS=`$PKG_CONFIG --libs "$tests_modules" 2>/dev/null` |
| 68 |
- test "x$?" != "x0" && pkg_failed=yes |
| 69 |
-else |
| 70 |
- pkg_failed=yes |
| 71 |
-fi |
| 72 |
- else |
| 73 |
- pkg_failed=untried |
| 74 |
-fi |
| 75 |
- |
| 76 |
- |
| 77 |
- |
| 78 |
-if test $pkg_failed = yes; then |
| 79 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 80 |
-$as_echo "no" >&6; } |
| 81 |
- |
| 82 |
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
| 83 |
- _pkg_short_errors_supported=yes |
| 84 |
-else |
| 85 |
- _pkg_short_errors_supported=no |
| 86 |
-fi |
| 87 |
- if test $_pkg_short_errors_supported = yes; then |
| 88 |
- TESTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$tests_modules" 2>&1` |
| 89 |
- else |
| 90 |
- TESTS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$tests_modules" 2>&1` |
| 91 |
- fi |
| 92 |
- # Put the nasty error message in config.log where it belongs |
| 93 |
- echo "$TESTS_PKG_ERRORS" >&5 |
| 94 |
- |
| 95 |
- as_fn_error $? "Package requirements ($tests_modules) were not met: |
| 96 |
- |
| 97 |
-$TESTS_PKG_ERRORS |
| 98 |
- |
| 99 |
-Consider adjusting the PKG_CONFIG_PATH environment variable if you |
| 100 |
-installed software in a non-standard prefix. |
| 101 |
- |
| 102 |
-Alternatively, you may set the environment variables TESTS_CFLAGS |
| 103 |
-and TESTS_LIBS to avoid the need to call pkg-config. |
| 104 |
-See the pkg-config man page for more details." "$LINENO" 5 |
| 105 |
-elif test $pkg_failed = untried; then |
| 106 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 107 |
-$as_echo "no" >&6; } |
| 108 |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 109 |
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 110 |
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it |
| 111 |
-is in your PATH or set the PKG_CONFIG environment variable to the full |
| 112 |
-path to pkg-config. |
| 113 |
- |
| 114 |
-Alternatively, you may set the environment variables TESTS_CFLAGS |
| 115 |
-and TESTS_LIBS to avoid the need to call pkg-config. |
| 116 |
-See the pkg-config man page for more details. |
| 117 |
- |
| 118 |
-To get pkg-config, see <http://pkg-config.freedesktop.org/>. |
| 119 |
-See \`config.log' for more details" "$LINENO" 5; } |
| 120 |
-else |
| 121 |
- TESTS_CFLAGS=$pkg_cv_TESTS_CFLAGS |
| 122 |
- TESTS_LIBS=$pkg_cv_TESTS_LIBS |
| 123 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
| 124 |
-$as_echo "yes" >&6; } |
| 125 |
- |
| 126 |
-fi |
| 127 |
- |
| 128 |
GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` |
| 129 |
|
| 130 |
|
| 131 |
yes |
| 132 |
native |
| 133 |
text/plain |