X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.in;h=61fde31d22f70811d85974b03912db0f618aefac;hb=cf02cd1da9b35a17fc4f13e74add7dc5e7485b62;hp=08b5704bc3cab352362ac71e4b016da78d2b4528;hpb=3174003b8617269462117bc7782ce0d9da054b50;p=platform%2Fupstream%2Fatk.git

diff --git a/configure.in b/configure.in
index 08b5704..61fde31 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.54)
+AC_PREREQ(2.62)
 
 dnl ==========================================================================
 dnl                              Versioning              
@@ -16,8 +16,8 @@ dnl set ATK_BINARY_AGE _and_ ATK_INTERFACE_AGE to 0.
 
 dnl The triplet 
 m4_define([atk_major_version], [1])
-m4_define([atk_minor_version], [13])
-m4_define([atk_micro_version], [0])
+m4_define([atk_minor_version], [29])
+m4_define([atk_micro_version], [4])
 m4_define([atk_version],
           [atk_major_version.atk_minor_version.atk_micro_version])
 
@@ -25,13 +25,13 @@ dnl The X.Y in -latk-X.Y line. This is expected to stay 1.0 until Atk 2.
 m4_define([atk_api_version], [1.0])
 
 dnl Number of releases since we've added interfaces
-m4_define([atk_interface_age], [0])
+m4_define([atk_interface_age], [1])
 
 m4_define([atk_binary_age],
           [m4_eval(100 * atk_minor_version + 10 + atk_micro_version)])
 
 m4_define([lt_current],
-          [m4_eval(100 * atk_minor_version + 10 + atk_micro_version - atk_interface_age)])`
+          [m4_eval(100 * atk_minor_version + 10 + atk_micro_version - atk_interface_age)])
 m4_define([lt_revision], [atk_interface_age])
 m4_define([lt_age], [m4_eval(atk_binary_age - atk_interface_age)])
 m4_define([lt_version_info], [lt_current:lt_revision:lt_age])
@@ -42,9 +42,11 @@ AC_INIT(atk, [atk_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=atk])
 AC_CONFIG_SRCDIR([ChangeLog])
 
+AC_CONFIG_MACRO_DIR([m4])
+
 AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([-Wno-portability])
 
 dnl ==========================================================================
 dnl
@@ -103,6 +105,14 @@ AC_MSG_CHECKING([for native Win32 platform])
 case "$host" in
   *-*-mingw*)
     atk_native_win32=yes
+    case "$host" in
+      x86_64-*-*)
+	LIB_EXE_MACHINE_FLAG=X64
+	;;
+      *)
+	LIB_EXE_MACHINE_FLAG=X86
+	;;
+    esac
     ;;
   *)
     atk_native_win32=no
@@ -111,6 +121,8 @@ esac
 AC_MSG_RESULT([$atk_native_win32])
 AM_CONDITIONAL(OS_WIN32, test "$atk_native_win32" = "yes")
 
+AC_SUBST(LIB_EXE_MACHINE_FLAG)
+
 if test "$atk_native_win32" = "yes"; then
   AC_CHECK_TOOL(WINDRES, windres, no)
   if test "$WINDRES" = no; then
@@ -132,6 +144,8 @@ AC_ARG_ENABLE(rebuilds,
                               [disable all source autogeneration rules])],,
               [enable_rebuilds=yes])
 
+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES"
+
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
   case " $CFLAGS " in
@@ -141,15 +155,8 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-AM_PATH_GLIB_2_0(2.5.7,have_no_export=true,have_no_export=false)
-if test "x$have_no_export" = "xtrue"; then
-   GLIB_REQUIRED_VERSION=2.5.7
-   glib_no_export_package="gmodule-no-export-2.0"
-else
-   GLIB_REQUIRED_VERSION=2.0.0
-   glib_no_export_package=
-fi
-GLIB_PACKAGES="gobject-2.0 $glib_no_export_package"
+GLIB_REQUIRED_VERSION=2.0.0
+GLIB_PACKAGES="gobject-2.0"
 AC_SUBST(GLIB_PACKAGES)
 AC_SUBST(GLIB_REQUIRED_VERSION)
 
@@ -162,7 +169,7 @@ AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :,
 *** GLIB is always available from ftp://ftp.gtk.org/. If GLIB is installed
 *** but not in the same location as pkg-config add the location of the file 
 *** glib-2.0.pc to the environment variable PKG_CONFIG_PATH.]),
-  gobject gmodule-no-export)
+  gobject)
 
 PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, ,
   AC_MSG_ERROR([
@@ -173,13 +180,13 @@ PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, ,
 # Rerun PKG_CONFIG to add gthread-2.0 cflags, but not libs
 DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
 
-ALL_LINGUAS="af am ar as az be bg bn bn_IN bs ca cs cy da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kn ko ku li lt lv mk ml mn mr ms nb ne nl nn or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sr@ije sv ta te th tk tr tt ug uk vi wa xh yi zh_CN zh_HK zh_TW"
+ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
 AM_GLIB_GNU_GETTEXT
 
-AM_GLIB_DEFINE_LOCALEDIR(ATK_LOCALEDIR)
-
 AC_CHECK_FUNCS(bind_textdomain_codeset)
 
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
+
 GTK_DOC_CHECK([1.0])
 
 # define a MAINT-like variable REBUILD which is set if Perl