diff options
| author | rmax <rmax> | 2004-11-18 00:43:18 (GMT) |
|---|---|---|
| committer | rmax <rmax> | 2004-11-18 00:43:18 (GMT) |
| commit | 1b1920d3460f86d0c8c303446d121a41ddb8d8cf (patch) | |
| tree | eb3d98f33e7546cdfea54fec2d52cde3b5d61de5 /unix/tcl.m4 | |
| parent | be0dcd9c9fe40b3e3b42c40165565551ba19e8b4 (diff) | |
| download | tk-1b1920d3460f86d0c8c303446d121a41ddb8d8cf.zip tk-1b1920d3460f86d0c8c303446d121a41ddb8d8cf.tar.gz tk-1b1920d3460f86d0c8c303446d121a41ddb8d8cf.tar.bz2 | |
2004-11-18 Reinhard Max <max@suse.de>
* unix/tcl.m4 (SC_CONFIG_MANPAGES): Applied an improved version of
* unix/configure.in: patch #996085, that introduces
* unix/Makefile.in: --enable-man-suffix.
* unix/installManPage: added
* unix/mkLinks: removed
Diffstat (limited to 'unix/tcl.m4')
| -rw-r--r-- | unix/tcl.m4 | 48 |
1 files changed, 36 insertions, 12 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 4ef9b9e..7950a5a 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -636,8 +636,12 @@ AC_DEFUN(SC_ENABLE_LANGINFO, [ #-------------------------------------------------------------------- # SC_CONFIG_MANPAGES # -# Decide whether to use symlinks for linking the manpages and -# whether to compress the manpages after installation. +# Decide whether to use symlinks for linking the manpages, +# whether to compress the manpages after installation, and +# whether to add a package name suffix to the installed +# manpages to avoidfile name clashes. +# If compression is enabled also find out what file name suffix +# the given compression program is using. # # Arguments: # none @@ -647,32 +651,52 @@ AC_DEFUN(SC_ENABLE_LANGINFO, [ # Adds the following arguments to configure: # --enable-man-symlinks # --enable-man-compression=PROG +# --enable-man-suffix[=STRING] # # Defines the following variable: # -# MKLINKS_FLAGS - The apropriate flags for mkLinks -# according to the user's selection. +# MAN_FLAGS - The apropriate flags for installManPage +# according to the user's selection. # #-------------------------------------------------------------------- AC_DEFUN(SC_CONFIG_MANPAGES, [ AC_MSG_CHECKING([whether to use symlinks for manpages]) AC_ARG_ENABLE(man-symlinks, - [ --enable-man-symlinks use symlinks for the manpages], - test "$enableval" != "no" && MKLINKS_FLAGS="$MKLINKS_FLAGS --symlinks", + AS_HELP_STRING([--enable-man-symlinks], + [use symlinks for the manpages]), + test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --symlinks", enableval="no") AC_MSG_RESULT([$enableval]) - AC_MSG_CHECKING([compression for manpages]) + AC_MSG_CHECKING([whether to compress the manpages]) AC_ARG_ENABLE(man-compression, - [ --enable-man-compression=PROG - compress the manpages with PROG], - test "$enableval" = "yes" && echo && AC_MSG_ERROR([missing argument to --enable-man-compression]) - test "$enableval" != "no" && MKLINKS_FLAGS="$MKLINKS_FLAGS --compress $enableval", + AS_HELP_STRING([--enable-man-compression=PROG], + [compress the manpages with PROG]), + test "$enableval" = "yes" && AC_MSG_ERROR([missing argument to --enable-man-compression]) + test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --compress $enableval", + enableval="no") + AC_MSG_RESULT([$enableval]) + if test "$enableval" != "no"; then + AC_MSG_CHECKING([for compressed file suffix]) + touch TeST + $enableval TeST + Z=`ls TeST* | sed 's/^....//'` + rm -f TeST* + MAN_FLAGS="$MAN_FLAGS --extension $Z" + AC_MSG_RESULT([$Z]) + fi + + AC_MSG_CHECKING([whether to add a package name suffix for the manpages]) + AC_ARG_ENABLE(man-suffix, + AS_HELP_STRING([--enable-man-suffix=STRING], + [use STRING as a suffix to manpage file names (default: AC_PACKAGE_NAME)]), + test "$enableval" = "yes" && enableval="AC_PACKAGE_NAME" + test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --suffix $enableval", enableval="no") AC_MSG_RESULT([$enableval]) - AC_SUBST(MKLINKS_FLAGS) + AC_SUBST(MAN_FLAGS) ]) #-------------------------------------------------------------------- |