Minimal version of GLib is 2.14.0

...because of g_unichar_ismark().

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2015-02-20 13:39:43 +03:00
parent ea2e5bf0b2
commit 1fa8bd3d62
5 changed files with 9 additions and 10 deletions

View File

@ -19,7 +19,7 @@ required:
Autoconf 2.52 and above (latest is recommended) Autoconf 2.52 and above (latest is recommended)
Automake 1.5 and above (latest is recommended) Automake 1.5 and above (latest is recommended)
Gettext 0.11.5 and above Gettext 0.11.5 and above
Glib 2.8 and above (2.14 and higher is recommended) Glib 2.14 and above
Full list of requirements you can see at: Full list of requirements you can see at:
http://www.midnight-commander.org/wiki/doc/buildAndInstall/req http://www.midnight-commander.org/wiki/doc/buildAndInstall/req

View File

@ -386,7 +386,7 @@ get glib from
ftp://ftp.gtk.org/pub/glib/ ftp://ftp.gtk.org/pub/glib/
Minimal version of glib: 2.8.x Minimal version of glib: 2.14.x
Recommended version: 2.14.x and higher. Recommended version: 2.14.x and higher.
Newer versions may work, but haven't been tested. Newer versions may work, but haven't been tested.

View File

@ -1,8 +1,7 @@
Read the INSTALL file for the complete instructions. Read the INSTALL file for the complete instructions.
GNU Midnight Commander requires glib. Currently the 1.2.x and 2.0.x GNU Midnight Commander requires glib2. You may already have glib
series are supported. You may already have glib installed, but if you installed, but if you don't, take it from ftp://ftp.gtk.org/pub/gtk/
don't, take it from ftp://ftp.gtk.org/pub/gtk/
GNU Midnight Commander uses the S-Lang screen library by default. It GNU Midnight Commander uses the S-Lang screen library by default. It
tries the S-Lang library installed on the system. If it's not found, tries the S-Lang library installed on the system. If it's not found,

View File

@ -29,7 +29,7 @@ Dependencies
------------ ------------
To compile the GNU Midnight Commander, you need to have a copy of the To compile the GNU Midnight Commander, you need to have a copy of the
glib library version 2.8.x or newer, available at glib library version 2.14.x or newer, available at
ftp://ftp.gtk.org/pub/glib/ ftp://ftp.gtk.org/pub/glib/

View File

@ -8,12 +8,12 @@ AC_DEFUN([AC_G_MODULE_SUPPORTED], [
g_module_supported="" g_module_supported=""
found_gmodule=no found_gmodule=no
PKG_CHECK_MODULES(GMODULE, [gmodule-no-export-2.0 >= 2.12], [found_gmodule=yes], [:]) PKG_CHECK_MODULES(GMODULE, [gmodule-no-export-2.0 >= 2.14], [found_gmodule=yes], [:])
if test x"$found_gmodule" = xyes; then if test x"$found_gmodule" = xyes; then
g_module_supported="gmodule-no-export-2.0" g_module_supported="gmodule-no-export-2.0"
else else
dnl try fallback to the generic gmodule dnl try fallback to the generic gmodule
PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.12], [found_gmodule=yes], [:]) PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.14], [found_gmodule=yes], [:])
if test x"$found_gmodule" = xyes; then if test x"$found_gmodule" = xyes; then
g_module_supported="gmodule-2.0" g_module_supported="gmodule-2.0"
fi fi
@ -78,9 +78,9 @@ AC_DEFUN([AC_CHECK_GLIB], [
AS_HELP_STRING([--with-glib-static], [Link glib statically @<:@no@:>@])) AS_HELP_STRING([--with-glib-static], [Link glib statically @<:@no@:>@]))
glib_found=no glib_found=no
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12], [glib_found=yes], [:]) PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.14], [glib_found=yes], [:])
if test x"$glib_found" = xno; then if test x"$glib_found" = xno; then
AC_MSG_ERROR([glib-2.0 not found or version too old (must be >= 2.12)]) AC_MSG_ERROR([glib-2.0 not found or version too old (must be >= 2.14)])
fi fi
]) ])