X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=4124d014fb3ca3ac7b9d8de2a300e890720cd045;hb=6e87792d6aa28299322af3de62feb865cfa585f6;hp=45577b9f47623f01709ff63304917666837c24f0;hpb=cf515ea914d43f0011faf430f65a7bd7e8c49881;p=platform%2Fupstream%2Fatk.git diff --git a/configure.ac b/configure.ac index 45577b9..4124d01 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], [11]) -m4_define([atk_micro_version], [2]) +m4_define([atk_minor_version], [16]) +m4_define([atk_micro_version], [0]) m4_define([atk_version], [atk_major_version.atk_minor_version.atk_micro_version]) @@ -195,10 +195,10 @@ ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`" AM_GLIB_GNU_GETTEXT # Introspection support -GOBJECT_INTROSPECTION_CHECK([0.6.7]) +#GOBJECT_INTROSPECTION_CHECK([0.6.7]) # Documentation support -GTK_DOC_CHECK([1.13]) +#GTK_DOC_CHECK([1.13]) # define a MAINT-like variable REBUILD which is set if Perl # and awk are found, so autogenerated sources can be rebuilt @@ -215,11 +215,52 @@ if test "x$enable_rebuilds" = "xyes" && \ fi AC_SUBST(REBUILD) -GNOME_COMPILE_WARNINGS([maximum]) +# option to specify python interpreter to use; this just sets $PYTHON, so that +# we will fallback to reading $PYTHON if --with-python is not given, and +# python.m4 will get the expected input. +# This dependency on Python is for 'make dist', so normal builds would not +# need Python +AC_ARG_WITH(python, + AS_HELP_STRING([--with-python=PATH], + [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), + [PYTHON="$withval"], []) +if test x"$PYTHON" = xyes; then + AC_MSG_ERROR([--with-python option requires a path or program argument]) +fi +AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") + +# 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 atk.pc atk-uninstalled.pc atk/Makefile @@ -230,6 +271,8 @@ build/Makefile build/win32/Makefile build/win32/vs9/Makefile build/win32/vs10/Makefile +build/win32/vs11/Makefile +build/win32/vs12/Makefile docs/Makefile docs/version.xml atk.spec