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
Some fixes for--disable-p2p
[platform/core/uifw/at-spi2-atk.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
06ffe8b
..
a13f776
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,4
+1,4
@@
-AC_INIT([at-spi2-atk], [
0.3.1
], [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_ATK_MAJOR_VERSION=0
AC_CONFIG_AUX_DIR(config)
AT_SPI_ATK_MAJOR_VERSION=0
@@
-43,7
+43,10
@@
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.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)
AC_SUBST(DBUS_GLIB_LIBS)
AC_SUBST(DBUS_GLIB_CFLAGS)
@@
-59,10
+62,6
@@
PKG_CHECK_MODULES(ATK, [atk >= 1.29.3])
AC_SUBST(ATK_LIBS)
AC_SUBST(ATK_CFLAGS)
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)
-
dnl GConf checks
AC_PATH_PROG(GCONFTOOL, gconftool-2)
AM_GCONF_SOURCE_2
dnl GConf checks
AC_PATH_PROG(GCONFTOOL, gconftool-2)
AM_GCONF_SOURCE_2
@@
-82,6
+81,8
@@
if test x$enable_relocate = xyes ; then
fi
AM_CONDITIONAL(RELOCATE, test x$enable_relocate = xyes)
fi
AM_CONDITIONAL(RELOCATE, test x$enable_relocate = xyes)
+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)
#libtool option to strip symbols starting with cspi
LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^cspi]].*"'
AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
@@
-109,6
+110,16
@@
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
+fi
+
+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
AC_CONFIG_FILES([Makefile
dbind/dbind-config.h
dbind/Makefile
@@
-116,7
+127,14
@@
AC_CONFIG_FILES([Makefile
common/Makefile
atk-adaptor/Makefile
atk-adaptor/adaptors/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
])
AC_OUTPUT
po/Makefile.in
])
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