diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-29 09:39:09 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-29 09:39:09 +0000 |
| commit | ddc4efade5ea7418eda4ccd0acdf38bf7169ea96 (patch) | |
| tree | 658c8dcb2946fb14eda699c2fc6b8c15a2eae0a0 | |
| parent | 64e304feb6fcc945c1506d8b42ea13ef1aeb97d5 (diff) | |
[tools] missing-macros: add as-ac-expand.m4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24846 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | tools/missing-macros/Makefile | 2 | ||||
| -rw-r--r-- | tools/missing-macros/src/README | 6 | ||||
| -rw-r--r-- | tools/missing-macros/src/m4/as-ac-expand.m4 | 43 |
3 files changed, 50 insertions, 1 deletions
diff --git a/tools/missing-macros/Makefile b/tools/missing-macros/Makefile index 4f7564662..1d2726d5d 100644 --- a/tools/missing-macros/Makefile +++ b/tools/missing-macros/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=missing-macros -PKG_VERSION:=6 +PKG_VERSION:=7 include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/missing-macros/src/README b/tools/missing-macros/src/README index 9d9fbfa84..04d8a06c8 100644 --- a/tools/missing-macros/src/README +++ b/tools/missing-macros/src/README @@ -61,6 +61,12 @@ XMMS feature detection macros. xmms.m4 +From ao: +Directory expansion macro for Automake. + + as-ac-expand.m4 + + From OpenWrt: Always disable GTK docs. diff --git a/tools/missing-macros/src/m4/as-ac-expand.m4 b/tools/missing-macros/src/m4/as-ac-expand.m4 new file mode 100644 index 000000000..d6c9e3306 --- /dev/null +++ b/tools/missing-macros/src/m4/as-ac-expand.m4 @@ -0,0 +1,43 @@ +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 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 +]) |