X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=23a2b9c58172e195290700b49343313413504cb8;hb=60d7145c68a90e6d6aae4b50e20a50ce49d3052a;hp=0c8e08b96c9111b6f6d7781e702121fa8b5ec4f1;hpb=3a782f16588c99c26db0bdaa2d7e3c4559fd7858;p=platform%2Fupstream%2Fatk.git diff --git a/configure.ac b/configure.ac index 0c8e08b..23a2b9c 100644 --- a/configure.ac +++ b/configure.ac @@ -16,8 +16,8 @@ dnl set ATK_BINARY_AGE _and_ ATK_INTERFACE_AGE to 0. dnl The triplet m4_define([atk_major_version], [2]) -m4_define([atk_minor_version], [3]) -m4_define([atk_micro_version], [93]) +m4_define([atk_minor_version], [24]) +m4_define([atk_micro_version], [0]) m4_define([atk_version], [atk_major_version.atk_minor_version.atk_micro_version]) @@ -160,7 +160,7 @@ if test "x$GCC" = "xyes"; then fi changequote([,])dnl -GLIB_REQUIRED_VERSION=2.0.0 +GLIB_REQUIRED_VERSION=2.31.2 GLIB_PACKAGES="gobject-2.0" AC_SUBST(GLIB_PACKAGES) AC_SUBST(GLIB_REQUIRED_VERSION) @@ -186,14 +186,14 @@ PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, , DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0` # i18n stuff +AM_GNU_GETTEXT_VERSION([0.19.2]) +AM_GNU_GETTEXT([external]) + GETTEXT_PACKAGE=atk10 AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used]) -ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`" -AM_GLIB_GNU_GETTEXT - # Introspection support GOBJECT_INTROSPECTION_CHECK([0.6.7]) @@ -206,6 +206,10 @@ GTK_DOC_CHECK([1.13]) AC_PROG_AWK AC_CHECK_PROGS(PERL, perl5 perl) +# Check whether MSVC toolset is explicitly set +AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x]) +AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x]) + REBUILD=\# if test "x$enable_rebuilds" = "xyes" && \ test -n "$PERL" && \ @@ -215,6 +219,36 @@ if test "x$enable_rebuilds" = "xyes" && \ fi AC_SUBST(REBUILD) +# Check for the visibility flags +ATK_HIDDEN_VISIBILITY_CFLAGS="" +case "$host" in + *-*-mingw*) + dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport) + AC_DEFINE([_ATK_EXTERN], [__attribute__((visibility("default"))) __declspec(dllexport) extern], + [defines how to decorate public symbols while building]) + CFLAGS="${CFLAGS} -fvisibility=hidden" + ;; + *) + dnl on other compilers, check if we can do -fvisibility=hidden + SAVED_CFLAGS="${CFLAGS}" + CFLAGS="-fvisibility=hidden" + AC_MSG_CHECKING([for -fvisibility=hidden compiler flag]) + AC_TRY_COMPILE([], [int main (void) { return 0; }], + AC_MSG_RESULT(yes) + enable_fvisibility_hidden=yes, + AC_MSG_RESULT(no) + enable_fvisibility_hidden=no) + CFLAGS="${SAVED_CFLAGS}" + + AS_IF([test "${enable_fvisibility_hidden}" = "yes"], [ + AC_DEFINE([_ATK_EXTERN], [__attribute__((visibility("default"))) extern], + [defines how to decorate public symbols while building]) + ATK_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden" + ]) + ;; +esac +AC_SUBST(ATK_HIDDEN_VISIBILITY_CFLAGS) + AC_CONFIG_FILES([ Makefile po/Makefile.in @@ -222,11 +256,17 @@ atk.pc atk-uninstalled.pc atk/Makefile atk/atk.rc +atk/atkversion.h tests/Makefile -build/Makefile -build/win32/Makefile -build/win32/vs9/Makefile -build/win32/vs10/Makefile +win32/Makefile +win32/vs9/Makefile +win32/vs9/atk-version-paths.vsprops +win32/vs10/Makefile +win32/vs10/atk-version-paths.props +win32/vs11/Makefile +win32/vs12/Makefile +win32/vs14/Makefile +win32/vs15/Makefile docs/Makefile docs/version.xml atk.spec