X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=3ee2cf5b3b50653fbe5dffc5a97f3fadefa771d0;hb=2a1266923244199938dd703eb08704d98edb1300;hp=71f7f93a47b583aa8f9527529a088460c74eac22;hpb=1859e01b00866830d027aed1b8acc2496aa228c1;p=platform%2Fupstream%2Fat-spi2-core.git diff --git a/configure.ac b/configure.ac index 71f7f93..3ee2cf5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([at-spi2-core], [2.5.91], [accessibility-atspi@lists.linux-foundation.org]) +AC_INIT([at-spi2-core], [2.25.4], [accessibility-atspi@lists.linux-foundation.org]) AC_PREREQ([2.59]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR([m4]) @@ -20,32 +20,41 @@ AC_SUBST(LT_CURRENT) AC_SUBST(LT_REVISION) AC_SUBST(LT_AGE) -AM_INIT_AUTOMAKE([1.9 -Wall foreign no-dist-gzip dist-xz]) +AM_INIT_AUTOMAKE([1.13 -Wall -Wno-portability foreign subdir-objects no-dist-gzip dist-xz]) -AC_PROG_CC +# Support silent build rules. Disable +# by either passing --disable-silent-rules to configure or passing V=1 +# to make +AM_SILENT_RULES([yes]) + +AM_PROG_CC_C_O LT_INIT([disable-static]) PKG_PROG_PKG_CONFIG AC_CONFIG_HEADERS([config.h]) -dnl translation of at-spi strings -IT_PROG_INTLTOOL([0.40.0]) +AC_PROG_SED +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT([external]) GETTEXT_PACKAGE="${PACKAGE}" AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], + ["$GETTEXT_PACKAGE"], + [The prefix for our gettext translation domains.]) PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0]) AC_SUBST(DBUS_LIBS) AC_SUBST(DBUS_CFLAGS) -PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.26.0]) +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.36.0]) AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_CFLAGS) -AC_CHECK_LIB([glib-2.0], [g_ptr_array_new_with_free_func], [:], - [AC_MSG_ERROR([The version of glib-2.0 found does not define ] - [g_ptr_array_new_with_free_func. Please upgrade glib.])], - [$GLIB_LIBS]) + +# Use pkg-config to find the glib-mkenums script +GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` +AC_SUBST(GLIB_MKENUMS) PKG_CHECK_MODULES(GOBJ, [gobject-2.0 >= 2.0.0]) AC_SUBST(GOBJ_LIBS) @@ -66,80 +75,50 @@ AC_CHECK_LIB(c, dlopen, DL_LIBS="", AC_SUBST(DL_LIBS) -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) - -save_LIBS="$LIBS" -LIBS="" -CPPFLAGS="$CPPFLAGS $X_CFLAGS" -AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst,[ - AC_MSG_ERROR([Couldn't find the Xtst library. Check config.log])], - $X_LIBS) -AC_SUBST(XTST_LIBS) -LIBS="$LIBS $save_LIBS" - -save_LIBS="$LIBS" -LIBS="" -AC_CHECK_LIB(X11, XkbQueryExtension, have_xkb="maybe", have_xkb="no", $X_LIBS) -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_DEFINE([HAVE_XKB], [], [Xkb is present]) -fi -LIBS="$LIBS $save_LIBS" - -save_LIBS="$LIBS" -LIBS="" -AC_CHECK_LIB(Xi, XOpenDevice, have_xinput="maybe", have_xinput="no", $X_LIBS) -if test "x$have_xinput" = "xmaybe"; then - save_LIBS="$LIBS" - LIBS="$LIBS $X_LIBS" - AC_CHECK_HEADER([X11/extensions/XInput.h], [have_xinput="yes"]) - LIBS="$save_LIBS" -fi -if test "x$have_xinput" != "xyes"; then - AC_MSG_ERROR([Couldn't find the XInput library. Check config.log for details]) -fi -XINPUT_LIBS="-lXi" -AC_SUBST(XINPUT_LIBS) -LIBS="$LIBS $save_LIBS" - -save_LIBS="$LIBS" -LIBS="" -AC_ARG_ENABLE(xevie, - [AS_HELP_STRING([--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", have_xevie="no", $X_LIBS) - - 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",,$X_LIBS) - 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 -LIBS="$LIBS $save_LIBS" +AC_ARG_ENABLE(x11, + [AS_HELP_STRING([--disable-x11], + [disable the X11 backend])],, + [enable_x11=auto]) + +AS_IF([test "x$enable_x11" = xno], [ + AM_CONDITIONAL(USE_X11, false) +], [ + PKG_CHECK_MODULES(X11, [x11], [ + AC_DEFINE(HAVE_X11, 1, [Define to use X11]) + AC_SUBST(HAVE_X11) + have_x11=yes + ], [ + AS_IF([test "x$enable_x11" = xyes], [ + AC_MSG_ERROR([Unable to find X11 development files]) + ]) + have_x11=no + ]) + + # Check for additional X11 extensions + AS_IF([test "x$have_x11" = xyes], [ + # XTest (mandatory) + PKG_CHECK_MODULES(XTST, [xtst]) + X11_CFLAGS="$X11_CFLAGS $XTST_CFLAGS" + X11_LIBS="$X11_LIBS $XTST_LIBS" + + # XInput (mandatory) + PKG_CHECK_MODULES(XINPUT, [xi]) + X11_CFLAGS="$X11_CFLAGS $XINPUT_CFLAGS" + X11_LIBS="$X11_LIBS $XINPUT_LIBS" + + # XKB (optional) + PKG_CHECK_MODULES(XKB, [xkbcommon-x11], [ + AC_DEFINE(HAVE_XKB, 1, [Define to use XKB]) + X11_CFLAGS="$X11_CFLAGS $XKB_CFLAGS" + X11_LIBS="$X11_LIBS $XKB_LIBS" + ], []) + ]) + + AC_SUBST(X11_CFLAGS) + AC_SUBST(X11_LIBS) + + AM_CONDITIONAL(USE_X11, test "x$have_x11" = xyes) +]) AC_ARG_WITH([dbus_daemondir], [AS_HELP_STRING([--with-dbus-daemondir=], @@ -167,39 +146,45 @@ else fi AC_SUBST(DBUS_SERVICES_DIR) -GOBJECT_INTROSPECTION_CHECK([0.9.6]) +GOBJECT_INTROSPECTION_CHECK([1.32.0]) AC_SUBST(LIBTOOL_EXPORT_OPTIONS) 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) - -GTK_DOC_CHECK([1.09]) +AC_CHECK_ALIGNOF(char) +AC_CHECK_ALIGNOF(dbus_bool_t, [#include ]) +AC_CHECK_ALIGNOF(dbus_int16_t, [#include ]) +AC_CHECK_ALIGNOF(dbus_int32_t, [#include ]) +AC_CHECK_ALIGNOF(dbus_int64_t, [#include ]) +AC_CHECK_ALIGNOF(double, [#include ]) +AC_CHECK_ALIGNOF(dbind_pointer, [AC_INCLUDES_DEFAULT +typedef void *dbind_pointer;]) +AC_CHECK_ALIGNOF(dbind_struct, [AC_INCLUDES_DEFAULT +typedef struct {char s1;} dbind_struct;]) + +GTK_DOC_CHECK([1.25]) if test "x$GCC" = xyes; then CFLAGS="$CFLAGS -Werror-implicit-function-declaration" fi + CPPFLAGS=$orig_CPPFLAGS -AC_CONFIG_FILES([Makefile po/Makefile.in + +AC_CONFIG_FILES([ + Makefile + po/Makefile.in xml/Makefile dbind/Makefile -dbind/dbind-config.h atspi/Makefile registryd/Makefile bus/Makefile -doc/Makefile -doc/libatspi/Makefile -atspi-2.pc -atspi-2-uninstalled.pc + doc/Makefile + doc/libatspi/Makefile + doc/libatspi/version.xml + test/Makefile + atspi-2.pc ]) AC_OUTPUT