X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=configure.ac;h=211bc57476d14eb9c2b349dbc6281f19bdc8d7f4;hp=31c82027f5999de945f3e0d1c45abaa5740c319f;hb=a07ee00982126f339316f296bb409420e1b8a329;hpb=eef38e79b4dfb2317ba7d94ad7c344f0fe145283 diff --git a/configure.ac b/configure.ac index 31c8202..211bc57 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([at-spi2-atk], [0.3.92], [accessibility-atspi@lists.linux-foundation.org]) +AC_INIT([at-spi2-atk], [2.0.1], [accessibility-atspi@lists.linux-foundation.org]) AC_CONFIG_AUX_DIR(config) AT_SPI_ATK_MAJOR_VERSION=0 @@ -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) @@ -59,9 +55,9 @@ 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 +PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 1.91.92]) +AC_SUBST(ATSPI_LIBS) +AC_SUBST(ATSPI_CFLAGS) AC_PATH_XTRA @@ -72,11 +68,9 @@ else 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) +GLIB_GSETTINGS + +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,6 +99,12 @@ DBIND_CHECK_ALIGNOF(dbind_pointer) DBIND_CHECK_ALIGNOF(dbind_struct) CPPFLAGS=$orig_CPPFLAGS +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 +115,7 @@ AC_CONFIG_FILES([Makefile atk-adaptor/gtk-2.0/Makefile atk-adaptor/gtk-3.0/Makefile po/Makefile.in + schemas/Makefile ]) AC_OUTPUT