summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorDaniel Elstner <danielk@openismus.com>2009-08-13 19:32:03 +0200
committerDaniel Elstner <danielk@openismus.com>2009-08-13 19:32:03 +0200
commit2fd4a9d97585d870b21a51347902b2698e1c2ff6 (patch)
tree0e76fab6402be383cecb80d2093efdaab0929bfa /macros
parentf131d51694171076c7b5a8c42a3730a269de2b35 (diff)
downloadmm-common-2fd4a9d97585d870b21a51347902b2698e1c2ff6.tar.gz
Correct mangled links to external documentation
* macros/mm-doc.m4 (_MM_ARG_WITH_TAGFILE_DOC): Append a trailing slash to $mm_htmlrefdir and $mm_htmlrefpub if the path does not end in a slash already and is not empty.
Diffstat (limited to 'macros')
-rw-r--r--macros/mm-doc.m45
1 files changed, 4 insertions, 1 deletions
diff --git a/macros/mm-doc.m4 b/macros/mm-doc.m4
index 0552913..b0230bb 100644
--- a/macros/mm-doc.m4
+++ b/macros/mm-doc.m4
@@ -152,6 +152,7 @@ m4_define([_MM_ARG_WITH_TAGFILE_DOC],
mm_htmlrefdir=`[expr "@$withval" : '.*@\(.*\)' 2>&]AS_MESSAGE_LOG_FD`
mm_tagname=`[expr "/$withval" : '[^@]*[\\/]\([^\\/@]*\)@' 2>&]AS_MESSAGE_LOG_FD`
mm_tagpath=`[expr "X$withval" : 'X\([^@]*\)@' 2>&]AS_MESSAGE_LOG_FD`
+ AS_CASE([$mm_htmlrefdir], [[*[\\/]]],, [[?*]], [mm_htmlrefdir=$mm_htmlrefdir/])
test "x$mm_tagname" != x || mm_tagname="$2"
test "x$mm_tagpath" != x || mm_tagpath=$mm_tagname[]dnl
], [
@@ -168,7 +169,9 @@ m4_ifval([$3], [dnl
AS_CASE([$mm_htmlrefdir], [[http://*|https://*]], [mm_htmlrefpub=$mm_htmlrefdir],
[
mm_htmlrefpub=`$PKG_CONFIG --variable=htmlrefpub "$3" 2>&AS_MESSAGE_LOG_FD`
- test "x$mm_htmlrefpub" != x || mm_htmlrefpub=$mm_htmlrefdir
+ AS_IF([test "x$mm_htmlrefpub" = x],
+ [mm_htmlrefpub=$mm_htmlrefdir],
+ [AS_CASE([$mm_htmlrefpub], [[*[\\/]]],, [[?*]], [mm_htmlrefpub=$mm_htmlrefpub/])])
test "x$mm_htmlrefdir" != x || mm_htmlrefdir=$mm_htmlrefpub
])
AS_CASE([$mm_tagpath], [[*[\\/]*]],,