Revert "Merge remote-tracking branch 'origin/sandbox/mniesluchow/upstream_2_16' into...

[platform/upstream/atk.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b190251..8ec04bd 100644 (file)
--- 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], [15])
-m4_define([atk_micro_version], [4])
+m4_define([atk_minor_version], [12])
+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
@@ -229,41 +229,8 @@ if test x"$PYTHON" = xyes; then
 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)
-
-GNOME_COMPILE_WARNINGS([maximum])
-
 AC_CONFIG_FILES([
 Makefile
-po/Makefile.in
 atk.pc
 atk-uninstalled.pc
 atk/Makefile
@@ -274,8 +241,6 @@ 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