X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.in;h=8f942ff1d4aa9cbd43ae23e0e54e26961b538607;hb=fc127cbb0f6101f0dc98416737d651c0cda2ca10;hp=d2a06936747c710c11cba17f6f3fbb3498134374;hpb=aeae4d315b6dbc41ead61ed923087af1e4afe6f6;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/configure.in b/configure.in index d2a0693..8f942ff 100644 --- a/configure.in +++ b/configure.in @@ -1,10 +1,10 @@ AC_INIT(idl/Accessibility.idl) AT_SPI_MAJOR_VERSION=1 -AT_SPI_MINOR_VERSION=3 -AT_SPI_MICRO_VERSION=6 -AT_SPI_INTERFACE_AGE=6 -AT_SPI_BINARY_AGE=6 +AT_SPI_MINOR_VERSION=5 +AT_SPI_MICRO_VERSION=5 +AT_SPI_INTERFACE_AGE=5 +AT_SPI_BINARY_AGE=5 AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION" AM_INIT_AUTOMAKE(at-spi, $AT_SPI_VERSION) AC_SUBST(AT_SPI_MAJOR_VERSION) @@ -15,9 +15,9 @@ AC_SUBST(AT_SPI_BINARY_AGE) # libtool versioning LT_RELEASE=$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION -LT_CURRENT=9 -LT_REVISION=5 -LT_AGE=9 +LT_CURRENT=10 +LT_REVISION=4 +LT_AGE=10 LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}' AC_SUBST(LT_VERSION_INFO) AC_SUBST(LT_RELEASE) @@ -25,6 +25,12 @@ AC_SUBST(LT_CURRENT) AC_SUBST(LT_REVISION) AC_SUBST(LT_AGE) +dnl required versions of other tools. +m4_define([req_ver_atk], [1.7.2]) +m4_define([req_ver_libbonobo], [1.107.0]) +m4_define([req_ver_gail], [1.3.0]) +m4_define([req_ver_gtk], [2.0.0]) + dnl Specify a header configuration file AM_CONFIG_HEADER(config.h) @@ -39,63 +45,24 @@ AC_PROG_INSTALL AC_ISC_POSIX GNOME_COMMON_INIT -GNOME_PLATFORM_GNOME_2(yes, force) GNOME_COMPILE_WARNINGS(maximum) dnl Initialize libtool AM_DISABLE_STATIC AM_PROG_LIBTOOL -dnl internationalization support -dnl ALL_LINGUAS="az be ca cs cy da de el eo es et fi fr he hi is it ja ko mn ms ne nl pl pt_BR pt ru sk sl sq sr@Latn sr sv vi zh_CN" +dnl internationalization support; uncomment if translatable strings are reintroduced +dnl ALL_LINGUAS="ar az be bg bn bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr gu he hi hr id is it ja ko lt mn ms nb ne nl nn no or pa pl pt_BR pt ro ru sk sl sq sr@ije sr@Latn sr sv uk vi wa zh_CN" dnl AM_GLIB_GNU_GETTEXT -AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false) - -gtk_doc_min_version=0.6 -if $GTKDOC ; then - gtk_doc_version=`gtkdoc-mkdb --version` - AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version]) - if perl < \$required_ver); -} -exit 0; -EOF - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - GTKDOC=false - fi -fi - -dnl Let people disable the gtk-doc stuff. -AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto) - -if test x$enable_gtk_doc = xauto ; then - if test x$GTKDOC = xtrue ; then - enable_gtk_doc=yes - else - enable_gtk_doc=no - fi -fi - -dnl NOTE: We need to use a separate automake conditional for this -dnl to make this work with the tarballs. -AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) +GTK_DOC_CHECK([1.0]) AC_PATH_XTRA if test x$no_x = xyes ; then - AC_MSG_ERROR([X development libraries not found]) + AC_MSG_ERROR([X development libraries not found]) else - X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" + X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" fi AC_SUBST(X_LIBS) @@ -107,40 +74,43 @@ dnl AC_MSG_ERROR(Old libspi.1.x library found in $libdir. Please remove $(libd dnl fi dnl Checks for libraries -PKG_CHECK_MODULES(LIBSPI, \ - libbonobo-2.0 >= 1.107.0 \ - atk >= 1.3.4 \ - gtk+-2.0 > 2.0.0 \ - gail >= 1.3.0) +PKG_CHECK_MODULES(LIBSPI, [ + libbonobo-2.0 >= req_ver_libbonobo + atk >= req_ver_atk + gtk+-2.0 >= req_ver_gtk + gail >= req_ver_gail +]) AC_SUBST(LIBSPI_LIBS) AC_SUBST(LIBSPI_CFLAGS) -PKG_CHECK_MODULES(REGISTRYD, \ - libbonobo-2.0 >= 1.107.0 \ - gtk+-2.0 > 2.0.0 \ - atk >= 1.3.4) -REGISTRYD_LIBS="$REGISTRYD_LIBS" +PKG_CHECK_MODULES(REGISTRYD, [ + libbonobo-2.0 >= req_ver_libbonobo + atk >= req_ver_atk + gtk+-2.0 >= req_ver_gtk +]) AC_SUBST(REGISTRYD_LIBS) AC_SUBST(REGISTRYD_CFLAGS) -PKG_CHECK_MODULES(TESTS, \ - libbonobo-2.0 >= 1.107.0 \ - atk >= 1.3.4 \ - gtk+-2.0 > 2.0.0 \ - gail >= 1.3.0) +PKG_CHECK_MODULES(TESTS, [ + libbonobo-2.0 >= req_ver_libbonobo + atk >= req_ver_atk + gtk+-2.0 >= req_ver_gtk + gail >= req_ver_gail +]) AC_SUBST(TESTS_LIBS) AC_SUBST(TESTS_CFLAGS) -PKG_CHECK_MODULES(ATK_BRIDGE, \ - libbonobo-2.0 >= 1.107.0 \ - atk >= 1.3.4) -ATK_BRIDGE_LIBS="$ATK_BRIDGE_LIBS" +PKG_CHECK_MODULES(ATK_BRIDGE, [ + libbonobo-2.0 >= req_ver_libbonobo + atk >= req_ver_atk +]) AC_SUBST(ATK_BRIDGE_LIBS) AC_SUBST(ATK_BRIDGE_CFLAGS) -PKG_CHECK_MODULES(LIBCSPI, \ - libbonobo-2.0 >= 1.107.0 \ - atk >= 1.3.4) +PKG_CHECK_MODULES(LIBCSPI, [ + libbonobo-2.0 >= req_ver_libbonobo + atk >= req_ver_atk +]) AC_SUBST(LIBCSPI_LIBS) AC_SUBST(LIBCSPI_CFLAGS) @@ -154,28 +124,27 @@ LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`" AC_SUBST(BONOBO_ACTIVATION_IDL_DIR) AC_SUBST(LIBBONOBO_IDL_DIR) -CFLAGS="$CFLAGS $X_LIBS" +LIBS="$LIBS $X_LIBS" dnl path to Xtst -AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst) -if test "x$XTST_LIBS" = x; then - AC_MSG_ERROR(Couldn't find the Xtst library. Check config.log for details) -fi +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) + 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) + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_XKB) fi have_xinput= -AC_CHECK_LIB(Xi, XOpenDevice, XINPUT_LIBS=-lXi) +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) + 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) @@ -184,14 +153,14 @@ dnl Allow disabling XEViE. 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, XevieQueryVersion, have_xevie="yes") - - if test "x$have_xevie" = "xyes"; then - XEVIE_LIBS=-lXext - AC_DEFINE(HAVE_XEVIE) - fi - AC_SUBST(XEVIE_LIBS) + have_xevie= + AC_CHECK_LIB(Xext, XevieQueryVersion, have_xevie="yes") + + if test "x$have_xevie" = "xyes"; then + XEVIE_LIBS=-lXext + AC_DEFINE(HAVE_XEVIE) + fi + AC_SUBST(XEVIE_LIBS) fi dnl CFLAGS="$CFLAGS -Wall" @@ -208,8 +177,8 @@ AC_TRY_CPP([#include #ifndef POPT_ARG_FLOAT #error popt too old #endif], AC_MSG_RESULT(yes), [ - AC_MSG_RESULT(no) - AC_MSG_ERROR([A newer version of popt is required to build at-spi. + AC_MSG_RESULT(no) + AC_MSG_ERROR([A newer version of popt is required to build at-spi. You can download the latest version from ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/]) ]) @@ -217,15 +186,18 @@ REBUILD=\# if test "x$enable_rebuilds" = "xyes" && \ test -n "$PERL" && \ $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \ - test -n "$AWK" ; then - REBUILD= + test -n "$AWK" ; then + REBUILD= fi AC_SUBST(REBUILD) AC_OUTPUT([ Makefile libspi-1.0.pc +libspi-1.0-uninstalled.pc +libloginhelper-1.0.pc cspi-1.0.pc +cspi-1.0-uninstalled.pc docs/Makefile docs/reference/Makefile docs/reference/cspi/Makefile @@ -233,6 +205,7 @@ idl/Makefile libspi/Makefile registryd/Makefile atk-bridge/Makefile +login-helper/Makefile test/Makefile cspi/Makefile cspi/bonobo/Makefile