X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=configure.ac;h=7e821ea3a1959a83a6d02090ed46baa2dd6122f3;hp=89ca4626c425c103e7044a62a5e0cb4da04f37dd;hb=a16f5306aab7f9d5a8e0fe32fb75deddba175341;hpb=1bd04d0eba893ad35019f151da08df85e13e7297

diff --git a/configure.ac b/configure.ac
index 89ca462..7e821ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([at-spi2-atk], [0.5.1], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-atk], [1.91.3], [accessibility-atspi@lists.linux-foundation.org])
 AC_CONFIG_AUX_DIR(config)
 
 AT_SPI_ATK_MAJOR_VERSION=0
@@ -43,7 +43,10 @@ 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])
+PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.90, dbus_glib=yes, dbus_glib=no)
+if test "x$dbus_glib" = "xno"; then
+	PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.7.0, dbus_glib_old=yes)
+fi
 AC_SUBST(DBUS_GLIB_LIBS)
 AC_SUBST(DBUS_GLIB_CFLAGS)
 
@@ -59,10 +62,6 @@ PKG_CHECK_MODULES(ATK, [atk >= 1.29.3])
 AC_SUBST(ATK_LIBS)
 AC_SUBST(ATK_CFLAGS)
 
-dnl GConf checks
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
-AM_GCONF_SOURCE_2
-
 AC_PATH_XTRA
 
 if test x$no_x = xyes ; then
@@ -72,12 +71,19 @@ else
 fi
 AC_SUBST(X_LIBS)
 
+AM_GCONF_SOURCE_2
 AC_ARG_ENABLE(relocate, [  --enable-relocate  Relocate to coexist with CORBA [default=no]], enable_relocate="$enableval", enable_relocate=no)
 if test x$enable_relocate = xyes ; then
 	AC_DEFINE(RELOCATE, , [Relocate to coexist with CORBA])
+	dnl GConf checks
+	AC_PATH_PROG(GCONFTOOL, gconftool-2)
+else
+	GLIB_GSETTINGS
 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]].*"'
 AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
@@ -105,6 +111,16 @@ DBIND_CHECK_ALIGNOF(dbind_pointer)
 DBIND_CHECK_ALIGNOF(dbind_struct)
 CPPFLAGS=$orig_CPPFLAGS 
 
+if test "x$dbus_glib_old" = "xyes"; then
+	P2P_CFLAGS=-DDISABLE_P2P
+fi
+
+if test "x$enable_p2p" = "xno"; then
+	P2P_CFLAGS=-DDISABLE_P2P
+fi
+
+AC_SUBST(P2P_CFLAGS)
+
 AC_CONFIG_FILES([Makefile
 		 dbind/dbind-config.h
 		 dbind/Makefile
@@ -115,6 +131,13 @@ AC_CONFIG_FILES([Makefile
 		 atk-adaptor/gtk-2.0/Makefile
 		 atk-adaptor/gtk-3.0/Makefile
 		 po/Makefile.in
+                 schemas/Makefile
+schemas/org.a11y.atspi.gschema.xml
 		])
 
 AC_OUTPUT
+
+if test "x$dbus_glib_old" = "xyes"; then
+	P2P_CFLAGS=-DDISABLE_P2P
+	AC_MSG_WARN([found dbus-glib older than 0.90; disabling peer-to-peer support])
+fi