X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=configure.ac;h=1e5a4526db6c8c2bdc812b085892a73769ae18d0;hp=f5149ba55f9d17885e7c1e855bba18f0a0b38a69;hb=548478747b2493842b736b4a1e2bc6bb3015f790;hpb=ca34b31733ae3296b9a371a8e937e14bf774d982 diff --git a/configure.ac b/configure.ac index f5149ba..1e5a452 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([at-spi2-atk], [1.91.91], [accessibility-atspi@lists.linux-foundation.org]) +AC_INIT([at-spi2-atk], [2.9.90], [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 @@ -39,17 +39,10 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0]) AC_SUBST(DBUS_LIBS) AC_SUBST(DBUS_CFLAGS) -PKG_CHECK_MODULES(GLIB, [glib-2.0]) +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.32.0]) AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_CFLAGS) -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(GOBJ, [gobject-2.0 >= 2.0.0]) AC_SUBST(GOBJ_LIBS) AC_SUBST(GOBJ_CFLAGS) @@ -58,18 +51,13 @@ 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.9.4]) AC_SUBST(ATK_LIBS) AC_SUBST(ATK_CFLAGS) -AC_PATH_XTRA - -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) +PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.9.4]) +AC_SUBST(ATSPI_LIBS) +AC_SUBST(ATSPI_CFLAGS) GLIB_GSETTINGS @@ -92,18 +80,10 @@ 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$dbus_glib_old" = "xyes"; then - P2P_CFLAGS=-DDISABLE_P2P +if test "x$GCC" = xyes; then + CFLAGS="$CFLAGS -Werror-implicit-function-declaration" fi if test "x$enable_p2p" = "xno"; then @@ -113,21 +93,11 @@ fi AC_SUBST(P2P_CFLAGS) AC_CONFIG_FILES([Makefile - dbind/dbind-config.h - dbind/Makefile + atk-bridge-2.0.pc 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 - -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