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=7d588ce6331ce8a10ef51fe5bbb53b4dc6a3dc6c;hb=a07ee00982126f339316f296bb409420e1b8a329;hpb=d52b4e10e3acdd2ca44195650ccb586b425b7fc5

diff --git a/configure.ac b/configure.ac
index 7d588ce..211bc57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
-AC_INIT([at-spi2-atk], [0.1.2], [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
-AT_SPI_ATK_MINOR_VERSION=1
+AT_SPI_ATK_MINOR_VERSION=3
 AT_SPI_ATK_INTERFACE_AGE=0
 AT_SPI_ATK_BINARY_AGE=0
 AT_SPI_ATK_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION"
@@ -22,33 +22,27 @@ AC_SUBST(LT_AGE)
 
 AM_INIT_AUTOMAKE([-Wall foreign])
 
+dnl translation of any at-spi strings: used only for .server
+IT_PROG_INTLTOOL([0.40.0])
+
 AC_PROG_CC
 AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG
 
+GETTEXT_PACKAGE="${PACKAGE}"
+AC_SUBST(GETTEXT_PACKAGE)
+
 AC_CONFIG_HEADERS([config.h])
 
 PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0])
 AC_SUBST(DBUS_LIBS)
 AC_SUBST(DBUS_CFLAGS)
 
-PKG_CHECK_MODULES(DROUTE, [droute-0.1 >= 0.1])
-AC_SUBST(DROUTE_LIBS)
-AC_SUBST(DROUTE_CFLAGS)
-
-PKG_CHECK_MODULES(DBIND, [dbind-0.1 >= 0.1])
-AC_SUBST(DBIND_LIBS)
-AC_SUBST(DBIND_CFLAGS)
-
 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)
@@ -57,43 +51,71 @@ PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0.0])
 AC_SUBST(GMODULE_LIBS)
 AC_SUBST(GMODULE_CFLAGS)
 
-PKG_CHECK_MODULES(LIB_XML, [libxml-2.0 >= 2.0.0])
-AC_SUBST(LIB_XML_LIBS)
-AC_SUBST(LIB_XML_CFLAGS)
-
-PKG_CHECK_MODULES(ATK, [atk >= 1.17.0])
+PKG_CHECK_MODULES(ATK, [atk >= 1.29.3])
 AC_SUBST(ATK_LIBS)
 AC_SUBST(ATK_CFLAGS)
 
-PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0])
-AC_SUBST(GTK_LIBS)
-AC_SUBST(GTK_CFLAGS)
+PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 1.91.92])
+AC_SUBST(ATSPI_LIBS)
+AC_SUBST(ATSPI_CFLAGS)
 
 AC_PATH_XTRA
 
-AC_ARG_VAR([DEFAULT_ATSPI_INTROSPECTION_PATH],
-	   [Set the default path for the install ofDBus introspection XML
-	    relative to the pkgdatadir.])
-if test -z "$DEFAULT_ATSPI_INTROSPECTION_PATH"; then
-	  DEFAULT_ATSPI_INTROSPECTION_PATH=dbus
+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_VAR([GTK_MODULE_DIR],
-	   [Where to place the atk-adaptor gtk module])
-if test -z "$GTK_MODULE_DIR"; then
-	  GTK_MODULE_DIR=gtk-2.0/modules
-fi
+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]].*"'
 AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
 
+# Extra libraries for sockets added by Willie Walker
+# based upon how SunStudio libraries work.
+#
+if test "$GCC" = yes; then
+    EXTRA_SOCKET_LIBS=""
+else
+    EXTRA_SOCKET_LIBS="-lsocket -lnsl"
+fi
+AC_SUBST(EXTRA_SOCKET_LIBS)
+
+dnl find sizes & alignments
+orig_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
+DBIND_CHECK_ALIGNOF(char)
+DBIND_CHECK_ALIGNOF(dbus_bool_t)
+DBIND_CHECK_ALIGNOF(dbus_int16_t)
+DBIND_CHECK_ALIGNOF(dbus_int32_t)
+DBIND_CHECK_ALIGNOF(dbus_int64_t)
+DBIND_CHECK_ALIGNOF(double)
+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
-		 pkgconfig/cspi-1.0.pc
-		 pkgconfig/cspi-1.0-uninstalled.pc
+		 dbind/dbind-config.h
+		 dbind/Makefile
+		 droute/Makefile
 		 common/Makefile
 		 atk-adaptor/Makefile
-		 cspi/Makefile
+		 atk-adaptor/adaptors/Makefile
+		 atk-adaptor/gtk-2.0/Makefile
+		 atk-adaptor/gtk-3.0/Makefile
+		 po/Makefile.in
+                 schemas/Makefile
 		])
 
 AC_OUTPUT