projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Export the atk-bridge-2.0 library
[platform/core/uifw/at-spi2-atk.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
d477c4a
..
4de0516
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,4
+1,4
@@
-AC_INIT([at-spi2-atk], [
1.91.3
], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-atk], [
2.5.2
], [accessibility-atspi@lists.linux-foundation.org])
AC_CONFIG_AUX_DIR(config)
AT_SPI_ATK_MAJOR_VERSION=0
AC_CONFIG_AUX_DIR(config)
AT_SPI_ATK_MAJOR_VERSION=0
@@
-20,7
+20,10
@@
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
-AM_INIT_AUTOMAKE([-Wall foreign])
+AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
+
+# Enable silent build when available (Automake 1.11)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
dnl translation of any at-spi strings: used only for .server
IT_PROG_INTLTOOL([0.40.0])
dnl translation of any at-spi strings: used only for .server
IT_PROG_INTLTOOL([0.40.0])
@@
-43,13
+46,6
@@
PKG_CHECK_MODULES(GLIB, [glib-2.0])
AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS)
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)
PKG_CHECK_MODULES(GOBJ, [gobject-2.0 >= 2.0.0])
AC_SUBST(GOBJ_LIBS)
AC_SUBST(GOBJ_CFLAGS)
@@
-58,28
+54,15
@@
PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0.0])
AC_SUBST(GMODULE_LIBS)
AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS)
AC_SUBST(GMODULE_CFLAGS)
-PKG_CHECK_MODULES(ATK, [atk >=
1.29.3
])
+PKG_CHECK_MODULES(ATK, [atk >=
2.1.5
])
AC_SUBST(ATK_LIBS)
AC_SUBST(ATK_CFLAGS)
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
- 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.1.4])
+AC_SUBST(ATSPI_LIBS)
+AC_SUBST(ATSPI_CFLAGS)
-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])
-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)
AC_ARG_ENABLE(p2p, [ --enable-p2p Allow peer-to-peer DBus connections [default=yes]], enable_p2p="$enableval", enable_p2p=yes)
@@
-110,8
+93,8
@@
DBIND_CHECK_ALIGNOF(dbind_pointer)
DBIND_CHECK_ALIGNOF(dbind_struct)
CPPFLAGS=$orig_CPPFLAGS
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
fi
if test "x$enable_p2p" = "xno"; then
@@
-121,20
+104,16
@@
fi
AC_SUBST(P2P_CFLAGS)
AC_CONFIG_FILES([Makefile
AC_SUBST(P2P_CFLAGS)
AC_CONFIG_FILES([Makefile
+ atk-bridge-2.0.pc
dbind/dbind-config.h
dbind/Makefile
droute/Makefile
dbind/dbind-config.h
dbind/Makefile
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
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
])
AC_OUTPUT
-
-if test "x$dbus_glib_old" = "xyes"; then
- P2P_CFLAGS=-DDISABLE_P2P
- AC_MSG_WARN([found dbus-glib older than 0.9.0; disabling peer-to-peer support])
-fi