diff options
| author | <rob.taylor@collabora.co.uk> | 2006-01-19 08:03:48 +0000 |
|---|---|---|
| committer | <rob.taylor@collabora.co.uk> | 2006-01-19 08:03:48 +0000 |
| commit | 0ab9fb7c8ddd93843f7e20fe5c8abaa5b6954c9c (patch) | |
| tree | 962cdb377e9fc5b5fee057782acc8e8bd7b97ad2 /m4 | |
| parent | 48c66cbaa982561afd73f5561f9f0c970f37792a (diff) | |
added dbus service file for activation
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/Makefile.am | 3 | ||||
| -rw-r--r-- | m4/as-ac-expand.m4 | 40 |
2 files changed, 42 insertions, 1 deletions
diff --git a/m4/Makefile.am b/m4/Makefile.am index 482257a4e..259e3c321 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,3 +1,4 @@ EXTRA_DIST = \ as-compiler-flag.m4 \ -as-version.m4 +as-version.m4 \ +as-ac-expand.m4 diff --git a/m4/as-ac-expand.m4 b/m4/as-ac-expand.m4 new file mode 100644 index 000000000..0c7117393 --- /dev/null +++ b/m4/as-ac-expand.m4 @@ -0,0 +1,40 @@ +dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) +dnl +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 +]) |