diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 507 | ||||
| -rw-r--r-- | bus/Makefile.am | 27 | ||||
| -rw-r--r-- | bus/at-spi-dbus-bus.desktop (renamed from bus/at-spi-dbus-bus.desktop.in) | 2 | ||||
| -rw-r--r-- | bus/at-spi-dbus-bus.in | 8 | ||||
| -rw-r--r-- | configure.ac | 109 | ||||
| -rw-r--r-- | m4/as-ac-expend.m4 | 49 | ||||
| -rw-r--r-- | registryd/Makefile.am | 35 |
8 files changed, 115 insertions, 624 deletions
diff --git a/Makefile.am b/Makefile.am index 8646a13e..5d64a3c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS=registryd xml +SUBDIRS=registryd xml bus ACLOCAL_AMFLAGS=-I m4 @@ -1,506 +1,3 @@ #!/bin/sh -# Run this to generate all the initial makefiles, etc. - -#name of package -PKG_NAME=${PKG_NAME:-Package} -srcdir=${srcdir:-.} - -# default version requirements ... -REQUIRED_AUTOCONF_VERSION=${REQUIRED_AUTOCONF_VERSION:-2.53} -REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.9} -REQUIRED_LIBTOOL_VERSION=${REQUIRED_LIBTOOL_VERSION:-1.4.3} -REQUIRED_GETTEXT_VERSION=${REQUIRED_GETTEXT_VERSION:-0.10.40} -REQUIRED_GLIB_GETTEXT_VERSION=${REQUIRED_GLIB_GETTEXT_VERSION:-2.2.0} -REQUIRED_INTLTOOL_VERSION=${REQUIRED_INTLTOOL_VERSION:-0.25} -REQUIRED_PKG_CONFIG_VERSION=${REQUIRED_PKG_CONFIG_VERSION:-0.14.0} -REQUIRED_GTK_DOC_VERSION=${REQUIRED_GTK_DOC_VERSION:-1.0} -REQUIRED_DOC_COMMON_VERSION=${REQUIRED_DOC_COMMON_VERSION:-2.3.0} -REQUIRED_GNOME_DOC_UTILS_VERSION=${REQUIRED_GNOME_DOC_UTILS_VERSION:-0.4.2} - -# a list of required m4 macros. Package can set an initial value -REQUIRED_M4MACROS=${REQUIRED_M4MACROS:-} -FORBIDDEN_M4MACROS=${FORBIDDEN_M4MACROS:-} - -# Not all echo versions allow -n, so we check what is possible. This test is -# based on the one in autoconf. -ECHO_C= -ECHO_N= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ;; - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -# some terminal codes ... -boldface="`tput bold 2>/dev/null`" -normal="`tput sgr0 2>/dev/null`" -printbold() { - echo $ECHO_N "$boldface" $ECHO_C - echo "$@" - echo $ECHO_N "$normal" $ECHO_C -} -printerr() { - echo "$@" >&2 -} - -# Usage: -# compare_versions MIN_VERSION ACTUAL_VERSION -# returns true if ACTUAL_VERSION >= MIN_VERSION -compare_versions() { - ch_min_version=$1 - ch_actual_version=$2 - ch_status=0 - IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="." - set $ch_actual_version - for ch_min in $ch_min_version; do - ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes - if [ -z "$ch_min" ]; then break; fi - if [ -z "$ch_cur" ]; then ch_status=1; break; fi - if [ $ch_cur -gt $ch_min ]; then break; fi - if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi - done - IFS="$ch_save_IFS" - return $ch_status -} - -# Usage: -# version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE -# checks to see if the package is available -version_check() { - vc_package=$1 - vc_variable=$2 - vc_checkprogs=$3 - vc_min_version=$4 - vc_source=$5 - vc_status=1 - - vc_checkprog=`eval echo "\\$$vc_variable"` - if [ -n "$vc_checkprog" ]; then - printbold "using $vc_checkprog for $vc_package" - return 0 - fi - - if test "x$vc_package" = "xautomake" -a "x$vc_min_version" = "x1.4"; then - vc_comparator="=" - else - vc_comparator=">=" - fi - printbold "checking for $vc_package $vc_comparator $vc_min_version..." - for vc_checkprog in $vc_checkprogs; do - echo $ECHO_N " testing $vc_checkprog... " $ECHO_C - if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then - vc_actual_version=`$vc_checkprog --version | head -n 1 | \ - sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'` - if compare_versions $vc_min_version $vc_actual_version; then - echo "found $vc_actual_version" - # set variables - eval "$vc_variable=$vc_checkprog; \ - ${vc_variable}_VERSION=$vc_actual_version" - vc_status=0 - break - else - echo "too old (found version $vc_actual_version)" - fi - else - echo "not found." - fi - done - if [ "$vc_status" != 0 ]; then - printerr "***Error***: You must have $vc_package $vc_comparator $vc_min_version installed" - printerr " to build $PKG_NAME. Download the appropriate package for" - printerr " from your distribution or get the source tarball at" - printerr " $vc_source" - printerr - exit $vc_status - fi - return $vc_status -} - -# Usage: -# require_m4macro filename.m4 -# adds filename.m4 to the list of required macros -require_m4macro() { - case "$REQUIRED_M4MACROS" in - $1\ * | *\ $1\ * | *\ $1) ;; - *) REQUIRED_M4MACROS="$REQUIRED_M4MACROS $1" ;; - esac -} - -forbid_m4macro() { - case "$FORBIDDEN_M4MACROS" in - $1\ * | *\ $1\ * | *\ $1) ;; - *) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;; - esac -} - -# Usage: -# add_to_cm_macrodirs dirname -# Adds the dir to $cm_macrodirs, if it's not there yet. -add_to_cm_macrodirs() { - case $cm_macrodirs in - "$1 "* | *" $1 "* | *" $1") ;; - *) cm_macrodirs="$cm_macrodirs $1";; - esac -} - -# Usage: -# print_m4macros_error -# Prints an error message saying that autoconf macros were misused -print_m4macros_error() { - printerr "***Error***: some autoconf macros required to build $PKG_NAME" - printerr " were not found in your aclocal path, or some forbidden" - printerr " macros were found. Perhaps you need to adjust your" - printerr " ACLOCAL_FLAGS?" - printerr -} - -# Usage: -# check_m4macros -# Checks that all the requested macro files are in the aclocal macro path -# Uses REQUIRED_M4MACROS and ACLOCAL variables. -check_m4macros() { - # construct list of macro directories - cm_macrodirs=`$ACLOCAL --print-ac-dir` - # aclocal also searches a version specific dir, eg. /usr/share/aclocal-1.9 - # but it contains only Automake's own macros, so we can ignore it. - - # Read the dirlist file, supported by Automake >= 1.7. - if compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then - cm_dirlist=`sed 's/[ ]*#.*//;/^$/d' $cm_macrodirs/dirlist` - if [ -n "$cm_dirlist" ] ; then - for cm_dir in $cm_dirlist; do - if [ -d $cm_dir ]; then - add_to_cm_macrodirs $cm_dir - fi - done - fi - fi - - # Parse $ACLOCAL_FLAGS - set - $ACLOCAL_FLAGS - while [ $# -gt 0 ]; do - if [ "$1" = "-I" ]; then - add_to_cm_macrodirs "$2" - shift - fi - shift - done - - cm_status=0 - if [ -n "$REQUIRED_M4MACROS" ]; then - printbold "Checking for required M4 macros..." - # check that each macro file is in one of the macro dirs - for cm_macro in $REQUIRED_M4MACROS; do - cm_macrofound=false - for cm_dir in $cm_macrodirs; do - if [ -f "$cm_dir/$cm_macro" ]; then - cm_macrofound=true - break - fi - # The macro dir in Cygwin environments may contain a file - # called dirlist containing other directories to look in. - if [ -f "$cm_dir/dirlist" ]; then - for cm_otherdir in `cat $cm_dir/dirlist`; do - if [ -f "$cm_otherdir/$cm_macro" ]; then - cm_macrofound=true - break - fi - done - fi - done - if $cm_macrofound; then - : - else - printerr " $cm_macro not found" - cm_status=1 - fi - done - fi - if [ "$cm_status" != 0 ]; then - print_m4macros_error - exit $cm_status - fi - if [ -n "$FORBIDDEN_M4MACROS" ]; then - printbold "Checking for forbidden M4 macros..." - # check that each macro file is in one of the macro dirs - for cm_macro in $FORBIDDEN_M4MACROS; do - cm_macrofound=false - for cm_dir in $cm_macrodirs; do - if [ -f "$cm_dir/$cm_macro" ]; then - cm_macrofound=true - break - fi - done - if $cm_macrofound; then - printerr " $cm_macro found (should be cleared from macros dir)" - cm_status=1 - fi - done - fi - if [ "$cm_status" != 0 ]; then - print_m4macros_error - exit $cm_status - fi -} - -# try to catch the case where the macros2/ directory hasn't been cleared out. -forbid_m4macro gnome-cxx-check.m4 - -want_libtool=false -want_gettext=false -want_glib_gettext=false -want_intltool=false -want_pkg_config=false -want_gtk_doc=false -want_gnome_doc_utils=false -want_maintainer_mode=false - -configure_files="`find $srcdir -name '{arch}' -prune -o -name '_darcs' -prune -o -name '.??*' -prune -o -name configure.ac -print -o -name configure.in -print`" -for configure_ac in $configure_files; do - dirname=`dirname $configure_ac` - if [ -f $dirname/NO-AUTO-GEN ]; then - echo skipping $dirname -- flagged as no auto-gen - continue - fi - if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null || - grep "^LT_INIT" $configure_ac >/dev/null; then - want_libtool=true - fi - if grep "^AM_GNU_GETTEXT" $configure_ac >/dev/null; then - want_gettext=true - fi - if grep "^AM_GLIB_GNU_GETTEXT" $configure_ac >/dev/null; then - want_glib_gettext=true - fi - if grep "^AC_PROG_INTLTOOL" $configure_ac >/dev/null || - grep "^IT_PROG_INTLTOOL" $configure_ac >/dev/null; then - want_intltool=true - fi - if grep "^PKG_CHECK_MODULES" $configure_ac >/dev/null; then - want_pkg_config=true - fi - if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then - want_gtk_doc=true - fi - if grep "^GNOME_DOC_INIT" $configure_ac >/dev/null; then - want_gnome_doc_utils=true - fi - - # check that AM_MAINTAINER_MODE is used - if grep "^AM_MAINTAINER_MODE" $configure_ac >/dev/null; then - want_maintainer_mode=true - fi - - # check to make sure gnome-common macros can be found ... - if grep "^GNOME_COMMON_INIT" $configure_ac >/dev/null || - grep "^GNOME_DEBUG_CHECK" $configure_ac >/dev/null || - grep "^GNOME_MAINTAINER_MODE_DEFINES" $configure_ac >/dev/null; then - require_m4macro gnome-common.m4 - fi - if grep "^GNOME_COMPILE_WARNINGS" $configure_ac >/dev/null || - grep "^GNOME_CXX_WARNINGS" $configure_ac >/dev/null; then - require_m4macro gnome-compiler-flags.m4 - fi -done - -#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13 -WANT_AUTOCONF_2_5=1 -export WANT_AUTOCONF_2_5 -version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \ - "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" -AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` - -case $REQUIRED_AUTOMAKE_VERSION in - 1.4*) automake_progs="automake-1.4" ;; - 1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; - 1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; - 1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; - 1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; - 1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;; - 1.10*) automake_progs="automake-1.11 automake-1.10" ;; - 1.11*) automake_progs="automake-1.11" ;; -esac -version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ - "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" -ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/` - -if $want_libtool; then - version_check libtool LIBTOOLIZE libtoolize $REQUIRED_LIBTOOL_VERSION \ - "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz" - require_m4macro libtool.m4 -fi - -if $want_gettext; then - version_check gettext GETTEXTIZE gettextize $REQUIRED_GETTEXT_VERSION \ - "http://ftp.gnu.org/pub/gnu/gettext/gettext-$REQUIRED_GETTEXT_VERSION.tar.gz" - require_m4macro gettext.m4 -fi - -if $want_glib_gettext; then - version_check glib-gettext GLIB_GETTEXTIZE glib-gettextize $REQUIRED_GLIB_GETTEXT_VERSION \ - "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-$REQUIRED_GLIB_GETTEXT_VERSION.tar.gz" - require_m4macro glib-gettext.m4 -fi - -if $want_intltool; then - version_check intltool INTLTOOLIZE intltoolize $REQUIRED_INTLTOOL_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/intltool/" - require_m4macro intltool.m4 -fi - -if $want_pkg_config; then - version_check pkg-config PKG_CONFIG pkg-config $REQUIRED_PKG_CONFIG_VERSION \ - "'http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-$REQUIRED_PKG_CONFIG_VERSION.tar.gz" - require_m4macro pkg.m4 -fi - -if $want_gtk_doc; then - version_check gtk-doc GTKDOCIZE gtkdocize $REQUIRED_GTK_DOC_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" - require_m4macro gtk-doc.m4 -fi - -if $want_gnome_doc_utils; then - version_check gnome-doc-utils GNOME_DOC_PREPARE gnome-doc-prepare $REQUIRED_GNOME_DOC_UTILS_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/" -fi - -if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - version_check gnome-common DOC_COMMON gnome-doc-common \ - $REQUIRED_DOC_COMMON_VERSION " " -fi - -check_m4macros - -if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then - printerr "**Warning**: I am going to run \`configure' with no arguments." - printerr "If you wish to pass any to it, please specify them on the" - printerr \`$0\'" command line." - printerr -fi - -topdir=`pwd` -for configure_ac in $configure_files; do - dirname=`dirname $configure_ac` - basename=`basename $configure_ac` - if [ -f $dirname/NO-AUTO-GEN ]; then - echo skipping $dirname -- flagged as no auto-gen - elif [ ! -w $dirname ]; then - echo skipping $dirname -- directory is read only - else - printbold "Processing $configure_ac" - cd $dirname - - # Note that the order these tools are called should match what - # autoconf's "autoupdate" package does. See bug 138584 for - # details. - - # programs that might install new macros get run before aclocal - if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null || - grep "^LT_INIT" $basename >/dev/null; then - printbold "Running $LIBTOOLIZE..." - $LIBTOOLIZE --force --copy || exit 1 - fi - - if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then - printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1 - elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then - if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then - printbold "Running autopoint..." - autopoint --force || exit 1 - else - printbold "Running $GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GETTEXTIZE --force --copy || exit 1 - fi - fi - - if grep "^AC_PROG_INTLTOOL" $basename >/dev/null || - grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then - printbold "Running $INTLTOOLIZE..." - $INTLTOOLIZE --force --copy --automake || exit 1 - fi - if grep "^GTK_DOC_CHECK" $basename >/dev/null; then - printbold "Running $GTKDOCIZE..." - $GTKDOCIZE --copy || exit 1 - fi - - if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - printbold "Running gnome-doc-common..." - gnome-doc-common --copy || exit 1 - fi - if grep "^GNOME_DOC_INIT" $basename >/dev/null; then - printbold "Running $GNOME_DOC_PREPARE..." - $GNOME_DOC_PREPARE --force --copy || exit 1 - fi - - # Now run aclocal to pull in any additional macros needed - - # if the AC_CONFIG_MACRO_DIR() macro is used, pass that - # directory to aclocal. - m4dir=`cat "$basename" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` - if [ -n "$m4dir" ]; then - m4dir="-I $m4dir" - fi - printbold "Running $ACLOCAL..." - $ACLOCAL $m4dir $ACLOCAL_FLAGS || exit 1 - - if grep "GNOME_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then - printerr "*** obsolete gnome macros were used in $configure_ac" - fi - - # Now that all the macros are sorted, run autoconf and autoheader ... - printbold "Running $AUTOCONF..." - $AUTOCONF || exit 1 - if grep "^A[CM]_CONFIG_HEADER" $basename >/dev/null; then - printbold "Running $AUTOHEADER..." - $AUTOHEADER || exit 1 - # this prevents automake from thinking config.h.in is out of - # date, since autoheader doesn't touch the file if it doesn't - # change. - test -f config.h.in && touch config.h.in - fi - - # Finally, run automake to create the makefiles ... - printbold "Running $AUTOMAKE..." - if [ -f COPYING ]; then - cp -pf COPYING COPYING.autogen_bak - fi - if [ -f INSTALL ]; then - cp -pf INSTALL INSTALL.autogen_bak - fi - if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then - $AUTOMAKE --gnu --add-missing --force --copy -Wno-portability || exit 1 - else - $AUTOMAKE --gnu --add-missing --copy || exit 1 - fi - if [ -f COPYING.autogen_bak ]; then - cmp COPYING COPYING.autogen_bak > /dev/null || cp -pf COPYING.autogen_bak COPYING - rm -f COPYING.autogen_bak - fi - if [ -f INSTALL.autogen_bak ]; then - cmp INSTALL INSTALL.autogen_bak > /dev/null || cp -pf INSTALL.autogen_bak INSTALL - rm -f INSTALL.autogen_bak - fi - - cd "$topdir" - fi -done - -conf_flags="" - -if $want_maintainer_mode; then - conf_flags="--enable-maintainer-mode" -fi - -if test x$NOCONFIGURE = x; then - printbold Running $srcdir/configure $conf_flags "$@" ... - $srcdir/configure $conf_flags "$@" \ - && echo Now type \`make\' to compile $PKG_NAME || exit 1 -else - echo Skipping configure process. -fi +# gnome-autogen.sh runs configure, so do likewise. +autoreconf -vif && ./configure "$@" diff --git a/bus/Makefile.am b/bus/Makefile.am index 9f0b5d4d..20204c5e 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -1,20 +1,23 @@ -busconfigdir=$(sysconfdir)/at-spi2 -busconfig_DATA=\ - accessibility.conf +busconfigdir = $(sysconfdir)/at-spi2 +busconfig_DATA = accessibility.conf -atspidbusdir=$(bindir) -atspidbus_SCRIPTS=\ - at-spi-dbus-bus +atspidbusdir = $(bindir) +atspidbus_SCRIPTS = at-spi-dbus-bus default_sessiondir = $(sysconfdir)/xdg/autostart default_session_DATA = at-spi-dbus-bus.desktop -EXTRA_DIST= \ - accessibility.conf \ - at-spi-dbus-bus.desktop.in +do_subst = sed -e 's,[@]prefix[@],${prefix},g' \ + -e 's,[@]sysconfdir[@],${sysconfdir},g' \ + -e 's,[@]DBUS_DAEMON[@],@DBUS_DAEMON@,g' -%.desktop: %.desktop.in Makefile.am - sed -e "s,\@bindir\@,$(EXPANDED_BINDIR)," < $< > $@ +at-spi-dbus-bus: at-spi-dbus-bus.in Makefile + $(do_subst) $(srcdir)/$@.in > $@ -CLEANFILES= \ +EXTRA_DIST= \ + accessibility.conf \ + at-spi-dbus-bus.in \ at-spi-dbus-bus.desktop + +CLEANFILES= \ + at-spi-dbus-bus diff --git a/bus/at-spi-dbus-bus.desktop.in b/bus/at-spi-dbus-bus.desktop index fadf900b..e46088ae 100644 --- a/bus/at-spi-dbus-bus.desktop.in +++ b/bus/at-spi-dbus-bus.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=AT SPI D-Bus Bus -Exec=@bindir@/at-spi-dbus-bus +Exec=at-spi-dbus-bus OnlyShowIn=GNOME; NoDisplay=true AutostartCondition=GNOME /desktop/gnome/interface/accessibility diff --git a/bus/at-spi-dbus-bus.in b/bus/at-spi-dbus-bus.in index 2c4f1807..de10d8a0 100644 --- a/bus/at-spi-dbus-bus.in +++ b/bus/at-spi-dbus-bus.in @@ -1,8 +1,8 @@ #!/bin/sh -prefix=@prefix@ -sysconfdir=@sysconfdir@ -daemondir=@DBUS_DAEMONDIR@ +prefix="@prefix@" +sysconfdir="@sysconfdir@" +dbusdaemon="@DBUS_DAEMON@" -address=`${daemondir}/dbus-daemon --config-file=${sysconfdir}/at-spi2/accessibility.conf --print-address` +address=`${dbusdaemon} --config-file=${sysconfdir}/at-spi2/accessibility.conf --print-address` xprop -root -f AT_SPI_BUS 8s -set AT_SPI_BUS ${address} diff --git a/configure.ac b/configure.ac index e223346d..0cee7638 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,5 @@ AC_INIT([at-spi2-core], [0.3.90], [accessibility-atspi@lists.linux-foundation.org]) +AC_PREREQ([2.59]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR([m4]) @@ -19,11 +20,10 @@ AC_SUBST(LT_CURRENT) AC_SUBST(LT_REVISION) AC_SUBST(LT_AGE) -AM_INIT_AUTOMAKE([-Wall foreign]) +AM_INIT_AUTOMAKE([1.9 -Wall foreign]) AC_PROG_CC -AM_DISABLE_STATIC -AM_PROG_LIBTOOL +LT_INIT([disable-static]) PKG_PROG_PKG_CONFIG AC_CONFIG_HEADERS([config.h]) @@ -35,6 +35,10 @@ AC_SUBST(DBUS_CFLAGS) PKG_CHECK_MODULES(GLIB, [glib-2.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]) PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.7.0]) AC_SUBST(DBUS_GLIB_LIBS) @@ -55,71 +59,97 @@ else fi AC_SUBST(X_LIBS) -#LIBS="$LIBS $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])], - -lX11 -lXext) + $X_LIBS) AC_SUBST(XTST_LIBS) +LIBS="$LIBS $save_LIBS" -have_xkb= -AC_CHECK_LIB(X11, XkbQueryExtension, have_xkb="maybe") +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) + 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], [], Xkb is present) + AC_DEFINE([HAVE_XKB], [], [Xkb is present]) fi - -have_xinput= -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) -fi -AC_CHECK_HEADER(X11/extensions/XInput.h, have_xinput=yes) +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" -AC_ARG_ENABLE(xevie, [--enable-xevie Build with XEViE support [default=yes]], enable_xevie="$enableval", enable_xevie=yes) +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") + 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) + AC_DEFINE([HAVE_XEVIE], [], [Xevie is present]) else - AC_CHECK_LIB(Xevie, XevieQueryVersion, have_xevie="maybe",,-lXevie -lXext) + 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 <X11/Xlib.h>]) + AC_CHECK_HEADER(X11/extensions/Xevie.h, have_xevie=yes, [], + [[#include <X11/Xlib.h> +]]) if test "x$have_xevie" = "xyes"; then XEVIE_LIBS="-lXext -lXevie" - AC_DEFINE([HAVE_XEVIE], [], Xevie is present) + AC_DEFINE([HAVE_XEVIE], [], [Xevie is present]) fi fi fi AC_SUBST(XEVIE_LIBS) fi +LIBS="$LIBS $save_LIBS" AC_ARG_VAR([DEFAULT_ATSPI_INTROSPECTION_PATH], - [Set the default path for the install ofDBus introspection XML - relative to the pkgdatadir.]) + [Set the default path for the install of DBus introspection XML ] + [relative to the pkgdatadir.]) if test -z "$DEFAULT_ATSPI_INTROSPECTION_PATH"; then DEFAULT_ATSPI_INTROSPECTION_PATH=at-spi2/dbus fi -AS_AC_EXPAND(EXPANDED_BINDIR, "$bindir") -AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory where the DBUS daemon is installed])) -if test -z "$with_dbus_daemondir" ; then - DBUS_DAEMONDIR=$EXPANDED_BINDIR -else - DBUS_DAEMONDIR=$with_dbus_daemondir +AC_ARG_WITH([dbus_daemondir], + [AS_HELP_STRING([--with-dbus-daemondir=<directory>], + [Directory where the DBUS daemon is installed])], + [DBUS_DAEMON="$with_dbus_daemondir/dbus-daemon"], + [AC_PATH_PROG([DBUS_DAEMON], [dbus-daemon], [XXXDBUSDAEMONNOTFOUND], + [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR]dnl +[/libexec$PATH_SEPARATOR/usr/libexec$PATH_SEPARATOR/usr/local/bin]dnl +[$PATH_SEPARATOR/usr/pkg/bin])] + ) +if test "$DBUS_DAEMON" = "XXXDBUSDAEMONNOTFOUND"; then + DBUS_DAEMON = "$bindir/dbus-daemon" + AC_MSG_WARN([at-spi2 relies on dbus, and the dbus-daemon was not found]) + AC_MSG_WARN([we assume that it will be installed in "$bindir"]) fi -AC_SUBST(DBUS_DAEMONDIR) -AC_DEFINE_UNQUOTED(DBUS_DAEMONDIR,"$DBUS_DAEMONDIR", [Directory for installing the DBUS daemon]) +AC_SUBST(DBUS_DAEMON) AC_ARG_WITH(dbus-services, - [AC_HELP_STRING([--with-dbus-services=<dir>], + [AS_HELP_STRING([--with-dbus-services=<directory>], [where D-BUS services directory is])]) if ! test -z "$with_dbus_services" ; then DBUS_SERVICES_DIR="$with_dbus_services" @@ -130,14 +160,19 @@ AC_SUBST(DBUS_SERVICES_DIR) AC_SUBST(LIBTOOL_EXPORT_OPTIONS) -AC_ARG_ENABLE(relocate, [ --enable-relocate Relocate to coexist with CORBA [default=no]], enable_relocate="$enableval", enable_relocate=no) +AC_ARG_ENABLE([relocate], + [AS_HELP_STRING([--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) AC_CONFIG_FILES([Makefile - xml/Makefile - registryd/Makefile]) + xml/Makefile + registryd/Makefile + bus/Makefile]) AC_OUTPUT diff --git a/m4/as-ac-expend.m4 b/m4/as-ac-expend.m4 deleted file mode 100644 index deebd2bf..00000000 --- a/m4/as-ac-expend.m4 +++ /dev/null @@ -1,49 +0,0 @@ -dnl as-ac-expand.m4 0.2.0 -*- autoconf -*- -dnl autostars m4 macro for expanding directories using configure's prefix - -dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org> - -dnl Copying and distribution of this file, with or without modification, -dnl are permitted in any medium without royalty provided the copyright -dnl notice and this notice are preserved. - -dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) - -dnl example: -dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) -dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local - -AC_DEFUN([AS_AC_EXPAND], -[ - EXP_VAR=[$1] - FROM_VAR=[$2] - - dnl first expand prefix and exec_prefix if necessary - prefix_save=$prefix - exec_prefix_save=$exec_prefix - - dnl if no prefix given, then use /usr/local, the default prefix - if test "x$prefix" = "xNONE"; then - prefix="$ac_default_prefix" - fi - dnl if no exec_prefix given, then use prefix - if test "x$exec_prefix" = "xNONE"; then - exec_prefix=$prefix - fi - - full_var="$FROM_VAR" - dnl loop until it doesn't change anymore - while true; do - new_full_var="`eval echo $full_var`" - if test "x$new_full_var" = "x$full_var"; then break; fi - full_var=$new_full_var - done - - dnl clean up - full_var=$new_full_var - AC_SUBST([$1], "$full_var") - - dnl restore prefix and exec_prefix - prefix=$prefix_save - exec_prefix=$exec_prefix_save -]) diff --git a/registryd/Makefile.am b/registryd/Makefile.am index 749394aa..a8f06dc6 100644 --- a/registryd/Makefile.am +++ b/registryd/Makefile.am @@ -1,18 +1,22 @@ libexec_PROGRAMS = at-spi2-registryd -at_spi2_registryd_CFLAGS = $(DBUS_GLIB_CFLAGS) \ - $(GOBJ_CFLAGS) \ - $(ATK_CFLAGS) \ - -I$(top_srcdir) \ - -DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\" +at_spi2_registryd_CFLAGS = \ + $(GLIB_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + $(GOBJ_CFLAGS) \ + $(ATK_CFLAGS) \ + -I$(top_srcdir) \ + -DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\" -at_spi2_registryd_LDADD = $(DBUS_GLIB_LIBS) \ - $(GOBJ_CFLAGS) \ - $(ATK_LIBS) \ - $(X_LIBS) \ - $(SM_LIBS) \ - $(XTST_LIBS) \ - $(XEVIE_LIBS) +at_spi2_registryd_LDADD = \ + $(GLIB_LIBS) \ + $(DBUS_GLIB_LIBS) \ + $(GOBJ_CFLAGS) \ + $(ATK_LIBS) \ + $(X_LIBS) \ + $(SM_LIBS) \ + $(XTST_LIBS) \ + $(XEVIE_LIBS) at_spi2_registryd_SOURCES = \ de-marshaller.h \ @@ -20,8 +24,8 @@ at_spi2_registryd_SOURCES = \ de-types.h \ display.h \ display.c \ - event-source.h \ - event-source.c \ + event-source.h \ + event-source.c \ keymasks.h \ paths.h \ registry-main.c \ @@ -40,7 +44,8 @@ service_in_files = org.a11y.atspi.Registry.service.in service_DATA = $(service_in_files:.service.in=.service) $(service_DATA): $(service_in_files) Makefile - @sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ + sed -e "s|[@]LIBEXECDIR[@]|$(libexecdir)|" $(srcdir)/$@.in > $@ + DISTCLEANFILES = org.a11y.atspi.Registry.service EXTRA_DIST = org.a11y.atspi.Registry.service.in |