From a88c650cd4086019f1db672abb50f5d275a86409 Mon Sep 17 00:00:00 2001 From: Keith Marshall Date: Tue, 20 Mar 2007 23:19:34 +0000 Subject: [PATCH] Add --enable-mingw-manpage-transform configure option. --- winsup/mingw/ChangeLog | 8 ++++++++ winsup/mingw/Makefile.in | 8 ++++++-- winsup/mingw/aclocal.m4 | 25 +++++++++++++++++++++++++ winsup/mingw/configure | 24 +++++++++++++++++++++++- winsup/mingw/configure.in | 1 + 5 files changed, 63 insertions(+), 3 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 92e0bb798..4cd787b42 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,11 @@ +2007-03-10 Keith Marshall + + Add --enable-mingw-manpage-transform configure option. + + * aclocal.m4 (MINGW_AC_MANPAGE_TRANSFORM): New macro. + * configure.in, Makefile.in: Use it. + * configure: Regenerated. + 2007-03-18 Danny Smith * include/_mingw.h (__CRT_INLINE): Ue __gnu_inline__ for gcc 4.2.x too. diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in index 3a5c63aed..1b2be1e7b 100644 --- a/winsup/mingw/Makefile.in +++ b/winsup/mingw/Makefile.in @@ -37,6 +37,7 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ libdir = @libdir@ mandir = @mandir@ +manpage_transform = @mingw_manpage_transform@ ifeq ($(target_alias),$(host_alias)) ifeq ($(build_alias),$(host_alias)) tooldir:=$(exec_prefix) @@ -443,8 +444,11 @@ install: all install-dirs $(install_dlls_host) # This provisional hack installs the only manpage we have at present... # It simply CANNOT suffice, when we have more manpages to ship. # - $(INSTALL_DATA) $(srcdir)/man/dirname.man $(mandir)/man3 - cd $(mandir)/man3; mv dirname.man dirname.3; ln dirname.3 basename.3 + $(mkinstalldirs) $(mandir)/man3 + $(INSTALL_DATA) $(srcdir)/man/dirname.man $(mandir)/man3/`\ + echo dirname.man|sed '$(manpage_transform);s,man$$,3,'` + $(INSTALL_DATA) $(srcdir)/man/dirname.man $(mandir)/man3/`\ + echo basename.man|sed '$(manpage_transform);s,man$$,3,'` # # End provisional hack. # diff --git a/winsup/mingw/aclocal.m4 b/winsup/mingw/aclocal.m4 index 02b2f11b6..4d530d651 100644 --- a/winsup/mingw/aclocal.m4 +++ b/winsup/mingw/aclocal.m4 @@ -94,4 +94,29 @@ fi) m4_divert_pop()dnl ])# GCC_NO_EXECUTABLES + +# MINGW_AC_MANPAGE_TRANSFORM +# -------------------------- +# Provide support for specifying a manpage name transform. +# This allows e.g. Cygwin to add a `mingw-' prefix to MinGW specific +# manpages, when installing as a Cygwin subsystem. +# +# Activated by `--enable-mingw-manpage-transform[=SED-SCRIPT]', the +# default is disabled, (i.e. no transform). If enabled, without any +# SED-SCRIPT specification, the default `mingw-' prefix is added. +# +AC_DEFUN([MINGW_AC_MANPAGE_TRANSFORM], +[AC_ARG_ENABLE([mingw-manpage-transform], +[AS_HELP_STRING([--enable-mingw-manpage-transform@<:@=SED-SCRIPT@:>@], + [apply SED-SCRIPT @<:@s/^/mingw-/@:>@ to installed manpage names])] +[AS_HELP_STRING([--disable-mingw-manpage-transform], + [@<:@DEFAULT@:>@ don't transform installed manpage names])], + [case ${enableval} in + yes) mingw_manpage_transform='s,^,mingw-,' ;; + no) mingw_manpage_transform='s,x,x,' ;; + *) mingw_manpage_transform=${enableval} ;; + esac]) + AC_SUBST([mingw_manpage_transform],[${mingw_manpage_transform-'s,x,x,'}])dnl +])# MINGW_AC_MANPAGE_TRANSFORM + # $RCSfile$: end of file: vim: ft=config diff --git a/winsup/mingw/configure b/winsup/mingw/configure index 87e9153a3..c67eca256 100755 --- a/winsup/mingw/configure +++ b/winsup/mingw/configure @@ -273,7 +273,7 @@ PACKAGE_BUGREPORT='' ac_unique_file="include/_mingw.h" ac_subdirs_all="$ac_subdirs_all profile mingwex" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT with_cross_host all_dlls_host install_dlls_host AR ac_ct_AR AS ac_ct_AS RANLIB ac_ct_RANLIB LD ac_ct_LD DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP WINDRES ac_ct_WINDRES subdirs THREAD_DLL MKINSTALLDIRS MNO_CYGWIN LIBM_A LIBGMON_A HEADER_SUBDIR W32API_INCLUDE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT with_cross_host all_dlls_host install_dlls_host AR ac_ct_AR AS ac_ct_AS RANLIB ac_ct_RANLIB LD ac_ct_LD DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP WINDRES ac_ct_WINDRES subdirs THREAD_DLL MKINSTALLDIRS MNO_CYGWIN LIBM_A LIBGMON_A HEADER_SUBDIR W32API_INCLUDE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA mingw_manpage_transform LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -804,6 +804,16 @@ if test -n "$ac_init_help"; then esac cat <<\_ACEOF +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-mingw-manpage-transform[=SED-SCRIPT] + apply SED-SCRIPT [s/^/mingw-/] to installed + manpage names + --disable-mingw-manpage-transform + [DEFAULT] don't transform installed manpage + names + Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -3029,6 +3039,17 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +# Check whether --enable-mingw-manpage-transform or --disable-mingw-manpage-transform was given. +if test "${enable_mingw_manpage_transform+set}" = set; then + enableval="$enable_mingw_manpage_transform" + case ${enableval} in + yes) mingw_manpage_transform='s,^,mingw-,' ;; + no) mingw_manpage_transform='s,x,x,' ;; + *) mingw_manpage_transform=${enableval} ;; + esac +fi; + mingw_manpage_transform=${mingw_manpage_transform-'s,x,x,'} + ac_config_files="$ac_config_files Makefile" @@ -3714,6 +3735,7 @@ s,@W32API_INCLUDE@,$W32API_INCLUDE,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@mingw_manpage_transform@,$mingw_manpage_transform,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/winsup/mingw/configure.in b/winsup/mingw/configure.in index 670c8c173..4d11d3584 100644 --- a/winsup/mingw/configure.in +++ b/winsup/mingw/configure.in @@ -76,6 +76,7 @@ AC_SUBST([HEADER_SUBDIR]) AC_SUBST([W32API_INCLUDE]) AC_PROG_INSTALL +MINGW_AC_MANPAGE_TRANSFORM AC_CONFIG_FILES([Makefile]) AC_OUTPUT