diff options
| -rwxr-xr-x | tools/configure | 18 | ||||
| -rw-r--r-- | tools/configure.ac | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tools/configure b/tools/configure index 5a156145e8..de0327c12b 100755 --- a/tools/configure +++ b/tools/configure @@ -5961,12 +5961,12 @@ if test -n "$glib_CFLAGS"; then pkg_cv_glib_CFLAGS="$glib_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.12\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.12") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null` + pkg_cv_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.12" 2>/dev/null` else pkg_failed=yes fi @@ -5977,12 +5977,12 @@ if test -n "$glib_LIBS"; then pkg_cv_glib_LIBS="$glib_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.12\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.12") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null` + pkg_cv_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.12" 2>/dev/null` else pkg_failed=yes fi @@ -6002,14 +6002,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0" 2>&1` + glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.12" 2>&1` else - glib_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0" 2>&1` + glib_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.12" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$glib_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0) were not met: + as_fn_error $? "Package requirements (glib-2.0 >= 2.12) were not met: $glib_PKG_ERRORS diff --git a/tools/configure.ac b/tools/configure.ac index 706ee132a5..8587eef77f 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -115,7 +115,7 @@ AX_PATH_PROG_OR_FAIL([BCC], [bcc]) AX_PATH_PROG_OR_FAIL([IASL], [iasl]) AX_CHECK_UUID AX_CHECK_CURSES -PKG_CHECK_MODULES(glib, glib-2.0) +PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12]) # Check library path AX_DEFAULT_LIB |