Menu
▾
▴
[MinGW-cvs] man ChangeLog, 1.61, 1.62 aclocal.m4, 1.26, 1.27 configure, 1.34, 1.35 configure.ac, 1.28, 1.29
|
From: Keith M. <kei...@us...> - 2008-02-23 13:29:08
|
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...> |