diff options
| author | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2009-04-22 14:40:27 -0700 |
|---|---|---|
| committer | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2009-04-29 09:34:10 -0700 |
| commit | 3f8746784c9da49bd9940e3f21e5a9af945bdc0a (patch) | |
| tree | b114529bf5bb2d6f8df1ae136f2821b80cc00c49 | |
| parent | 87ca6bff33a59f3375fed04c8313ffcf3609aeb1 (diff) | |
autoconf: glib 2.14 is good enough
People with older systems (Fedora 8) complained about it.
Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
| -rwxr-xr-x | configure | 24 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 14 insertions, 14 deletions
@@ -11705,12 +11705,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.14\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.14") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.16" 2>/dev/null` + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.14" 2>/dev/null` else pkg_failed=yes fi @@ -11723,12 +11723,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_GLIB_LIBS="$GLIB_LIBS" else if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.14\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.14") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.16" 2>/dev/null` + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.14" 2>/dev/null` else pkg_failed=yes fi @@ -11747,21 +11747,21 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.16"` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.14"` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.16"` + GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.14"` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: GLib >= 2.16 is required" >&5 -$as_echo "$as_me: error: GLib >= 2.16 is required" >&2;} + { { $as_echo "$as_me:$LINENO: error: GLib >= 2.14 is required" >&5 +$as_echo "$as_me: error: GLib >= 2.14 is required" >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: GLib >= 2.16 is required" >&5 -$as_echo "$as_me: error: GLib >= 2.16 is required" >&2;} + { { $as_echo "$as_me:$LINENO: error: GLib >= 2.14 is required" >&5 +$as_echo "$as_me: error: GLib >= 2.14 is required" >&2;} { (exit 1); exit 1; }; } else GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS diff --git a/configure.in b/configure.in index d593fa9..a0ef362 100644 --- a/configure.in +++ b/configure.in @@ -126,8 +126,8 @@ AC_SUBST(LINUX_INCLUDE_PATH, "${LINUX_KERNEL}/include") AC_CHECK_LIB(dl, dlopen, dummy=yes, AC_MSG_ERROR(dynamic linking loader is required)) -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes, - AC_MSG_ERROR(GLib >= 2.16 is required)) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.14, dummy=yes, + AC_MSG_ERROR(GLib >= 2.14 is required)) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) |