summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-02-11 16:51:27 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-02-11 16:51:27 +0000
commit04c0644f3345cddf24d1010a50595f805c20334e (patch)
tree03f8f4f1a1a52663b54c6862a8f268f8c24207d6 /m4
parenteb59e0fd0cdd41bb0b086471b3a433b71b5562aa (diff)
sync from autostars cvs
Original commit message from CVS: sync from autostars cvs
Diffstat (limited to 'm4')
-rw-r--r--m4/as-ac-expand.m417
1 files changed, 13 insertions, 4 deletions
diff --git a/m4/as-ac-expand.m4 b/m4/as-ac-expand.m4
index 44e12af..d6c9e33 100644
--- a/m4/as-ac-expand.m4
+++ b/m4/as-ac-expand.m4
@@ -1,7 +1,11 @@
+dnl as-ac-expand.m4 0.2.0
+dnl autostars m4 macro for expanding directories using configure's prefix
+dnl thomas@apestaart.org
+
dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
dnl example
dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-dnl will set SYSCONFDIR to /usr/local/etc
+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
AC_DEFUN([AS_AC_EXPAND],
[
@@ -10,10 +14,13 @@ AC_DEFUN([AS_AC_EXPAND],
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=/usr/local
+ prefix="$ac_default_prefix"
fi
- exec_prefix_save=$exec_prefix
+ dnl if no exec_prefix given, then use prefix
if test "x$exec_prefix" = "xNONE"; then
exec_prefix=$prefix
fi
@@ -22,13 +29,15 @@ AC_DEFUN([AS_AC_EXPAND],
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
+ 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
])