From: Akim Demaille Date: Tue, 7 Mar 2000 14:24:49 +0000 (+0000) Subject: Support absolute DOS-style paths. X-Git-Tag: autoconf-2.50~1090 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a9e3dacd20f715ac8fb2662440ea485ee169506;p=thirdparty%2Fautoconf.git Support absolute DOS-style paths. Any character before the colon is accepted because network drives can be assigned characters outside the [a-zA-Z] range. DOS-style relative paths (?:foo/bar) are also considered absolute for Autoconf's purposes since the path '../?:foo/bar' is invalid. * acgeneral.m4 (AC_OUTPUT_FILES): Treat DOS-style paths (?:*') as absolute. (AC_OUTPUT_SUBDIRS): Likewise. (AC_PATH_PROG): Make pattern for matching DOS-style paths the same as that used in AC_OUTPUT_FILES and AC_OUTPUT_SUBDIRS. --- diff --git a/ChangeLog b/ChangeLog index bd5356874..dd690a142 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2000-03-07 Mark Elbrecht + + Support absolute DOS-style paths. + + Any character before the colon is accepted because network drives + can be assigned characters outside the [a-zA-Z] range. DOS-style + relative paths (?:foo/bar) are also considered absolute for + Autoconf's purposes since the path '../?:foo/bar' is invalid. + + * acgeneral.m4 (AC_OUTPUT_FILES): Treat DOS-style paths (?:*') as + absolute. + (AC_OUTPUT_SUBDIRS): Likewise. + (AC_PATH_PROG): Make pattern for matching DOS-style paths the same + as that used in AC_OUTPUT_FILES and AC_OUTPUT_SUBDIRS. + 2000-03-06 Akim Demaille * tests/atspecific.m4 (m4_match): Remove, no longer used. diff --git a/acgeneral.m4 b/acgeneral.m4 index cc860c7ff..5061a621f 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -2140,8 +2140,7 @@ set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) AC_CACHE_VAL(ac_cv_path_$1, [case "[$]$1" in -dnl Second pattern matches DOS absolute paths. - /* | ?:/*) + [/\\]* | ?:[/\\]*) ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ;; *) @@ -3788,8 +3787,10 @@ dnl to be created too. case "$ac_given_srcdir" in .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + else top_srcdir=`echo $ac_dots | sed 's%/$%%'`; fi ;; + [/\\]* | ?:[/\\]* ) + srcdir="$ac_given_srcdir$ac_dir_suffix"; + top_srcdir=$ac_given_srcdir ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; @@ -3797,7 +3798,7 @@ dnl to be created too. ifdef([AC_PROVIDE_AC_PROG_INSTALL], [[ case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/\\$]* | ?:[/\\]* ) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac ]])dnl @@ -4125,7 +4126,7 @@ dnl to be created too. fi case "$srcdir" in - [[/$]]*) ac_rel_source="$srcdir/$ac_source" ;; + [[/\\$]]* | ?:[/\\]* ) ac_rel_source="$srcdir/$ac_source" ;; *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;; esac @@ -4244,7 +4245,7 @@ dnl to be created too. case "$srcdir" in .) # No --srcdir option. We are building in place. ac_sub_srcdir=$srcdir ;; - /*) # Absolute path. + [/\\]* | ?:[/\\] ) # Absolute path. ac_sub_srcdir=$srcdir/$ac_config_dir ;; *) # Relative path. ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; @@ -4265,13 +4266,13 @@ dnl to be created too. # Make the cache file name correct relative to the subdirectory. case "$cache_file" in - /*) ac_sub_cache_file=$cache_file ;; + [/\\]* | ?:[/\\]* ) ac_sub_cache_file=$cache_file ;; *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac ifdef([AC_PROVIDE_AC_PROG_INSTALL], [[ case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/\\$]* | ?:[/\\]*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac ]])dnl diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index cc860c7ff..5061a621f 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -2140,8 +2140,7 @@ set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) AC_CACHE_VAL(ac_cv_path_$1, [case "[$]$1" in -dnl Second pattern matches DOS absolute paths. - /* | ?:/*) + [/\\]* | ?:[/\\]*) ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ;; *) @@ -3788,8 +3787,10 @@ dnl to be created too. case "$ac_given_srcdir" in .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + else top_srcdir=`echo $ac_dots | sed 's%/$%%'`; fi ;; + [/\\]* | ?:[/\\]* ) + srcdir="$ac_given_srcdir$ac_dir_suffix"; + top_srcdir=$ac_given_srcdir ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; @@ -3797,7 +3798,7 @@ dnl to be created too. ifdef([AC_PROVIDE_AC_PROG_INSTALL], [[ case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/\\$]* | ?:[/\\]* ) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac ]])dnl @@ -4125,7 +4126,7 @@ dnl to be created too. fi case "$srcdir" in - [[/$]]*) ac_rel_source="$srcdir/$ac_source" ;; + [[/\\$]]* | ?:[/\\]* ) ac_rel_source="$srcdir/$ac_source" ;; *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;; esac @@ -4244,7 +4245,7 @@ dnl to be created too. case "$srcdir" in .) # No --srcdir option. We are building in place. ac_sub_srcdir=$srcdir ;; - /*) # Absolute path. + [/\\]* | ?:[/\\] ) # Absolute path. ac_sub_srcdir=$srcdir/$ac_config_dir ;; *) # Relative path. ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; @@ -4265,13 +4266,13 @@ dnl to be created too. # Make the cache file name correct relative to the subdirectory. case "$cache_file" in - /*) ac_sub_cache_file=$cache_file ;; + [/\\]* | ?:[/\\]* ) ac_sub_cache_file=$cache_file ;; *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac ifdef([AC_PROVIDE_AC_PROG_INSTALL], [[ case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/\\$]* | ?:[/\\]*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac ]])dnl