[mm-common] Correctly append / to local links as well

[Daniel Elstner <daniel src gnome org>]

commit 31f2d5dc74847007eb69307f9ac61e8202ae5b5d
Author: Daniel Elstner <danielk openismus com>
Date:   Thu Aug 13 19:41:35 2009 +0200

    Correctly append / to local links as well
    
    * macros/mm-doc.m4 (_MM_ARG_WITH_TAGFILE_DOC): Correct the previous
    change and also append a trailing slash to directories retrieved via
    pkg-config.

 macros/mm-doc.m4 |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/macros/mm-doc.m4 b/macros/mm-doc.m4
index b0230bb..ef0201d 100644
--- a/macros/mm-doc.m4
+++ b/macros/mm-doc.m4
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with mm-common.  If not, see <http://www.gnu.org/licenses/>.
 
-#serial 20090811
+#serial 20090813
 
 ## _MM_CONFIG_DOCTOOL_DIR
 ##
@@ -152,7 +152,6 @@ 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
   ], [
@@ -169,9 +168,8 @@ 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`
-    AS_IF([test "x$mm_htmlrefpub" = x],
-          [mm_htmlrefpub=$mm_htmlrefdir],
-          [AS_CASE([$mm_htmlrefpub], [[*[\\/]]],, [[?*]], [mm_htmlrefpub=$mm_htmlrefpub/])])
+    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], [[*[\\/]*]],,
@@ -180,6 +178,7 @@ m4_ifval([$3], [dnl
     test "x$mm_doxytagfile" = x || mm_tagpath=$mm_doxytagfile
   ])
 ])[]dnl
+  AS_CASE([$mm_htmlrefdir], [[*[\\/]]],, [[?*]], [mm_htmlrefdir=$mm_htmlrefdir/])
   AC_MSG_RESULT([$mm_tagpath $mm_htmlrefdir])
 
   AS_IF([test "x$USE_MAINTAINER_MODE" != xno && test ! -f "$mm_tagpath"],