summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2008-04-17 13:54:29 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2008-04-17 13:54:29 +0000
commit9406792f32e5a0c2df9fadf72d0961f2c166b7b9 (patch)
tree4d8e378a15c1a8c5bfd0afa51c979419c7eb4aaf /m4
parentad4963bbd5d959c6316c43aa91f5c8f22293e1ec (diff)
Don't ship as-ac-expand.m4, we no longer need it
Diffstat (limited to 'm4')
-rw-r--r--m4/Makefile.am3
-rw-r--r--m4/as-ac-expand.m449
2 files changed, 1 insertions, 51 deletions
diff --git a/m4/Makefile.am b/m4/Makefile.am
index b05c7c9f7..4557e8575 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,3 +1,2 @@
EXTRA_DIST = \
-as-compiler-flag.m4 \
-as-ac-expand.m4
+ as-compiler-flag.m4
diff --git a/m4/as-ac-expand.m4 b/m4/as-ac-expand.m4
deleted file mode 100644
index deebd2bf8..000000000
--- a/m4/as-ac-expand.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
-])