X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=configure.ac;h=08e9b59e28a6c99fccc60f43d2bad228e6f72b2e;hp=67fabae6739ca8265ed23ad32c6b3e0e83021006;hb=0c08002e32226232d7454897eabb6507773227c1;hpb=d6045b027fb429d00ac2634185f5f293f9255a91

diff --git a/configure.ac b/configure.ac
index 67fabae..08e9b59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([at-spi2-atk], [0.3.90], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-atk], [2.6.0], [accessibility-atspi@lists.linux-foundation.org])
 AC_CONFIG_AUX_DIR(config)
 
 AT_SPI_ATK_MAJOR_VERSION=0
@@ -20,10 +20,10 @@ AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
-AM_INIT_AUTOMAKE([-Wall foreign])
+AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
 
-dnl translation of any at-spi strings: used only for .server
-IT_PROG_INTLTOOL([0.40.0])
+# Enable silent build when available (Automake 1.11)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 AC_PROG_CC
 AM_DISABLE_STATIC
@@ -43,10 +43,6 @@ PKG_CHECK_MODULES(GLIB, [glib-2.0])
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
 
-PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.7.0])
-AC_SUBST(DBUS_GLIB_LIBS)
-AC_SUBST(DBUS_GLIB_CFLAGS)
-
 PKG_CHECK_MODULES(GOBJ, [gobject-2.0 >= 2.0.0])
 AC_SUBST(GOBJ_LIBS)
 AC_SUBST(GOBJ_CFLAGS)
@@ -55,28 +51,17 @@ PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0.0])
 AC_SUBST(GMODULE_LIBS)
 AC_SUBST(GMODULE_CFLAGS)
 
-PKG_CHECK_MODULES(ATK, [atk >= 1.29.3])
+PKG_CHECK_MODULES(ATK, [atk >= 2.1.5])
 AC_SUBST(ATK_LIBS)
 AC_SUBST(ATK_CFLAGS)
 
-dnl GConf checks
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
-AM_GCONF_SOURCE_2
+PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.1.4])
+AC_SUBST(ATSPI_LIBS)
+AC_SUBST(ATSPI_CFLAGS)
 
-AC_PATH_XTRA
+GLIB_GSETTINGS
 
-if test x$no_x = xyes ; then
-	AC_MSG_ERROR([X development libraries not found])
-else
-	X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-fi
-AC_SUBST(X_LIBS)
-
-AC_ARG_ENABLE(relocate, [  --enable-relocate  Relocate to coexist with CORBA [default=yes]], enable_relocate="$enableval", enable_relocate=yes)
-if test x$enable_relocate = xyes ; then
-	AC_DEFINE(RELOCATE, , [Relocate to coexist with CORBA])
-fi
-AM_CONDITIONAL(RELOCATE, test x$enable_relocate = xyes)
+AC_ARG_ENABLE(p2p, [  --enable-p2p  Allow peer-to-peer DBus connections [default=yes]], enable_p2p="$enableval", enable_p2p=yes)
 
 #libtool option to strip symbols starting with cspi
 LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^cspi]].*"'
@@ -105,16 +90,25 @@ DBIND_CHECK_ALIGNOF(dbind_pointer)
 DBIND_CHECK_ALIGNOF(dbind_struct)
 CPPFLAGS=$orig_CPPFLAGS 
 
+if test "x$GCC" = xyes; then
+	CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
+fi
+
+if test "x$enable_p2p" = "xno"; then
+	P2P_CFLAGS=-DDISABLE_P2P
+fi
+
+AC_SUBST(P2P_CFLAGS)
+
 AC_CONFIG_FILES([Makefile
+		 atk-bridge-2.0.pc
 		 dbind/dbind-config.h
 		 dbind/Makefile
 		 droute/Makefile
-		 common/Makefile
 		 atk-adaptor/Makefile
 		 atk-adaptor/adaptors/Makefile
 		 atk-adaptor/gtk-2.0/Makefile
-		 atk-adaptor/gtk-3.0/Makefile
-		 po/Makefile.in
+                 schemas/Makefile
 		])
 
 AC_OUTPUT