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=371c33f5d961836c23091c4889add1abf908cc1d;hb=a16f5306aab7f9d5a8e0fe32fb75deddba175341;hpb=eb3491f5dc29e0ea5d1be5fd730fe2baa627e9ce diff --git a/configure.ac b/configure.ac index 371c33f..7e821ea 100644 --- a/configure.ac +++ b/configure.ac @@ -1,24 +1,18 @@ - -AC_INIT([at-spi], [1.9.0], [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_MAJOR_VERSION=1 -AT_SPI_MINOR_VERSION=23 -AT_SPI_MICRO_VERSION=3 -AT_SPI_INTERFACE_AGE=0 -AT_SPI_BINARY_AGE=0 -AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION" -AC_SUBST(AT_SPI_MAJOR_VERSION) -AC_SUBST(AT_SPI_MINOR_VERSION) -AC_SUBST(AT_SPI_MICRO_VERSION) -AC_SUBST(AT_SPI_INTERFACE_AGE) -AC_SUBST(AT_SPI_BINARY_AGE) +AT_SPI_ATK_MAJOR_VERSION=0 +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" +AC_SUBST(AT_SPI_ATK_VERSION) # libtool versioning LT_RELEASE=$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION -LT_CURRENT=10 -LT_REVISION=11 -LT_AGE=10 +LT_CURRENT=0 +LT_REVISION=0 +LT_AGE=0 LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}' AC_SUBST(LT_VERSION_INFO) AC_SUBST(LT_RELEASE) @@ -29,23 +23,15 @@ AC_SUBST(LT_AGE) AM_INIT_AUTOMAKE([-Wall foreign]) dnl translation of any at-spi strings: used only for .server -dnl IT_PROG_INTLTOOL([0.35.0]) +IT_PROG_INTLTOOL([0.40.0]) AC_PROG_CC -AM_PATH_PYTHON(2.4) AM_DISABLE_STATIC AM_PROG_LIBTOOL PKG_PROG_PKG_CONFIG GETTEXT_PACKAGE="${PACKAGE}" AC_SUBST(GETTEXT_PACKAGE) -dnl internationalization support; uncomment if translatable strings are reintroduced -AM_GLIB_GNU_GETTEXT - -# AM_GLIB_GNU_GETTEXT above subst. $DATADIRNAME -# this is the directory where the *.{mo,gmo} files are installed -localedir='${prefix}/${DATADIRNAME}/locale' -AC_SUBST(localedir) AC_CONFIG_HEADERS([config.h]) @@ -57,14 +43,13 @@ 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) -PKG_CHECK_MODULES(LIB_XML, [libxml-2.0 >= 2.0.0]) -AC_SUBST(LIB_XML_LIBS) -AC_SUBST(LIB_XML_CFLAGS) - PKG_CHECK_MODULES(GOBJ, [gobject-2.0 >= 2.0.0]) AC_SUBST(GOBJ_LIBS) AC_SUBST(GOBJ_CFLAGS) @@ -73,22 +58,10 @@ PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0.0]) AC_SUBST(GMODULE_LIBS) AC_SUBST(GMODULE_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(GDK, [gdk-2.0 >= 2.0.0]) -AC_SUBST(GDK_LIBS) -AC_SUBST(GDK_CFLAGS) - -PKG_CHECK_MODULES(GAIL, [gail >= 1.9.0]) -AC_SUBST(GAIL_LIBS) -AC_SUBST(GAIL_CFLAGS) - AC_PATH_XTRA if test x$no_x = xyes ; then @@ -98,64 +71,32 @@ else fi AC_SUBST(X_LIBS) -#LIBS="$LIBS $X_LIBS" -AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst,[ - AC_MSG_ERROR([Couldn't find the Xtst library. Check config.log])], - -lX11 -lXext) -AC_SUBST(XTST_LIBS) - -have_xkb= -AC_CHECK_LIB(X11, XkbQueryExtension, have_xkb="maybe") -if test "x$have_xkb" = "xmaybe"; then - AC_CHECK_HEADER(X11/XKBlib.h, have_xkb=yes) -fi -if test "x$have_xkb" = "xyes"; then - AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_XKB], [], Xkb is present) +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) -have_xinput= -AC_CHECK_LIB(Xi, XOpenDevice, XINPUT_LIBS=-lXi,,-lXext) -if test "x$XINPUT_LIBS" = x; then - AC_MSG_ERROR(Couldn't find the XInput library. Check config.log for details) -fi -AC_CHECK_HEADER(X11/extensions/XInput.h, have_xinput=yes) -AC_SUBST(XINPUT_LIBS) - -AC_ARG_ENABLE(xevie, [--enable-xevie Build with XEViE support [default=yes]], enable_xevie="$enableval", enable_xevie=yes) - -if test x$enable_xevie = xyes ; then - have_xevie= - AC_CHECK_LIB(Xext, XevieStart, have_xevie="yes") - - if test "x$have_xevie" = "xyes"; then - XEVIE_LIBS="-lXext" - AC_DEFINE([HAVE_XEVIE], [], Xevie is present) - else - AC_CHECK_LIB(Xevie, XevieQueryVersion, have_xevie="maybe",,-lXevie -lXext) - if test "x$have_xevie" = "xmaybe"; then - AC_CHECK_HEADER(X11/extensions/Xevie.h, have_xevie=yes, [], [#include ]) - if test "x$have_xevie" = "xyes"; then - XEVIE_LIBS="-lXext -lXevie" - AC_DEFINE([HAVE_XEVIE], [], Xevie is present) - fi - fi - fi - AC_SUBST(XEVIE_LIBS) -fi +AC_ARG_ENABLE(p2p, [ --enable-p2p Allow peer-to-peer DBus connections [default=yes]], enable_p2p="$enableval", enable_p2p=yes) -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 -fi +#libtool option to strip symbols starting with cspi +LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^cspi]].*"' +AC_SUBST(LIBTOOL_EXPORT_OPTIONS) -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 +# 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 @@ -170,34 +111,33 @@ DBIND_CHECK_ALIGNOF(dbind_pointer) DBIND_CHECK_ALIGNOF(dbind_struct) CPPFLAGS=$orig_CPPFLAGS -#libtool option to strip symbols starting with cspi -# -LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^cspi]].*"' -AC_SUBST(LIBTOOL_EXPORT_OPTIONS) +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 - libspi-1.0.pc - libspi-1.0-uninstalled.pc - libloginhelper-1.0.pc - cspi-1.0.pc - cspi-1.0-uninstalled.pc - xml/Makefile - tests/Makefile - tools/Makefile + dbind/dbind-config.h + dbind/Makefile droute/Makefile - spi-common/Makefile - registryd/Makefile + common/Makefile atk-adaptor/Makefile - login-helper/Makefile - tests/dummyatk/Makefile - tests/cspi/Makefile - tests/data/Makefile - tests/pyatspi/Makefile - tests/pyatspi/pasytest/Makefile - tests/apps/Makefile - dbind/Makefile - cspi/Makefile - pyatspi/Makefile - dbind-config.h]) + atk-adaptor/adaptors/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