mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

Update of /cvsroot/mingw/man/msgs
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13986/msgs

Modified Files:
	mess.fr 
Log Message:
Correct defect in french language message catalogue source.


Index: mess.fr
===================================================================
RCS file: /cvsroot/mingw/man/msgs/mess.fr,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -d -r1.1.1.2 -r1.2
*** mess.fr	26 Jul 2007 22:22:25 -0000	1.1.1.2
--- mess.fr	27 Feb 2008 22:17:19 -0000	1.2
***************
*** 131,135 ****
    f : équivalent à whatis(1)\n\
    h : afficher ce message d'aide\n\
!   k : équivalent à apropos(1)\n"
    K : rechercher une chaîne dans toutes les pages\n"
  USAGE5
--- 131,135 ----
    f : équivalent à whatis(1)\n\
    h : afficher ce message d'aide\n\
!   k : équivalent à apropos(1)\n\
    K : rechercher une chaîne dans toutes les pages\n"
  USAGE5

Update of /cvsroot/mingw/man
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13986

Modified Files:
	ChangeLog 
Log Message:
Correct defect in french language message catalogue source.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/man/ChangeLog,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** ChangeLog	27 Feb 2008 22:08:32 -0000	1.65
--- ChangeLog	27 Feb 2008 22:17:19 -0000	1.66
***************
*** 1,4 ****
--- 1,11 ----
  2008-02-27  Keith Marshall  <kei...@us...>
  
+ 	Correct defect in french language message catalogue source.
+ 
+ 	* msgs/mess.fr (USAGE4): Message definition was prematurely terminated
+ 	by extraneous quote; replaced by escaped newline.
+ 
+ 2008-02-27  Keith Marshall  <kei...@us...>
+ 
  	Define message catalogue installation path relative to `localedir'.
  

Update of /cvsroot/mingw/man/msgs
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10099/msgs

Modified Files:
	Makefile.in 
Log Message:
Define message catalogue installation path relative to `localedir'.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/man/msgs/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.in	1 Aug 2007 16:27:40 -0000	1.6
--- Makefile.in	27 Feb 2008 22:08:32 -0000	1.7
***************
*** 43,49 ****
  	echo timestamp > $@
  
! locale = ${DESTDIR}@locale@
! locale_prefix = ${DESTDIR}@locale_prefix@
! locale_path = ${DESTDIR}@locale_path@
  languages = @languages@
  
--- 43,49 ----
  	echo timestamp > $@
  
! nl_catdir = ${localedir}/@nl_catdir@
! nl_catfile = ${nl_catdir}/@nl_catfile@
! localedir = ${DESTDIR}@localedir@
  languages = @languages@
  
***************
*** 52,65 ****
  
  install: stamp.cat
! 	test -z "${DESTDIR}" || $(MKINSTALLDIRS) ${locale_prefix}
  	N=man; \
  	for L in $(languages); \
  	  do if test -f mess.$$L.cat; \
  	    then \
! 	      $(MKINSTALLDIRS) --require ${locale_prefix} ${locale_path}; \
! 	      echo >&2 "$(INSTALL) -m 444 mess.$$L.cat ${locale}"; \
! 	      $(INSTALL) -m 444 mess.$$L.cat ${locale}; \
  	    else \
! 	      echo >&2 "$(INSTALL) -m 444 mess.$$L.cat ${locale}"; \
  	      echo >&2 "install: mess.$$L.cat: no message catalogue available"; \
  	    fi; \
--- 52,65 ----
  
  install: stamp.cat
! 	test -z "${DESTDIR}" || $(MKINSTALLDIRS) ${localedir}
  	N=man; \
  	for L in $(languages); \
  	  do if test -f mess.$$L.cat; \
  	    then \
! 	      $(MKINSTALLDIRS) --require ${localedir} ${nl_catdir}; \
! 	      echo >&2 "$(INSTALL) -m 444 mess.$$L.cat ${nl_catfile}"; \
! 	      $(INSTALL) -m 444 mess.$$L.cat ${nl_catfile}; \
  	    else \
! 	      echo >&2 "$(INSTALL) -m 444 mess.$$L.cat ${nl_catfile}"; \
  	      echo >&2 "install: mess.$$L.cat: no message catalogue available"; \
  	    fi; \

Update of /cvsroot/mingw/man
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10099

Modified Files:
	ChangeLog aclocal.m4 configure 
Log Message:
Define message catalogue installation path relative to `localedir'.


Index: aclocal.m4
===================================================================
RCS file: /cvsroot/mingw/man/aclocal.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** aclocal.m4	23 Feb 2008 22:06:37 -0000	1.28
--- aclocal.m4	27 Feb 2008 22:08:32 -0000	1.29
***************
*** 778,786 ****
     MAN_NLS_LOCALE_CACHE_OVERRIDE([$withval]),
     MAN_NLS_LOCALE_CACHE_INIT([$1], [$2]))
!  AC_SUBST([locale], [`echo "$man_cv_locale" | sed s'?%?$$?g'`])
!  AC_SUBST([locale_prefix], [`echo "$locale" | sed s'?[[\\/]]*$$.*??'`])
!  AC_SUBST([locale_path], [`AS_DIRNAME([$locale])`])dnl
  ])
- #AC_SUBST([locale_path], [`echo "$locale" | sed s'?[[\\/]]*[[^\\/]]*[[\\/]]*$??'`])dnl
  
  # MAN_NLS_LOCALE_CACHE_INIT( PREFERRED, [FALLBACK] )
--- 778,786 ----
     MAN_NLS_LOCALE_CACHE_OVERRIDE([$withval]),
     MAN_NLS_LOCALE_CACHE_INIT([$1], [$2]))
!  nl_catdir=`echo "$man_cv_locale" | sed 's?[[^%]]*\(%.*\)?\1?;s?%?$$?g'`
!  AC_SUBST([localedir], [`echo "$man_cv_locale" | sed s'?[[\\/]]*%.*??'`])
!  AC_SUBST([nl_catfile], [`echo "$nl_catdir" | sed s'?^.*[[\\/]]??'`])
!  AC_SUBST([nl_catdir], [`AS_DIRNAME([$nl_catdir])`])dnl
  ])
  
  # MAN_NLS_LOCALE_CACHE_INIT( PREFERRED, [FALLBACK] )
***************
*** 820,824 ****
  AC_DEFUN([MAN_NLS_LOCALE_CACHE_OVERRIDE],
  [AC_MSG_CHECKING([where to install message catalogues])
!  man_cv_locale='$1'
   AC_MSG_RESULT([$man_cv_locale])dnl
  ])
--- 820,824 ----
  AC_DEFUN([MAN_NLS_LOCALE_CACHE_OVERRIDE],
  [AC_MSG_CHECKING([where to install message catalogues])
!  man_cv_locale="$1"
   AC_MSG_RESULT([$man_cv_locale])dnl
  ])

Index: configure
===================================================================
RCS file: /cvsroot/mingw/man/configure,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** configure	23 Feb 2008 22:06:37 -0000	1.36
--- configure	27 Feb 2008 22:08:32 -0000	1.37
***************
*** 310,314 ****
  #endif"
  
! 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 CC CFLAGS LDFLAGS CPPFLAGS BUILD_CC BUILD_CFLAGS BUILD_LDFLAGS BUILD_CPPFLAGS man_install_flags awk ac_ct_CC EXEEXT OBJEXT AR ac_ct_AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE CWARNNP CWARN WIN32LIBS CPP EGREP ALLOCA LIBOBJS manpathoption FHS FSSTND man_config_file sections man1ext man5ext man8ext path_separator_char NULLDEV path__usr_man path__usr_share_man path__usr_local_man path__usr_local_share_man path__usr_X11R6_man path__opt___STAR___man path__usr_lib___STAR___man path__usr_share___STAR___man path__usr_kerberos_man map_to__usr_man path__bin path__sbin path__usr_bin path__usr_sbin map_to__usr_local_man path__usr_local_bin path__usr_local_sbin map_to__usr_X11R6_man path__usr_X11R6_bin path__usr_bin_X11 path__usr_bin_mh man_tools_required gencat ac_pt_gencat man_gencat_program languages make_install_messages make_messages locale locale_prefix locale_path pager browser htmlpager man_grepsilent cat troff nroff jnroff col pcol eqn neqn jneqn tbl vgrind refer grap pic cmp compress compress_ext gunzip bzip2 pcat zcat fcat unyabba decompress LTLIBOBJS'
  ac_subst_files=''
  
--- 310,314 ----
  #endif"
  
! 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 CC CFLAGS LDFLAGS CPPFLAGS BUILD_CC BUILD_CFLAGS BUILD_LDFLAGS BUILD_CPPFLAGS man_install_flags awk ac_ct_CC EXEEXT OBJEXT AR ac_ct_AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE CWARNNP CWARN WIN32LIBS CPP EGREP ALLOCA LIBOBJS manpathoption FHS FSSTND man_config_file sections man1ext man5ext man8ext path_separator_char NULLDEV path__usr_man path__usr_share_man path__usr_local_man path__usr_local_share_man path__usr_X11R6_man path__opt___STAR___man path__usr_lib___STAR___man path__usr_share___STAR___man path__usr_kerberos_man map_to__usr_man path__bin path__sbin path__usr_bin path__usr_sbin map_to__usr_local_man path__usr_local_bin path__usr_local_sbin map_to__usr_X11R6_man path__usr_X11R6_bin path__usr_bin_X11 path__usr_bin_mh man_tools_required gencat ac_pt_gencat man_gencat_program languages make_install_messages make_messages localedir nl_catfile nl_catdir pager browser htmlpager man_grepsilent cat troff nroff jnroff col pcol eqn neqn jneqn tbl vgrind refer grap pic cmp compress compress_ext gunzip bzip2 pcat zcat fcat unyabba decompress LTLIBOBJS'
  ac_subst_files=''
  
***************
*** 9600,9604 ****
    echo "$as_me:$LINENO: checking where to install message catalogues" >&5
  echo $ECHO_N "checking where to install message catalogues... $ECHO_C" >&6
!  man_cv_locale='$withval'
   echo "$as_me:$LINENO: result: $man_cv_locale" >&5
  echo "${ECHO_T}$man_cv_locale" >&6
--- 9600,9604 ----
    echo "$as_me:$LINENO: checking where to install message catalogues" >&5
  echo $ECHO_N "checking where to install message catalogues... $ECHO_C" >&6
!  man_cv_locale="$withval"
   echo "$as_me:$LINENO: result: $man_cv_locale" >&5
  echo "${ECHO_T}$man_cv_locale" >&6
***************
*** 9621,9635 ****
  echo "${ECHO_T}$man_cv_locale" >&6
  fi;
!  locale=`echo "$man_cv_locale" | sed s'?%?$$?g'`
  
!  locale_prefix=`echo "$locale" | sed s'?[\\/]*$$.*??'`
  
!  locale_path=`(dirname $locale) 2>/dev/null ||
! $as_expr X$locale : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
! 	 X$locale : 'X\(//\)[^/]' \| \
! 	 X$locale : 'X\(//\)$' \| \
! 	 X$locale : 'X\(/\)' \| \
  	 .     : '\(.\)' 2>/dev/null ||
! echo X$locale |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
    	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--- 9621,9636 ----
  echo "${ECHO_T}$man_cv_locale" >&6
  fi;
!  nl_catdir=`echo "$man_cv_locale" | sed 's?[^%]*\(%.*\)?\1?;s?%?$$?g'`
!  localedir=`echo "$man_cv_locale" | sed s'?[\\/]*%.*??'`
  
!  nl_catfile=`echo "$nl_catdir" | sed s'?^.*[\\/]??'`
  
!  nl_catdir=`(dirname $nl_catdir) 2>/dev/null ||
! $as_expr X$nl_catdir : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
! 	 X$nl_catdir : 'X\(//\)[^/]' \| \
! 	 X$nl_catdir : 'X\(//\)$' \| \
! 	 X$nl_catdir : 'X\(/\)' \| \
  	 .     : '\(.\)' 2>/dev/null ||
! echo X$nl_catdir |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
    	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
***************
*** 13958,13964 ****
  s,@make_install_messages@,$make_install_messages,;t t
  s,@make_messages@,$make_messages,;t t
! s,@locale@,$locale,;t t
! s,@locale_prefix@,$locale_prefix,;t t
! s,@locale_path@,$locale_path,;t t
  s,@pager@,$pager,;t t
  s,@browser@,$browser,;t t
--- 13959,13965 ----
  s,@make_install_messages@,$make_install_messages,;t t
  s,@make_messages@,$make_messages,;t t
! s,@localedir@,$localedir,;t t
! s,@nl_catfile@,$nl_catfile,;t t
! s,@nl_catdir@,$nl_catdir,;t t
  s,@pager@,$pager,;t t
  s,@browser@,$browser,;t t

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/man/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** ChangeLog	25 Feb 2008 22:23:08 -0000	1.64
--- ChangeLog	27 Feb 2008 22:08:32 -0000	1.65
***************
*** 1,2 ****
--- 1,19 ----
+ 2008-02-27  Keith Marshall  <kei...@us...>
+ 
+ 	Define message catalogue installation path relative to `localedir'.
+ 
+ 	* aclocal.m4 (MAN_NLS_LOCALE_CACHE_INIT): Don't single quote
+ 	assignment for `man_cv_locale'; double quote it instead to allow
+ 	expansion of shell variable `${withval}'.
+ 	(MAN_NLS_LOCALE_DIRECTORY): Remove these...
+ 	(locale, locale_path, locale_prefix): ...disused AC_SUBST variables;
+ 	replace them with these...
+ 	(nl_catfile, nl_catdir, localedir): ...new alternatives.
+ 
+ 	* configure: Regenerated.
+ 
+ 	* msgs/Makefile.in (install): Use these...
+ 	(nl_catfile, nl_catdir, localedir): ...new AC_SUBST variables.
+ 
  2008-02-25  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/man
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27030

Modified Files:
	ChangeLog 
Log Message:
Improved Win32 path name handling and `man.conf' location.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/man/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** ChangeLog	23 Feb 2008 22:06:37 -0000	1.63
--- ChangeLog	25 Feb 2008 22:23:08 -0000	1.64
***************
*** 1,2 ****
--- 1,42 ----
+ 2008-02-25  Keith Marshall  <kei...@us...>
+ 
+ 	Improved Win32 path name handling and `man.conf' location.
+ 
+ 	* src/win32/wincmds.c (win32run_command_sequence): Function renamed...
+ 	(win32_run_command_sequence): ...to this.
+ 
+ 	* src/win32/winposix.c (win32path_transform): Function renamed...
+ 	(win32_path_transform): ...and reimplemented as this; the transform is
+ 	now performed in the wide character domain, to avoid misidentification
+ 	of `\`, occurring as a trail byte in a muiltbyte character sequence.
+ 	(win32path_is_absolute): Function renamed and reimplemented...
+ 	(win32_path_is_absolute): ...as this; also now uses the wide character
+ 	domain, but no longer implicitly normalises `\' in the path argument,
+ 	so caller must now explicitly call `win32_path_transform' if needed.
+ 	(win32_map_posix_path_name): New function.
+ 	(win32_mbsconv, win32_mbsconv_len): New `static inline' functions.
+ 	(win32_wcsconv, win32_wcsconv_len): New `static inline' functions.
+ 	(is_dirsep): New `static inline' function.
+ 	(wcs_normalised_path): New `static' function.
+ 	(approot_len): New `static inline' function.
+ 	(win32_application_root_length): New `static inline' function.
+ 	(dirname_len, dirname_strip): New `static inline' functions.
+ 	(win32_application_root): New `static' function.
+ 
+ 	* src/compat.h: Address `src/win32' function updates...
+ 	(IS_ABSOLUTE_PATH) [_WIN32]: Use `win32_path_is_absolute'.
+ 	(RUN_COMMAND_SEQUENCE) [_WIN32]: Use `win32_run_command_sequence'.
+ 	(MAP_POSIX_PATH_NAME) [_WIN32]: Define; use `win32_map_posix_path_name'.
+ 	(MAP_POSIX_PATH_NAME) [!_WIN32]: Define; substitute its own argument.
+ 	(POSIX_STYLE_PATH) [_WIN32]: Use `win32_path_transform'.
+ 
+ 	* src/manpath.c (add_to_list): Use `POSIX_STYLE_PATH' to normalise the
+ 	effective path name, when evaluating the current working directory.
+ 
+ 	* src/man-config.c (default_config_files) [_WIN32]: Add alternative
+ 	path names, to map application relative config file locations.
+ 	(read_config_file): Use `MAP_POSIX_PATH_NAME' to resolve possible
+ 	locations for the config file.
+ 
  2008-02-23  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/man/src/win32
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27030/src/win32

Modified Files:
	wincmds.c winposix.c 
Log Message:
Improved Win32 path name handling and `man.conf' location.


Index: winposix.c
===================================================================
RCS file: /cvsroot/mingw/man/src/win32/winposix.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** winposix.c	18 Aug 2005 13:30:24 -0000	1.2
--- winposix.c	25 Feb 2008 22:23:08 -0000	1.3
***************
*** 3,17 ****
   *
   * Provides:
!  *   char* win32path_transform( const char* pathname );
   *
   *     This function replaces all occurrences of the "\" character,
   *     in the specified Win32 "pathname", with the "/" character.
   *
!  *   int win32path_is_absolute( const char* pathname );
   *
   *     This function determines if the specified Win32 "pathname"
   *     represents an absolute location in the Win32 file system.
!  *     (Note that "pathname" is transformed in-situ, according to
!  *      the algorithm employed by win32path_transform).
   *
   * This is free software; you can redistribute it and/or modify it
--- 3,23 ----
   *
   * Provides:
!  *   char* win32_path_transform( const char* pathname );
   *
   *     This function replaces all occurrences of the "\" character,
   *     in the specified Win32 "pathname", with the "/" character.
   *
!  *   int win32_path_is_absolute( const char* pathname );
   *
   *     This function determines if the specified Win32 "pathname"
   *     represents an absolute location in the Win32 file system.
!  *
!  *   const char* win32_map_posix_path_name( const char* pathname );
!  *
!  *     This function maps the POSIX style absolute path name
!  *     specified by "pathname" to an equivalent Win32 path name,
!  *     with an effective virtual root of the POSIX file system
!  *     determined relative to the installation directory of
!  *     the calling application exeecutable.
   *
   * This is free software; you can redistribute it and/or modify it
***************
*** 29,61 ****
   * the Free Software Foundation, 51 Franklin St - Fifth Floor, Boston,
   * MA 02110-1301, USA.
   */
  
! #include "compat.h"
  
! /* win32path_transform(): fix up Win32 path names, so that they
!  * conform to the POSIX convention of using "/" as the directory separator,
!  * (but leave "D:" as a drive designator, if it is present).
!  */
  
! char *win32path_transform (const char *pathname)
  {
!   char *p = (char *)pathname;
  
!   if ( p )
!     do if (*p == '\\') *p = '/';
!       while (*p++);
    return (char *) pathname;
  }
  
! /* win32path_is_absolute(): check if a specified Win32 path,
!  * which may, or may not have been transformed by win32path_transform(),
!  * represents an absolute reference to a file system location.
!  */
  
! int win32path_is_absolute (const char *pathname)
  {
!   pathname = win32path_transform (pathname);
!   return (*pathname == '/') || ((pathname[1] == ':') && (pathname[2] == '/'));
  }
  
! /* $Source$: end of file */
--- 35,378 ----
   * the Free Software Foundation, 51 Franklin St - Fifth Floor, Boston,
   * MA 02110-1301, USA.
+  *
   */
+ #define  WIN32_LEAN_AND_MEAN
  
! #include <windows.h>
! #include <compat.h>
! #include <stdlib.h>
  
! static inline
! size_t win32_mbsconv( wchar_t *buf, size_t len, const char *mbs )
! {
!   /* Inline helper to convert path names from the multibyte character
!    * domain defined by the system code page, to the wide character domain.
!    */
!   return MultiByteToWideChar( CP_ACP, 0, mbs, (size_t)(-1), buf, len );
! }
  
! static inline
! size_t win32_mbsconv_len( const char *s )
  {
!   /* Inline helper to determine the size of the buffer needed to store
!    * the wide character representation of a path name, when converted from
!    * the multibyte character domain defined by the system code page.
!    */
!   return win32_mbsconv( NULL, 0, s );
! }
  
! static inline
! size_t win32_wcsconv( char *buf, size_t len, const wchar_t *wcs )
! {
!   /* Inline helper to convert path names from the wide character domain
!    * to the multibyte character domain defined by the system code page.
!    */
!   return WideCharToMultiByte( CP_ACP, 0, wcs, (size_t)(-1), buf, len, NULL, NULL );
! }
! 
! static inline
! size_t win32_wcsconv_len( const wchar_t *wcs )
! {
!   /* Inline helper to determine the size of the buffer needed to store
!    * the multibyte character representation of a path name, in the codeset
!    * specified by the system code page, when converted back from the wide
!    * character domain.
!    */
!   return win32_wcsconv( NULL, 0, wcs );
! }
! 
! static inline
! int is_dirsep (wchar_t ch)
! {
!   /* Inline helper to determine if a specified wide character represents
!    * either of the standard dirname separator characters.
!    */
!   return (ch == L'/') || (ch == L'\\');
! }
! 
! #define win32_get_dirname_separator() L'/'
! 
! static
! const wchar_t *wcs_normalised_path( wchar_t *path )
! {
!   /* Normalise a string, representing a Win32 path name in the wide
!    * character domain, stripping off any trailing dirname separators,
!    * and replacing any leading or contained runs of such characters
!    * by a single instance of the preferred dirname separator, (two
!    * such separators are retained, in the case of repeated leading
!    * separators).  Normalisation is performed `in place', and all
!    * retained dirname separators are consistently replaced by slash
!    * or backslash, as established by `win32_set_dirname_separator()',
!    * (with backslash as default).
!    */
! 
!   if( path != NULL )
!   {
!     wchar_t *src = (wchar_t *)(path);
!     wchar_t *dest = (wchar_t *)(path);
!     wchar_t dirsep = win32_get_dirname_separator();
! 
!     if( is_dirsep( *src ) )
!     {
!       /* The initial character is a dirname separator;
!        * normalise it, but to accommodate a possible UNC path
!        * ensure that we don't normalise away the following
!        * character, if it is a second separator.
!        */
!       ++src; *dest++ = dirsep;
!     }
! 
!     /* Scan the input path name string...
!      */
!     do { while( is_dirsep( *src ) )
!          {
! 	   /* ...normalising and collapsing contiguous runs
! 	    * of dirname separator characters...
! 	    */
! 	   *dest = dirsep;
!            ++src;
! 	 }
! 	 if( *src && (*dest == dirsep) )
! 	 {
! 	   /* ...retaining any internal, but not any trailing
! 	    * dirname separators...
! 	    */
! 	   ++dest;
! 	 }
! 	 /* ...and rewriting `in place'...
! 	  */
! 	 *dest++ = *src;
! 
! 	 /* ...inclusively, until we reach the terminating NUL.
! 	  */
!        } while( *src++ );
!   }
! 
!   /* Return the normalised path name string.
!    */
!   return path;
! }
! 
! char *win32_path_transform( const char *pathname )
! {
!   /* Public function to fix up Win32 path names, so that they conform
!    * to the POSIX convention of using "/" as the directory separator,
!    * (but leave "D:" as a drive designator, if it is present).
!    */
!   if( pathname && *pathname )
!   {
!     size_t len = win32_mbsconv_len( pathname );
!     wchar_t path[len]; win32_mbsconv( path, len, pathname );
! 
!     len = win32_wcsconv_len( wcs_normalised_path( path ) );
!     if( len < strlen( pathname ) + 2 )
!       (void) win32_wcsconv( (char *)(pathname), len, path );
!   }
    return (char *) pathname;
  }
  
! int win32_path_is_absolute( const char *pathname )
! {
!   /* Public function to check if a specified Win32 path,
!    * which may, or may not have been transformed by win32_path_transform(),
!    * represents an absolute reference to a file system location.
!    */
!   size_t len = win32_mbsconv_len( pathname );
!   wchar_t path[len]; win32_mbsconv( path, len, pathname );
!   return is_dirsep( path[0] ) || ((path[1] == L':') && is_dirsep( path[2] ));
! }
  
! static inline
! size_t approot_len( size_t set )
  {
!   /* Private function encapsulating storage for the length of the
!    * application's `root path name' string, and providing read/write
!    * access for `win32_application_root()' to set it.
!    */
!   static size_t value =  (size_t)(0);
! 
!   if( set > (size_t)(0) )
!     value = set - (size_t)(1);
!   return value;
  }
  
! static inline
! size_t win32_application_root_length( void )
! {
!   /* Public accessor function, providing read-only look up for
!    * the length of the application's `root path name' string, as
!    * set by `win32_application_root()'.
!    */
!   return approot_len( (size_t)(0) );
! }
! 
! static inline
! size_t dirname_len( const wchar_t *path, size_t len )
! {
!   /* Local inline helper to establish the length of the `dirname'
!    * component of a path name in the wide character domain.
!    */
!   while( (len > 0) && ! is_dirsep( path[len] ) )
!     --len;
!   return len;
! }
! 
! static inline
! size_t dirname_strip( wchar_t *path, size_t len )
! {
!   /* Local inline helper to discard trailing dirname separators
!    * from the end of a path name in the wide character domain.
!    */
!   while( (len > 0) && is_dirsep( path[len] ) )
!     path[len--] = L'\0';
!   return len;
! }
! 
! static
! const char *win32_application_root( void )
! {
!   /* `locale-safe' function for finding an application's root path.
!    */
!   static char *approot = NULL;
! 
!   if( approot == NULL )
!   {
!     /* The application's root path has not yet been evaluated;
!      * establish a local buffer, in which to construct a wchar_t
!      * representation of the normalised application root path name,
!      * derived from the MSVCRT global variable `_pgmptr'.
!      */
!     size_t len; wchar_t buf[len = win32_mbsconv_len( _pgmptr )];
! 
!     /* Copy the content of `_pgmptr' to this buffer, transforming it to
!      * the wchar_t domain in the process, and adjust `len' to the offset
!      * of its last character.
!      */
!     if( buf[len = win32_mbsconv( buf, len, _pgmptr ) - 1] == L'\0' )
!       --len;
! 
!     /* Discard any trailing dirname separator characters, and locate the
!      * final dirname separator, preceding the basename of the residual path.
!      */
!     len = dirname_len( buf, dirname_strip( buf, len ) );
!     if( is_dirsep( buf[len] ) )
!     {
!       size_t offset;
! 
!       /* When we have distinct dirname and basename components, then we
!        * discard the basename, and also any newly exposed trailing dirname
!        * separator characters.
!        */
!       len = dirname_len( buf, dirname_strip( buf, len ) );
! 
!       /* Check if the leaf directory name is `bin' or `sbin'...
!        */
!       offset = len + 1;
!       if( (buf[offset] == L's') || (buf[offset] == L'S') )
! 	++offset;
!       if( _wcsicmp( buf + offset, L"bin" ) == 0 )
! 	/*
! 	 * ...and if so, drop it, to retain just the effective
! 	 * `prefix' directory path for the application.
! 	 */
! 	(void) dirname_strip( buf, len );
! #     if 0
!       {
! 	/* ...and if so, drop it and check for a `local' parent...
! 	 */
! 	len = dirname_len( buf, dirname_strip( buf, len ) );
! 	if( is_dirsep( buf[len] ) && (_wcsicmp( buf + len + 1, L"local" ) == 0) )
! 	{
! 	  /* ...also dropping that...
! 	   */
! 	  len = dirname_len( buf, dirname_strip( buf, len ) );
! 	}
! 	/* ...together with any `usr' parent.
! 	 */
! 	if( is_dirsep( buf[len] ) && (_wcsicmp( buf + len + 1, L"usr" ) == 0) )
! 	  (void) dirname_strip( buf, len );
!       }
! #     endif
!     }
! 
!     /* Transform back to the multibyte character domain, and cache the
!      * resultant path name together with its length, for immediate and
!      * possible later return.
!      */
!     len = win32_wcsconv_len( wcs_normalised_path( buf ) );
!     if( (approot = malloc( len )) != NULL )
!       (void) approot_len( win32_wcsconv( approot, len, buf ) );
!   }
! 
!   /* Whether evaluated on this occasion, or by a previous call,
!    * return the resultant path name, as stored in the local cache.
!    */
!   return approot;
! }
! 
! const char *win32_map_posix_path_name( const char *name )
! {
!   /* Resolve the absolute Win32 path name for a specified absolute
!    * POSIX-style path name, where this POSIX-style path is deemed to
!    * be absolute w.r.t. the `application root' directory.
!    *
!    * The return string is dynamically allocated, but with a local
!    * reference pointer, thus the caller should not free it; call this
!    * function again, with `name == NULL', to free the memory.
!    */
!   static char *retpath = NULL;
! 
!   if( retpath != NULL )
!   {
!     /* We have a result left over from a previous call;
!      * first we must discard it, and free the associated memory.
!      */
!     free( (void *)(retpath) );
!     retpath = NULL;
!   }
! 
!   if( name != NULL )
!   {
!     /* We have a new path name to map;
!      * transform to the wide character domain and normalise.
!      */
!     size_t len; wchar_t buf[len = win32_mbsconv_len( name )];
! 
!     (void) win32_mbsconv( buf, len, name );
!     len = win32_wcsconv_len( wcs_normalised_path( buf ) );
! 
!     if( is_dirsep( *buf ) )
!     {
!       /* Provided the input path name is representative of
!        * an *absolute* POSIX path name, we make it relative to
!        * the application root...
!        */
!       const char *prefix = win32_application_root();
!       size_t prefix_len = win32_application_root_length();
! 
!       if( (retpath = malloc( prefix_len + len )) != NULL )
!       {
! 	/* ...transforming back to the multibyte character domain,
! 	 * within the buffer allocated for return.
! 	 */
! 	memcpy( retpath, prefix, prefix_len );
! 	(void) win32_wcsconv( retpath + prefix_len, len, buf );
!       }
!     }
! 
!     else if( (retpath = malloc( len )) != NULL )
!     {
!       /* The input path *isn't* an absolute POSIX path,
!        * so simply make a normalised copy of the input path name
!        * in the smaller buffer allocated for return.
!        */
!       (void) win32_wcsconv( retpath, len, buf );
!     }
!   }
! 
!   /* Return the normalised path name, now stored in `retpath'.
!    */
!   return retpath;
! }
! 
! /* $RCSfile$: end of file */

Index: wincmds.c
===================================================================
RCS file: /cvsroot/mingw/man/src/win32/wincmds.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wincmds.c	9 Dec 2005 16:50:43 -0000	1.2
--- wincmds.c	25 Feb 2008 22:23:08 -0000	1.3
***************
*** 3,7 ****
   *
   * Provides:
!  *   int win32run_command_sequence( char *command );
   *
   *     This function may be used in place of a system() function call,
--- 3,7 ----
   *
   * Provides:
!  *   int win32_run_command_sequence( char *command );
   *
   *     This function may be used in place of a system() function call,
***************
*** 43,51 ****
  #define  SHELL_NOT_FOUND  -1
  
! /* win32run_command_sequence(): used in place of a system() call,
   * to invoke the appropriate sequence of manpage formatting commands.
   */
  
! int win32run_command_sequence( const char *commands )
  {
    int status = SHELL_NOT_FOUND;
--- 43,51 ----
  #define  SHELL_NOT_FOUND  -1
  
! /* win32_run_command_sequence(): used in place of a system() call,
   * to invoke the appropriate sequence of manpage formatting commands.
   */
  
! int win32_run_command_sequence( const char *commands )
  {
    int status = SHELL_NOT_FOUND;

Update of /cvsroot/mingw/man/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27030/src

Modified Files:
	compat.h man-config.c manpath.c 
Log Message:
Improved Win32 path name handling and `man.conf' location.


Index: man-config.c
===================================================================
RCS file: /cvsroot/mingw/man/src/man-config.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** man-config.c	8 Feb 2006 15:43:23 -0000	1.4
--- man-config.c	25 Feb 2008 22:23:08 -0000	1.5
***************
*** 228,235 ****
  
  char *default_config_files[] = {
!      CONFIG_FILE,		/* compiled-in default */
!      "/etc/man.conf", "/etc/man.config",
!      "/usr/lib/man.conf", "/usr/lib/man.config",
!      "/usr/share/misc/man.conf", "/usr/share/misc/man.config"
  };
  
--- 228,257 ----
  
  char *default_config_files[] = {
! /*
!  *   Some conventional path names to try, when attempting
!  *   to open the `man' configuration file, starting with...
!  */
!      CONFIG_FILE,		/* ...the compiled-in default */
! /*
!  *   Failing that, the traditional location would be in the
!  *   /etc directory, with either of the standard file names...
!  */
!      "/etc/man.conf",		   "/etc/man.config",
! 
! #    ifdef _WIN32
! /*   Otherwise the standard locations would be in the /usr tree,
!  *   but some Woe32 shells, (e.g. MSYS), treat this as a virtual
!  *   directory, and it disappears from the mapped path name, so
!  *   leaving the possible standard paths as...
!  */
!      "/lib/man.conf",		   "/lib/man.config",
!      "/share/misc/man.conf",	   "/share/misc/man.config",
! #    endif
! /*
!  *   However, these alternative standard locations are normally
!  *   defined by the fully qualified absolute path names...
!  */
!      "/usr/lib/man.conf",	   "/usr/lib/man.config",
!      "/usr/share/misc/man.conf",   "/usr/share/misc/man.config"
  };
  
***************
*** 238,241 ****
--- 260,271 ----
  void
  read_config_file (const char *cf) {
+ /*
+  * Open, read and interpret the `man' configuration file.
+  * Note that we always return (void) MAP_POSIX_PATH_NAME (NULL);
+  * on most platforms, this has no effect, but is required on
+  * Woe32, to free memory allocated by the path name mapping
+  * function, used to identify the equivalent Woe32 paths
+  * for the conventional POSIX config file path names.
+  */
       char *bp;
       char *p;
***************
*** 251,260 ****
  	  }
       } else {
! 	  /* Try some things - unfortunately we cannot lookup
! 	     the config file to use in the config file :-). */
  	  int i;
  
! 	  for(i=0; i < SIZE(default_config_files); i++) {
! 	       cf = default_config_files[i];
  	       if ((config = fopen (cf, "r")) != NULL)
  		    break;
--- 281,293 ----
  	  }
       } else {
! 	  /* No explicit config file specified by the user.
! 	   * Unfortunately we cannot look up the path name for
! 	   * the config file, in the config file itself; :-)
! 	   * therefore try the conventional locations.
! 	   */
  	  int i;
  
! 	  for(i=0; i < SIZE (default_config_files); i++) {
! 	       cf = MAP_POSIX_PATH_NAME (default_config_files[i]);
  	       if ((config = fopen (cf, "r")) != NULL)
  		    break;
***************
*** 263,267 ****
  	  if (config == NULL) {
  	       gripe (CONFIG_OPEN_ERROR, CONFIG_FILE);
! 	       return;
  	  }
       }
--- 296,300 ----
  	  if (config == NULL) {
  	       gripe (CONFIG_OPEN_ERROR, CONFIG_FILE);
! 	       return (void) MAP_POSIX_PATH_NAME (NULL);
  	  }
       }
***************
*** 279,283 ****
  	       gripe (LINE_TOO_LONG);
  	       gripe (BAD_CONFIG_FILE, cf);
! 	       return;
  	  }
  	  while (p > bp && whitespace(p[-1]))
--- 312,316 ----
  	       gripe (LINE_TOO_LONG);
  	       gripe (BAD_CONFIG_FILE, cf);
! 	       return (void) MAP_POSIX_PATH_NAME (NULL);
  	  }
  	  while (p > bp && whitespace(p[-1]))
***************
*** 307,310 ****
  	       addval (bp);
       }
  }
- 
--- 340,343 ----
  	       addval (bp);
       }
+      return (void) MAP_POSIX_PATH_NAME (NULL);
  }

Index: compat.h
===================================================================
RCS file: /cvsroot/mingw/man/src/compat.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** compat.h	24 Feb 2006 16:25:46 -0000	1.6
--- compat.h	25 Feb 2008 22:23:08 -0000	1.7
***************
*** 4,8 ****
   * Centralised platform dependency handling for man's C compilation units.
   *
!  * Copyright (C) 2005, Keith D. Marshall <kei...@us...>
   *
   * This file is part of the man package.
--- 4,9 ----
   * Centralised platform dependency handling for man's C compilation units.
   *
!  * Copyright (C) 2005, 2008,
!  *   Keith D. Marshall <kei...@us...>
   *
   * This file is part of the man package.
***************
*** 33,37 ****
   * if we have them.
   */
- 
  #ifdef HAVE_STRCHR
  # define index  strchr
--- 34,37 ----
***************
*** 50,54 ****
   * unless we define...
   */
- 
  # define _POSIX_SOURCE
  # define __GNU_LIBRARY__
--- 50,53 ----
***************
*** 59,63 ****
   * (except that here, we MUST NOT define _POSIX_SOURCE)...
   */
- 
  # define __GNU_LIBRARY__
  #endif
--- 58,61 ----
***************
*** 76,84 ****
   * still use ";" as the path separator.
   */
  
! #define PATH_SEPARATOR_CHAR ';'
! #define POSIX_STYLE_PATH(p) win32path_transform(p)
! 
! extern char *win32path_transform(const char *);
  
  /*
--- 74,83 ----
   * still use ";" as the path separator.
   */
+ #define PATH_SEPARATOR_CHAR    ';'
+ #define POSIX_STYLE_PATH(p)    win32_path_transform((p))
+ #define MAP_POSIX_PATH_NAME(p) win32_map_posix_path_name((p))
  
! extern char *win32_path_transform(const char *);
! extern const char *win32_map_posix_path_name(const char *);
  
  /*
***************
*** 87,94 ****
   * but we *do* still need to allow for a drive designator.
   */
  
! #define IS_ABSOLUTE_PATH(p) win32path_is_absolute((p))
! 
! extern int win32path_is_absolute(const char *);
  
  /*
--- 86,92 ----
   * but we *do* still need to allow for a drive designator.
   */
+ #define IS_ABSOLUTE_PATH(p) win32_path_is_absolute((p))
  
! extern int win32_path_is_absolute(const char *);
  
  /*
***************
*** 99,103 ****
   * so, when we care, just pretend we are running as root...
   */
- 
  #define getuid()   0
  #define geteuid()  0
--- 97,100 ----
***************
*** 113,123 ****
   * implies the use of cmd.exe to run the pipeline, which is a POSIX
   * format command line, and will, therefore, fail; instead we use a
!  * replacement function, win32run_command_sequence(), which spawns
   * a UNIXy shell, to execute the command sequence.
   */
  
! #define RUN_COMMAND_SEQUENCE(cmds)  win32run_command_sequence (cmds)
! 
! extern int win32run_command_sequence (const char *);
  
  
--- 110,119 ----
   * implies the use of cmd.exe to run the pipeline, which is a POSIX
   * format command line, and will, therefore, fail; instead we use a
!  * replacement function, win32_run_command_sequence(), which spawns
   * a UNIXy shell, to execute the command sequence.
   */
+ #define RUN_COMMAND_SEQUENCE(cmds)  win32_run_command_sequence((cmds))
  
! extern int win32_run_command_sequence(const char *);
  
  
***************
*** 131,142 ****
   * and we keep to the standard ":" as the path separator.
   */
! 
! #define PATH_SEPARATOR_CHAR ':'
! #define POSIX_STYLE_PATH(p)  p
  
  /*
   * POSIX mandates that absolute path names begin with a "/".
   */
- 
  #define IS_ABSOLUTE_PATH(p)  (*(p) == '/')
  
--- 127,137 ----
   * and we keep to the standard ":" as the path separator.
   */
! #define PATH_SEPARATOR_CHAR	':'
! #define POSIX_STYLE_PATH(p)	(p)
! #define MAP_POSIX_PATH_NAME(p)	(p)
  
  /*
   * POSIX mandates that absolute path names begin with a "/".
   */
  #define IS_ABSOLUTE_PATH(p)  (*(p) == '/')
  
***************
*** 147,152 ****
   * This is achieved by using a simple system() function call.
   */
! 
! #define RUN_COMMAND_SEQUENCE(cmds)  system (cmds)
  #endif /* !_WIN32 */
  
--- 142,146 ----
   * This is achieved by using a simple system() function call.
   */
! #define RUN_COMMAND_SEQUENCE(cmds)  system((cmds))
  #endif /* !_WIN32 */
  

Index: manpath.c
===================================================================
RCS file: /cvsroot/mingw/man/src/manpath.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** manpath.c	1 Aug 2007 16:27:54 -0000	1.6
--- manpath.c	25 Feb 2008 22:23:08 -0000	1.7
***************
*** 206,210 ****
  	  if (!getcwd(cwd, sizeof(cwd)))
  	       return; /* cwd not readable, or pathname very long */
! 	  if (! IS_ABSOLUTE_PATH (cwd))
  	       return; /* strange.. */
  	  if (strlen(dir) + strlen(lang) + strlen(cwd) + 3 > sizeof(cwd))
--- 206,210 ----
  	  if (!getcwd(cwd, sizeof(cwd)))
  	       return; /* cwd not readable, or pathname very long */
! 	  if (! IS_ABSOLUTE_PATH( POSIX_STYLE_PATH( cwd )))
  	       return; /* strange.. */
  	  if (strlen(dir) + strlen(lang) + strlen(cwd) + 3 > sizeof(cwd))

Update of /cvsroot/mingw/man
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31764

Modified Files:
	ChangeLog aclocal.m4 configure 
Log Message:
* aclocal.m4 (MSYS_AC_PREFIX_CANONICALISE): Add missing quote.


Index: aclocal.m4
===================================================================
RCS file: /cvsroot/mingw/man/aclocal.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** aclocal.m4	23 Feb 2008 13:28:59 -0000	1.27
--- aclocal.m4	23 Feb 2008 22:06:37 -0000	1.28
***************
*** 238,242 ****
  #
  AC_DEFUN([MSYS_AC_PREFIX_CANONICALISE],
! [if test "x${$1} != "xNONE"
   then
     MSYS_AC_CANONICAL_PATH([$1], [${$1}])
--- 238,242 ----
  #
  AC_DEFUN([MSYS_AC_PREFIX_CANONICALISE],
! [if test "x${$1}" != "xNONE"
   then
     MSYS_AC_CANONICAL_PATH([$1], [${$1}])

Index: configure
===================================================================
RCS file: /cvsroot/mingw/man/configure,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** configure	23 Feb 2008 13:28:59 -0000	1.35
--- configure	23 Feb 2008 22:06:37 -0000	1.36
***************
*** 1426,1430 ****
     s?/*$??'`
  
!  if test "x${exec_prefix} != "xNONE"
   then
     ac_dir="${exec_prefix}"
--- 1426,1430 ----
     s?/*$??'`
  
!  if test "x${exec_prefix}" != "xNONE"
   then
     ac_dir="${exec_prefix}"
***************
*** 1451,1455 ****
  
   fi
!  if test "x${prefix} != "xNONE"
   then
     ac_dir="${prefix}"
--- 1451,1455 ----
  
   fi
!  if test "x${prefix}" != "xNONE"
   then
     ac_dir="${prefix}"

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/man/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** ChangeLog	23 Feb 2008 13:28:59 -0000	1.62
--- ChangeLog	23 Feb 2008 22:06:37 -0000	1.63
***************
*** 1,4 ****
--- 1,11 ----
  2008-02-23  Keith Marshall  <kei...@us...>
  
+ 	Bug fix for missing quote in `test', arising from previous commit.
+ 
+ 	* aclocal.m4 (MSYS_AC_PREFIX_CANONICALISE): Add missing quote.
+ 	* configure: Regenerated.
+ 
+ 2008-02-23  Keith Marshall  <kei...@us...>
+ 
  	Canonicalise `prefix' and `exec_prefix' specifications for
  	building on Win32, using MSYS.

Update of /cvsroot/mingw/man
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4060

Modified Files:
	ChangeLog aclocal.m4 configure configure.ac 
Log Message:
Canonicalise `prefix' and `exec_prefix' specifications for building on Win32, using MSYS.


Index: aclocal.m4
===================================================================
RCS file: /cvsroot/mingw/man/aclocal.m4,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** aclocal.m4	10 Feb 2008 15:20:20 -0000	1.26
--- aclocal.m4	23 Feb 2008 13:28:59 -0000	1.27
***************
*** 221,224 ****
--- 221,247 ----
  ])
  
+ # MSYS_AC_CANONICAL_PREFIX
+ # ------------------------
+ # Ensure that configure's prefix variables are canonicalised for
+ # the Win32 file system namespace, when building under MSYS.
+ #
+ AC_DEFUN([MSYS_AC_CANONICAL_PREFIX],
+ [MSYS_AC_PREFIX_DEFAULT([${ac_default_prefix}])
+  MSYS_AC_PREFIX_CANONICALISE([exec_prefix])
+  MSYS_AC_PREFIX_CANONICALISE([prefix])dnl
+ ])
+ 
+ # MSYS_AC_PREFIX_CANONICALISE( VARNAME )
+ # --------------------------------------
+ # Helper macro, invoked by MSYS_AC_PREFIX_CANONICALISE, to convert
+ # user specified `prefix' and `exec_prefix' values to canonical form.
+ #
+ AC_DEFUN([MSYS_AC_PREFIX_CANONICALISE],
+ [if test "x${$1} != "xNONE"
+  then
+    MSYS_AC_CANONICAL_PATH([$1], [${$1}])
+  fi[]dnl
+ ])
+ 
  
  ## ==================================================== ##

Index: configure.ac
===================================================================
RCS file: /cvsroot/mingw/man/configure.ac,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** configure.ac	10 Feb 2008 15:20:20 -0000	1.28
--- configure.ac	23 Feb 2008 13:29:00 -0000	1.29
***************
*** 26,29 ****
--- 26,34 ----
    AC_CONFIG_HEADER([config.h])
  
+ # Ensure the `prefix' variables are in canonical Win32 format,
+ # when building under MSYS.
+ #
+   MSYS_AC_CANONICAL_PREFIX
+ 
  # Configure a native build subsystem, for native code tools
  # which will be required when cross-compiling.

Index: configure
===================================================================
RCS file: /cvsroot/mingw/man/configure,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** configure	10 Feb 2008 15:20:20 -0000	1.34
--- configure	23 Feb 2008 13:28:59 -0000	1.35
***************
*** 1401,1404 ****
--- 1401,1480 ----
  
  
+ # Ensure the `prefix' variables are in canonical Win32 format,
+ # when building under MSYS.
+ #
+   ac_dir="${ac_default_prefix}"
+  pwd -W >/dev/null 2>&1 && ac_pwd_w="pwd -W" || ac_pwd_w=pwd
+  until ac_val=`exec 2>/dev/null; cd "$ac_dir" && $ac_pwd_w`
+  do
+    ac_dir=`(dirname "$ac_dir") 2>/dev/null ||
+ $as_expr X"$ac_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$ac_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$ac_dir" : 'X\(//\)$' \| \
+ 	 X"$ac_dir" : 'X\(/\)' \| \
+ 	 .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_dir" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+  done
+  ac_dir=`echo "$ac_dir" | sed 's?^[./]*??'`
+  ac_val=`echo "$ac_val" | sed 's?/*$??'`
+  ac_default_prefix=`echo "${ac_default_prefix}" | sed "s?^[./]*$ac_dir/*?$ac_val/?"'
+    s?/*$??'`
+ 
+  if test "x${exec_prefix} != "xNONE"
+  then
+    ac_dir="${exec_prefix}"
+  pwd -W >/dev/null 2>&1 && ac_pwd_w="pwd -W" || ac_pwd_w=pwd
+  until ac_val=`exec 2>/dev/null; cd "$ac_dir" && $ac_pwd_w`
+  do
+    ac_dir=`(dirname "$ac_dir") 2>/dev/null ||
+ $as_expr X"$ac_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$ac_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$ac_dir" : 'X\(//\)$' \| \
+ 	 X"$ac_dir" : 'X\(/\)' \| \
+ 	 .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_dir" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+  done
+  ac_dir=`echo "$ac_dir" | sed 's?^[./]*??'`
+  ac_val=`echo "$ac_val" | sed 's?/*$??'`
+  exec_prefix=`echo "${exec_prefix}" | sed "s?^[./]*$ac_dir/*?$ac_val/?"'
+    s?/*$??'`
+ 
+  fi
+  if test "x${prefix} != "xNONE"
+  then
+    ac_dir="${prefix}"
+  pwd -W >/dev/null 2>&1 && ac_pwd_w="pwd -W" || ac_pwd_w=pwd
+  until ac_val=`exec 2>/dev/null; cd "$ac_dir" && $ac_pwd_w`
+  do
+    ac_dir=`(dirname "$ac_dir") 2>/dev/null ||
+ $as_expr X"$ac_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$ac_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$ac_dir" : 'X\(//\)$' \| \
+ 	 X"$ac_dir" : 'X\(/\)' \| \
+ 	 .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_dir" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+  done
+  ac_dir=`echo "$ac_dir" | sed 's?^[./]*??'`
+  ac_val=`echo "$ac_val" | sed 's?/*$??'`
+  prefix=`echo "${prefix}" | sed "s?^[./]*$ac_dir/*?$ac_val/?"'
+    s?/*$??'`
+ 
+  fi
+ 
  # Configure a native build subsystem, for native code tools
  # which will be required when cross-compiling.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/man/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** ChangeLog	10 Feb 2008 15:20:20 -0000	1.61
--- ChangeLog	23 Feb 2008 13:28:59 -0000	1.62
***************
*** 1,2 ****
--- 1,13 ----
+ 2008-02-23  Keith Marshall  <kei...@us...>
+ 
+ 	Canonicalise `prefix' and `exec_prefix' specifications for
+ 	building on Win32, using MSYS.
+ 
+ 	* aclocal.m4 (MSYS_AC_PREFIX_CANONICALISE): New helper macro...
+ 	(MSYS_AC_CANONICAL_PREFIX): New macro; uses it.
+ 
+ 	* configure.ac (MSYS_AC_CANONICAL_PREFIX): Invoke it.
+ 	* configure: Regenerated.
+ 
  2008-02-10  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/catgets
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18353

Modified Files:
	ChangeLog Makefile.in configure configure.ac 
Log Message:
MinGW-catgets version 1.0.1 released.
Source update only: correct `make install' defect.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/catgets/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.in	8 Jan 2008 19:51:53 -0000	1.7
--- Makefile.in	16 Feb 2008 12:57:18 -0000	1.8
***************
*** 10,14 ****
  #
  # Written by Keith Marshall  <kei...@us...>
! # Last modification: 01-Jan-2008
  #
  #
--- 10,14 ----
  #
  # Written by Keith Marshall  <kei...@us...>
! # Last modification: 15-Feb-2008
  #
  #
***************
*** 173,181 ****
  
  all-dll = @MAKE_DLL@
! all-targets = $(EXECDEV_SCRIPTS) @MAKE_TARGETS@
  
  all: $(all-targets)
  
! all-native: all-libs $(all-dll) all-bin all-doc
  all-cross-hosted: all-native cross-build
  
--- 173,181 ----
  
  all-dll = @MAKE_DLL@
! all-targets = @MAKE_TARGETS@
  
  all: $(all-targets)
  
! all-native: all-libs $(all-dll) all-bin all-scripts all-doc
  all-cross-hosted: all-native cross-build
  
***************
*** 183,186 ****
--- 183,187 ----
  all-dll: $(BUILD_DLLS)
  all-libs: $(BUILD_LIBS)
+ all-scripts: $(EXECDEV_SCRIPTS)
  all-doc: all-man all-info all-htmldoc all-pdf all-ps
  all-man: $(subst .man,.n,$(MANPAGE_SOURCES))
***************
*** 367,371 ****
  	if test -d cross-build; then cd cross-build; $(MAKE) $@; fi
  	rm -f nlspath.h $(LOCAL_HEADERS) $(REPLACEMENT_HEADERS)
! 	rm -f *.$(OBJEXT) *~ gencat$(EXEEXT) *.n *.a *.dll
  
  distclean: distclean-cross-hosted clean
--- 368,372 ----
  	if test -d cross-build; then cd cross-build; $(MAKE) $@; fi
  	rm -f nlspath.h $(LOCAL_HEADERS) $(REPLACEMENT_HEADERS)
! 	rm -f *.$(OBJEXT) *~ gencat$(EXEEXT) $(EXECDEV_SCRIPTS) *.n *.a *.dll
  
  distclean: distclean-cross-hosted clean

Index: configure.ac
===================================================================
RCS file: /cvsroot/mingw/catgets/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure.ac	12 Jan 2008 18:27:34 -0000	1.6
--- configure.ac	16 Feb 2008 12:57:19 -0000	1.7
***************
*** 21,25 ****
  # PATCHLEVEL is optional; comment/uncomment and adjust as required.
  #
! # MINGW_AC_DEFINE_PACKAGE_ID([PATCHLEVEL],    [0])
  #
  # DLL_VERSION is required; installed DLLs will be versioned, by
--- 21,25 ----
  # PATCHLEVEL is optional; comment/uncomment and adjust as required.
  #
!   MINGW_AC_DEFINE_PACKAGE_ID([PATCHLEVEL],    [1])
  #
  # DLL_VERSION is required; installed DLLs will be versioned, by

Index: configure
===================================================================
RCS file: /cvsroot/mingw/catgets/configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure	12 Jan 2008 18:27:34 -0000	1.6
--- configure	16 Feb 2008 12:57:18 -0000	1.7
***************
*** 1,5 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.59 for MinGW catgets 1.0.
  #
  # Report bugs to <https://sourceforge.net/tracker/?group_id=2435&atid=102435>.
--- 1,5 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.59 for MinGW catgets 1.0.1.
  #
  # Report bugs to <https://sourceforge.net/tracker/?group_id=2435&atid=102435>.
***************
*** 270,275 ****
  PACKAGE_NAME='MinGW catgets'
  PACKAGE_TARNAME='mingw-catgets'
! PACKAGE_VERSION='1.0'
! PACKAGE_STRING='MinGW catgets 1.0'
  PACKAGE_BUGREPORT='https://sourceforge.net/tracker/?group_id=2435&atid=102435'
  
--- 270,275 ----
  PACKAGE_NAME='MinGW catgets'
  PACKAGE_TARNAME='mingw-catgets'
! PACKAGE_VERSION='1.0.1'
! PACKAGE_STRING='MinGW catgets 1.0.1'
  PACKAGE_BUGREPORT='https://sourceforge.net/tracker/?group_id=2435&atid=102435'
  
***************
*** 780,784 ****
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
! \`configure' configures MinGW catgets 1.0 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
--- 780,784 ----
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
! \`configure' configures MinGW catgets 1.0.1 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
***************
*** 837,841 ****
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of MinGW catgets 1.0:";;
     esac
    cat <<\_ACEOF
--- 837,841 ----
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of MinGW catgets 1.0.1:";;
     esac
    cat <<\_ACEOF
***************
*** 959,963 ****
  if $ac_init_version; then
    cat <<\_ACEOF
! MinGW catgets configure 1.0
  generated by GNU Autoconf 2.59
  
--- 959,963 ----
  if $ac_init_version; then
    cat <<\_ACEOF
! MinGW catgets configure 1.0.1
  generated by GNU Autoconf 2.59
  
***************
*** 973,977 ****
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by MinGW catgets $as_me 1.0, which was
  generated by GNU Autoconf 2.59.  Invocation command line was
  
--- 973,977 ----
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by MinGW catgets $as_me 1.0.1, which was
  generated by GNU Autoconf 2.59.  Invocation command line was
  
***************
*** 5578,5582 ****
  cat >&5 <<_CSEOF
  
! This file was extended by MinGW catgets $as_me 1.0, which was
  generated by GNU Autoconf 2.59.  Invocation command line was
  
--- 5578,5582 ----
  cat >&5 <<_CSEOF
  
! This file was extended by MinGW catgets $as_me 1.0.1, which was
  generated by GNU Autoconf 2.59.  Invocation command line was
  
***************
*** 5638,5642 ****
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
! MinGW catgets config.status 1.0
  configured by $0, generated by GNU Autoconf 2.59,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
--- 5638,5642 ----
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
! MinGW catgets config.status 1.0.1
  configured by $0, generated by GNU Autoconf 2.59,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/catgets/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** ChangeLog	12 Jan 2008 18:27:33 -0000	1.32
--- ChangeLog	16 Feb 2008 12:57:18 -0000	1.33
***************
*** 1,2 ****
--- 1,18 ----
+ 2008-02-16  Keith Marshall  <kei...@us...>
+ 
+ 	MinGW-catgets version 1.0.1 released.
+ 	Source update only: correct `make install' defect.
+ 
+ 	* All files (RELEASE_1_0_1): CVS tag assigned.
+ 
+ 	* configure.ac (PATCHLEVEL): Reactivate and increment.
+ 	* configure: Regenerated.
+ 
+ 	* Makefile.in (EXECDEV_SCRIPTS): Don't explicitly include...
+ 	(all-targets): ...in this, but add to...
+ 	(all-scripts): ...this new target, included by...
+ 	(all-native): ...this.
+ 	(clean): Include EXECDEV_SCRIPTS.
+ 
  2008-01-12  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/man/man2html
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26948/man2html

Modified Files:
	Makefile.in 
Log Message:
Correct some cross-compilation anomalies.
Add catopen/catgets support for MinGW builds.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/man/man2html/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.in	1 Aug 2007 16:27:20 -0000	1.9
--- Makefile.in	10 Feb 2008 15:20:20 -0000	1.10
***************
*** 60,64 ****
  
  man2html$(EXEEXT): $(OBJECTS)
! 	$(CC) $(LDFLAGS) -o man2html $(OBJECTS)
  
  $(OBJECTS): defs.h
--- 60,64 ----
  
  man2html$(EXEEXT): $(OBJECTS)
! 	$(CC) $(LDFLAGS) -o $@ $(OBJECTS)
  
  $(OBJECTS): defs.h

Update of /cvsroot/mingw/man
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26948

Modified Files:
	ChangeLog aclocal.m4 configure configure.ac 
Log Message:
Correct some cross-compilation anomalies.
Add catopen/catgets support for MinGW builds.


Index: aclocal.m4
===================================================================
RCS file: /cvsroot/mingw/man/aclocal.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** aclocal.m4	20 Mar 2006 16:42:22 -0000	1.25
--- aclocal.m4	10 Feb 2008 15:20:20 -0000	1.26
***************
*** 588,596 ****
  # -----------------
  # Confirm that all functions needed to support NLS are available.
  #
  AC_DEFUN([MAN_NLS_FUNCTIONS],
! [AC_CHECK_FUNCS([nl_langinfo setlocale])
   [man_nls_funcs=$ac_cv_func_nl_langinfo]
!  [test x$ac_cv_func_setlocale = xno && man_nls_funcs=no]dnl
  ])
  
--- 588,602 ----
  # -----------------
  # Confirm that all functions needed to support NLS are available.
+ # (Note that on Win32 -- and possibly on other platforms too -- we need
+ #  to link with an external library for `catopen' and `catgets', so we
+ #  use AC_SEARCH_LIBS to resolve that dependency first).
  #
  AC_DEFUN([MAN_NLS_FUNCTIONS],
! [AC_SEARCH_LIBS([catopen], [catgets])
!  AC_CHECK_FUNCS([nl_langinfo setlocale catopen catgets])
   [man_nls_funcs=$ac_cv_func_nl_langinfo]
!  m4_foreach([func], [setlocale, catopen, catgets],
!  [test [x$ac_cv_func_]func[ = xno && man_nls_funcs=no
!  ]])dnl
  ])
  
***************
*** 628,632 ****
       MAN_AC_PATH_COMMAND_OVERRIDE_CACHE([gencat], [$man_gencat_preferred])
     else
!      MAN_AC_PATH_COMMAND([gencat], [${ac_tool_prefix}gencat])
     fi
     if test x"$gencat" = x
--- 634,638 ----
       MAN_AC_PATH_COMMAND_OVERRIDE_CACHE([gencat], [$man_gencat_preferred])
     else
!      AC_PATH_TOOL([gencat], [gencat], [no])
     fi
     if test x"$gencat" = x

Index: configure.ac
===================================================================
RCS file: /cvsroot/mingw/man/configure.ac,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** configure.ac	1 Aug 2007 16:26:44 -0000	1.27
--- configure.ac	10 Feb 2008 15:20:20 -0000	1.28
***************
*** 46,49 ****
--- 46,50 ----
    MAN_PROG_AWK
    AC_PROG_CC
+   AC_CHECK_TOOL([AR], [ar], [ar])
    AC_PROG_INSTALL
    AC_PROG_LN_S

Index: configure
===================================================================
RCS file: /cvsroot/mingw/man/configure,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** configure	1 Aug 2007 16:26:43 -0000	1.33
--- configure	10 Feb 2008 15:20:20 -0000	1.34
***************
*** 310,314 ****
  #endif"
  
! 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 CC CFLAGS LDFLAGS CPPFLAGS BUILD_CC BUILD_CFLAGS BUILD_LDFLAGS BUILD_CPPFLAGS man_install_flags awk ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE CWARNNP CWARN WIN32LIBS CPP EGREP ALLOCA LIBOBJS manpathoption FHS FSSTND man_config_file sections man1ext man5ext man8ext path_separator_char NULLDEV path__usr_man path__usr_share_man path__usr_local_man path__usr_local_share_man path__usr_X11R6_man path__opt___STAR___man path__usr_lib___STAR___man path__usr_share___STAR___man path__usr_kerberos_man map_to__usr_man path__bin path__sbin path__usr_bin path__usr_sbin map_to__usr_local_man path__usr_local_bin path__usr_local_sbin map_to__usr_X11R6_man path__usr_X11R6_bin path__usr_bin_X11 path__usr_bin_mh man_tools_required gencat man_gencat_program languages make_install_messages make_messages locale locale_prefix locale_path pager browser htmlpager man_grepsilent cat troff nroff jnroff col pcol eqn neqn jneqn tbl vgrind refer grap pic cmp compress compress_ext gunzip bzip2 pcat zcat fcat unyabba decompress LTLIBOBJS'
  ac_subst_files=''
  
--- 310,314 ----
  #endif"
  
! 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 CC CFLAGS LDFLAGS CPPFLAGS BUILD_CC BUILD_CFLAGS BUILD_LDFLAGS BUILD_CPPFLAGS man_install_flags awk ac_ct_CC EXEEXT OBJEXT AR ac_ct_AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE CWARNNP CWARN WIN32LIBS CPP EGREP ALLOCA LIBOBJS manpathoption FHS FSSTND man_config_file sections man1ext man5ext man8ext path_separator_char NULLDEV path__usr_man path__usr_share_man path__usr_local_man path__usr_local_share_man path__usr_X11R6_man path__opt___STAR___man path__usr_lib___STAR___man path__usr_share___STAR___man path__usr_kerberos_man map_to__usr_man path__bin path__sbin path__usr_bin path__usr_sbin map_to__usr_local_man path__usr_local_bin path__usr_local_sbin map_to__usr_X11R6_man path__usr_X11R6_bin path__usr_bin_X11 path__usr_bin_mh man_tools_required gencat ac_pt_gencat man_gencat_program languages make_install_messages make_messages locale locale_prefix locale_path pager browser htmlpager man_grepsilent cat troff nroff jnroff col pcol eqn neqn jneqn tbl vgrind refer grap pic cmp compress compress_ext gunzip bzip2 pcat zcat fcat unyabba decompress LTLIBOBJS'
  ac_subst_files=''
  
***************
*** 2508,2511 ****
--- 2508,2591 ----
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$AR"; then
+   ac_cv_prog_AR="$AR" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_AR="${ac_tool_prefix}ar"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
+ 
+ fi
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+   echo "$as_me:$LINENO: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ fi
+ if test -z "$ac_cv_prog_AR"; then
+   ac_ct_AR=$AR
+   # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$ac_ct_AR"; then
+   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_AR="ar"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
+ 
+   test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar"
+ fi
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+   echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   AR=$ac_ct_AR
+ else
+   AR="$ac_cv_prog_AR"
+ fi
+ 
    ac_aux_dir=
  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
***************
*** 8923,8929 ****
   test x$ac_cv_header_locale_h = xno && man_nls_headers=no
   test x$ac_cv_header_nl_types_h = xno && man_nls_headers=no
  
  
! for ac_func in nl_langinfo setlocale
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--- 9003,9137 ----
   test x$ac_cv_header_locale_h = xno && man_nls_headers=no
   test x$ac_cv_header_nl_types_h = xno && man_nls_headers=no
+ echo "$as_me:$LINENO: checking for library containing catopen" >&5
+ echo $ECHO_N "checking for library containing catopen... $ECHO_C" >&6
+ if test "${ac_cv_search_catopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+ ac_cv_search_catopen=no
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
  
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char catopen ();
+ int
+ main ()
+ {
+ catopen ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+ 	 { ac_try='test -z "$ac_c_werror_flag"
+ 			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_search_catopen="none required"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
! fi
! rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
! if test "$ac_cv_search_catopen" = no; then
!   for ac_lib in catgets; do
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!     cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! 
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char catopen ();
! int
! main ()
! {
! catopen ();
!   ;
!   return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
!   (eval $ac_link) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; } &&
! 	 { ac_try='test -s conftest$ac_exeext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_cv_search_catopen="-l$ac_lib"
! break
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! fi
! rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
! fi
! LIBS=$ac_func_search_save_LIBS
! fi
! echo "$as_me:$LINENO: result: $ac_cv_search_catopen" >&5
! echo "${ECHO_T}$ac_cv_search_catopen" >&6
! if test "$ac_cv_search_catopen" != no; then
!   test "$ac_cv_search_catopen" = "none required" || LIBS="$ac_cv_search_catopen $LIBS"
! 
! fi
! 
! 
! 
! 
! 
! for ac_func in nl_langinfo setlocale catopen catgets
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
***************
*** 9028,9031 ****
--- 9236,9242 ----
   man_nls_funcs=$ac_cv_func_nl_langinfo
   test x$ac_cv_func_setlocale = xno && man_nls_funcs=no
+  test x$ac_cv_func_catopen = xno && man_nls_funcs=no
+  test x$ac_cv_func_catgets = xno && man_nls_funcs=no
+ 
  man_tools_required=all-default
  
***************
*** 9101,9111 ****
  echo "${ECHO_T}$ac_word" >&6
     else
!      # Extract the first word of "${ac_tool_prefix}gencat", so it can be a program name with args.
!   set dummy ${ac_tool_prefix}gencat; ac_word=$2
!   echo "$as_me:$LINENO: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
!  if test "${ac_cv_path_gencat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
--- 9312,9328 ----
  echo "${ECHO_T}$ac_word" >&6
     else
!      if test -n "$ac_tool_prefix"; then
!   # Extract the first word of "${ac_tool_prefix}gencat", so it can be a program name with args.
! set dummy ${ac_tool_prefix}gencat; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
! if test "${ac_cv_path_gencat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
+   case $gencat in
+   [\\/]* | ?:[\\/]*)
+   ac_cv_path_gencat="$gencat" # Let the user override the test with a path.
+   ;;
+   *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
***************
*** 9114,9142 ****
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"
!   then
!     ac_dir=""$as_dir/$ac_word$ac_exec_ext""
!  pwd -W >/dev/null 2>&1 && ac_pwd_w="pwd -W" || ac_pwd_w=pwd
!  until ac_val=`exec 2>/dev/null; cd "$ac_dir" && $ac_pwd_w`
!  do
!    ac_dir=`(dirname "$ac_dir") 2>/dev/null ||
! $as_expr X"$ac_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
! 	 X"$ac_dir" : 'X\(//\)[^/]' \| \
! 	 X"$ac_dir" : 'X\(//\)$' \| \
! 	 X"$ac_dir" : 'X\(/\)' \| \
! 	 .     : '\(.\)' 2>/dev/null ||
! echo X"$ac_dir" |
!     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
!   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
!   	  /^X\(\/\/\)$/{ s//\1/; q; }
!   	  /^X\(\/\).*/{ s//\1/; q; }
!   	  s/.*/./; q'`
!  done
!  ac_dir=`echo "$ac_dir" | sed 's?^[./]*??'`
!  ac_val=`echo "$ac_val" | sed 's?/*$??'`
!  ac_cv_path_gencat=`echo ""$as_dir/$ac_word$ac_exec_ext"" | sed "s?^[./]*$ac_dir/*?$ac_val/?"'
!    s?/*$??'`
  
!     echo "$as_me:$LINENO: found $ac_cv_path_gencat" >&5
      break 2
    fi
--- 9331,9379 ----
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
!     ac_cv_path_gencat="$as_dir/$ac_word$ac_exec_ext"
!     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
!     break 2
!   fi
! done
! done
  
!   ;;
! esac
! fi
! gencat=$ac_cv_path_gencat
! 
! if test -n "$gencat"; then
!   echo "$as_me:$LINENO: result: $gencat" >&5
! echo "${ECHO_T}$gencat" >&6
! else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
! fi
! 
! fi
! if test -z "$ac_cv_path_gencat"; then
!   ac_pt_gencat=$gencat
!   # Extract the first word of "gencat", so it can be a program name with args.
! set dummy gencat; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
! if test "${ac_cv_path_ac_pt_gencat+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   case $ac_pt_gencat in
!   [\\/]* | ?:[\\/]*)
!   ac_cv_path_ac_pt_gencat="$ac_pt_gencat" # Let the user override the test with a path.
!   ;;
!   *)
!   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
! for as_dir in $PATH
! do
!   IFS=$as_save_IFS
!   test -z "$as_dir" && as_dir=.
!   for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
!     ac_cv_path_ac_pt_gencat="$as_dir/$ac_word$ac_exec_ext"
!     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
***************
*** 9144,9159 ****
  done
  
! shift 2
! case ${#} in
!   0) ;;
!   *) test -n "$ac_cv_path_gencat" && ac_cv_path_gencat="$ac_cv_path_gencat ${@}" ;;
  esac
  fi
  
!  gencat=$ac_cv_path_gencat
  
-  test -n "$gencat" && ac_word="$gencat" || ac_word=no
-  echo "$as_me:$LINENO: result: $ac_word" >&5
- echo "${ECHO_T}$ac_word" >&6
     fi
     if test x"$gencat" = x
--- 9381,9403 ----
  done
  
!   test -z "$ac_cv_path_ac_pt_gencat" && ac_cv_path_ac_pt_gencat="no"
!   ;;
  esac
  fi
+ ac_pt_gencat=$ac_cv_path_ac_pt_gencat
  
! if test -n "$ac_pt_gencat"; then
!   echo "$as_me:$LINENO: result: $ac_pt_gencat" >&5
! echo "${ECHO_T}$ac_pt_gencat" >&6
! else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
! fi
! 
!   gencat=$ac_pt_gencat
! else
!   gencat="$ac_cv_path_gencat"
! fi
  
     fi
     if test x"$gencat" = x
***************
*** 13586,13589 ****
--- 13830,13835 ----
  s,@EXEEXT@,$EXEEXT,;t t
  s,@OBJEXT@,$OBJEXT,;t t
+ s,@AR@,$AR,;t t
+ s,@ac_ct_AR@,$ac_ct_AR,;t t
  s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
  s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
***************
*** 13631,13634 ****
--- 13877,13881 ----
  s,@man_tools_required@,$man_tools_required,;t t
  s,@gencat@,$gencat,;t t
+ s,@ac_pt_gencat@,$ac_pt_gencat,;t t
  s,@man_gencat_program@,$man_gencat_program,;t t
  s,@languages@,$languages,;t t

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/man/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** ChangeLog	4 Dec 2007 23:19:28 -0000	1.60
--- ChangeLog	10 Feb 2008 15:20:20 -0000	1.61
***************
*** 1,2 ****
--- 1,24 ----
+ 2008-02-10  Keith Marshall  <kei...@us...>
+ 
+ 	Correct some cross-compilation anomalies.
+ 	Add catopen/catgets support for MinGW builds.
+ 
+ 	* configure.ac (AR): Use AC_PATH_TOOL to select host specific tool.
+ 
+ 	* aclocal.m4 (catopen, catgets): Use AC_SEARCH_LIBS to locate them.
+ 	(MAN_PROG_GENCAT): Don't canonicalise the `gencat' path name for the
+ 	host file system; use AC_PATH_TOOL, to select a host specific variant
+ 	to run on the build system.
+ 
+ 	* configure: Regenerated.
+ 
+ 	* src/Makefile.in (LIBS): Define; use AC_SUBST value.
+ 	(man): Add missing $(EXEEXT); don't depend on $(LIBS); create as $@.
+ 	(all, CLEANFILES): Correct `man' reference; use `man$(EXEEXT)'.
+ 
+ 	* src/win32/Makefile.in (AR): Define; use AC_SUBST value.
+ 
+ 	* man2html/Makefile.in (man2html): Create as $@.
+ 
  2007-08-01  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/man/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26948/src

Modified Files:
	Makefile.in 
Log Message:
Correct some cross-compilation anomalies.
Add catopen/catgets support for MinGW builds.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/man/src/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile.in	1 Aug 2007 16:27:54 -0000	1.19
--- Makefile.in	10 Feb 2008 15:20:20 -0000	1.20
***************
*** 65,72 ****
  WIN32LIBS = @WIN32LIBS@
  
  .c.$(OBJEXT):
  	$(CC) -c $(CWARN) $(CFLAGS) $(DEFS) $<
  
! all: man man.conf apropos whatis makewhatis
  
  MANOBJS = \
--- 65,74 ----
  WIN32LIBS = @WIN32LIBS@
  
+ LIBS = @LIBS@
+ 
  .c.$(OBJEXT):
  	$(CC) -c $(CWARN) $(CFLAGS) $(DEFS) $<
  
! all: man$(EXEEXT) man.conf apropos whatis makewhatis
  
  MANOBJS = \
***************
*** 96,101 ****
  	echo timestamp > $@
  
! man: $(MANOBJS) $(LIBS) $(WIN32LIBS)
! 	$(CC) $(LDFLAGS) -o man $(MANOBJS) $(WIN32LIBS) $(LIBS)
  
  man.$(OBJEXT): man.c
--- 98,103 ----
  	echo timestamp > $@
  
! man$(EXEEXT): $(MANOBJS) $(WIN32LIBS)
! 	$(CC) $(LDFLAGS) -o $@ $(MANOBJS) $(WIN32LIBS) $(LIBS)
  
  man.$(OBJEXT): man.c
***************
*** 201,205 ****
  	$(INSTALL) -m 644 man.conf ${manconffile}
  
! CLEANFILES = *.$(OBJEXT) *~ core man apropos whatis makewhatis *.stackdump
  DISTCLEANFILES = Makefile stamp.h paths.h version.h man.conf gripedefs.h msg.c mess.*.cat
  
--- 203,207 ----
  	$(INSTALL) -m 644 man.conf ${manconffile}
  
! CLEANFILES = *.$(OBJEXT) *~ core man$(EXEEXT) apropos whatis makewhatis *.stackdump
  DISTCLEANFILES = Makefile stamp.h paths.h version.h man.conf gripedefs.h msg.c mess.*.cat
  

Update of /cvsroot/mingw/man/src/win32
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26948/src/win32

Modified Files:
	Makefile.in 
Log Message:
Correct some cross-compilation anomalies.
Add catopen/catgets support for MinGW builds.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/man/src/win32/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.in	1 Feb 2006 14:18:39 -0000	1.4
--- Makefile.in	10 Feb 2008 15:20:20 -0000	1.5
***************
*** 27,30 ****
--- 27,31 ----
  abs_top_builddir = @abs_top_builddir@
  
+ AR  = @AR@
  GCC = @CC@ $(CPPFLAGS) $(CWARN) $(CFLAGS) $(DEFS) $(INCLUDES)
  

Update of /cvsroot/mingw/msys/dvlpr
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20262

Modified Files:
	ChangeLog 
Log Message:
	* bin/which: Set IFS to handle spaces in path names.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/msys/dvlpr/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** ChangeLog	29 Jul 2007 21:02:37 -0000	1.53
--- ChangeLog	8 Feb 2008 17:58:04 -0000	1.54
***************
*** 1,2 ****
--- 1,6 ----
+ 2008.02.08  Keith Marshall  <kei...@us...>
+ 
+ 	* bin/which: Set IFS to handle spaces in path names.
+ 
  2007.07.29  Cesar Strauss  <ces...@gm...>
  

Update of /cvsroot/mingw/msys/dvlpr/bin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20262/bin

Modified Files:
	which 
Log Message:
	* bin/which: Set IFS to handle spaces in path names.


Index: which
===================================================================
RCS file: /cvsroot/mingw/msys/dvlpr/bin/which,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** which	11 Feb 2006 10:43:06 -0000	1.2
--- which	8 Feb 2008 17:58:04 -0000	1.3
***************
*** 2,6 ****
  # Original copyright (C) 2002, Earnie Boyd
  #   mailto:ea...@us...
! # This implementation copyright (C) 2006, Keith Marshall
  #   mailto:kei...@us...
  #
--- 2,6 ----
  # Original copyright (C) 2002, Earnie Boyd
  #   mailto:ea...@us...
! # This implementation copyright (C) 2006, 2008, Keith Marshall
  #   mailto:kei...@us...
  #
***************
*** 19,22 ****
--- 19,27 ----
  fi
  
+ # To accomodate Woe32's typically asinine $PATH, which frequently
+ # includes directory names with embedded spaces, we need to set up
+ # $IFS to consider only a newline as a field separator.
+ IFS=$'\n'
+ 
  break=break
  for PROG

Update of /cvsroot/mingw/MinGW/inifiles
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12338/inifiles

Modified Files:
	mingw.ini 
Log Message:
2008.02.04  Chris Sutcliffe  <ir0...@us...>

        * inifiles/mingw.ini: Update for latest version of mingw-runtime and w32api.

Index: mingw.ini
===================================================================
RCS file: /cvsroot/mingw/MinGW/inifiles/mingw.ini,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** mingw.ini	20 Oct 2007 20:10:04 -0000	1.16
--- mingw.ini	5 Feb 2008 00:46:22 -0000	1.17
***************
*** 6,11 ****
  
  [current]
! runtime=mingw-runtime-3.13.tar.gz|5420
! w32api=w32api-3.10.tar.gz|14490
  binutils=binutils-2.17.50-20060824-1.tar.gz|21940
  core=gcc-core-3.4.5-20060117-1.tar.gz|8644
--- 6,11 ----
  
  [current]
! runtime=mingw-runtime-3.14.tar.gz|6500
! w32api=w32api-3.11.tar.gz|14500
  binutils=binutils-2.17.50-20060824-1.tar.gz|21940
  core=gcc-core-3.4.5-20060117-1.tar.gz|8644
***************
*** 18,23 ****
  
  [previous]
! runtime=mingw-runtime-3.12.tar.gz|5270
! w32api=w32api-3.9.tar.gz|14480
  binutils=binutils-2.16.91-20060119-1.tar.gz|15850
  core=gcc-core-3.4.2-20040916-1.tar.gz|8627
--- 18,23 ----
  
  [previous]
! runtime=mingw-runtime-3.13.tar.gz|5420
! w32api=w32api-3.10.tar.gz|14490
  binutils=binutils-2.16.91-20060119-1.tar.gz|15850
  core=gcc-core-3.4.2-20040916-1.tar.gz|8627

Update of /cvsroot/mingw/MinGW
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12338

Modified Files:
	ChangeLog 
Log Message:
2008.02.04  Chris Sutcliffe  <ir0...@us...>

        * inifiles/mingw.ini: Update for latest version of mingw-runtime and w32api.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/MinGW/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ChangeLog	4 Aug 2007 00:03:58 -0000	1.12
--- ChangeLog	5 Feb 2008 00:46:22 -0000	1.13
***************
*** 1,2 ****
--- 1,6 ----
+ 2008.02.04  Chris Sutcliffe  <ir0...@us...>
+ 
+ 	* inifiles/mingw.ini: Update for latest version of mingw-runtime and w32api.
+ 
  2007.08.03  Chris Sutcliffe  <ir0...@us...>