summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorPatrick Welche <prlw1@cam.ac.uk>2010-08-05 21:10:15 +0100
committerPatrick Welche <prlw1@cam.ac.uk>2010-08-17 12:15:26 +0100
commitccbc1b958968d210f26b471abb751995f70143f5 (patch)
tree07e91931b5e71ba141f48fc6c9d854f538763ddf /m4
parentfa66efed02992276d1c9718f7adeb8643015afb3 (diff)
downloadat-spi2-core-ccbc1b958968d210f26b471abb751995f70143f5.tar.gz
Build fixes
* Don't use complicated and frail gnome-autogen (eg Bug 537772) when autoreconf suffices. * Add prerequisits to configure.ac. * Modernise to LT_INIT and AS_HELP. * Don't throw away X_LIBS information from AC_PATH_XTRA. * Various desktop Makefile rules: $< is not defined in explicit rules. (GNU make extension?) * Make recursively expands variables, so use it rather than AS_AC_EXPAND. This also conforms to the GNU coding standards which mandate that a user must be able to "make prefix=/somewhere/else install" * Check installed glib has g_ptr_array_new_with_free_func which we use. * Xtst test and following failed because glib-2.0 ended up in LIBS thanks to pkg-config, hence save_LIBS dance. * Fix help message as --disable-relocate is the default. * Look for dbus-daemon rather than fallback to the bindir we are installing to, and remove the DBUS_DAEMONDIR define inherited from "dbus". * Make use of bus/Makefile.am, and actually install at-spi-dbus-bus and the desktop file. * Tested with make distcheck on NetBSD-current/i386 and ubuntu 10.04.1/i386
Diffstat (limited to 'm4')
-rw-r--r--m4/as-ac-expend.m449
1 files changed, 0 insertions, 49 deletions
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
-])