diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-05-19 09:25:27 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-05-19 09:25:30 +0900 |
| commit | fb2a2b74b7a82bb7a463d323e03ecc54ead40f10 (patch) | |
| tree | 64fe432542ff04e594d27b553e1dba51700d3b68 /configure.ac | |
| parent | 0ae6bccb945f3a47a486e2634867d7f89e805229 (diff) | |
| download | glib-fb2a2b74b7a82bb7a463d323e03ecc54ead40f10.tar.gz glib-fb2a2b74b7a82bb7a463d323e03ecc54ead40f10.tar.bz2 glib-fb2a2b74b7a82bb7a463d323e03ecc54ead40f10.zip | |
Imported Upstream version 2.51.5
Change-Id: If8ad379b8e3c0268a99759a5bf621c201926d3fe
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 324388f51..77044f8eb 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ m4_define(glib_configure_ac) m4_define([glib_major_version], [2]) m4_define([glib_minor_version], [51]) -m4_define([glib_micro_version], [4]) +m4_define([glib_micro_version], [5]) m4_define([glib_interface_age], [0]) m4_define([glib_binary_age], [m4_eval(100 * glib_minor_version + glib_micro_version)]) @@ -223,22 +223,19 @@ AS_IF([test "x$glib_have_carbon" = "xyes"], [ ], [CARBON_LIBS=""]) AC_SUBST([CARBON_LIBS]) - +ac_cv_have_os_x_9_or_later="no" AS_IF([test "x$glib_have_cocoa" = "xyes"], [ AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available]) COCOA_LIBS="-Wl,-framework,Foundation" LDFLAGS="$LDFLAGS $COCOA_LIBS" - - osx_version=`sw_vers -productVersion` - osx_min_version="10.9.0" - AC_MSG_CHECKING([OSX version >= $osx_min_version]) - AS_VERSION_COMPARE([$osx_version], [$osx_min_version], [ - AC_MSG_RESULT([no]) - AC_MSG_ERROR([OSX version is too old!]) - ]) - AC_MSG_RESULT([yes]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include <AvailabilityMacros.h> +#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090 +#error Compiling for minimum OS X version before 10.9 +#endif + ]])],[ac_cv_have_os_x_9_or_later="yes"]) ], [COCOA_LIBS=""]) - +AM_CONDITIONAL([MAC_OS_X_9], [test "x$ac_cv_have_os_x_9_or_later" = xyes]) AC_SUBST([COCOA_LIBS]) dnl declare --enable-* args and collect ac_help strings |