Commit 07109110 by Laurynas Biveinis Committed by DJ Delorie

* configure: handle DOS-style absolute paths.

From-SVN: r38621
parent 1da5b8fc
2001-01-02 Laurynas Biveinis <lauras@softhome.net> 2001-01-02 Laurynas Biveinis <lauras@softhome.net>
* configure: handle DOS-style absolute paths.
2001-01-02 Laurynas Biveinis <lauras@softhome.net>
* configure.in: remove supported directories from $noconfigdirs for DJGPP. * configure.in: remove supported directories from $noconfigdirs for DJGPP.
2000-12-30 Marek Michalkiewicz <marekm@linux.org.pl> 2000-12-30 Marek Michalkiewicz <marekm@linux.org.pl>
......
...@@ -89,7 +89,7 @@ subdirs= ...@@ -89,7 +89,7 @@ subdirs=
target_alias=NOTARGET target_alias=NOTARGET
target_makefile_frag= target_makefile_frag=
undefs=NOUNDEFS undefs=NOUNDEFS
version="$Revision: 1.31 $" version="$Revision: 1.32 $"
x11=default x11=default
bindir='${exec_prefix}/bin' bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin' sbindir='${exec_prefix}/sbin'
...@@ -155,7 +155,7 @@ progname=$0 ...@@ -155,7 +155,7 @@ progname=$0
if [ -n "$PWD" ]; then PWD=`pwd`; fi if [ -n "$PWD" ]; then PWD=`pwd`; fi
case "${progname}" in case "${progname}" in
/*) ;; /* | [A-Za-z]:[\\/]* ) ;;
*/*) ;; */*) ;;
*) *)
PATH=$PATH:${PWD=`pwd`} ; export PATH PATH=$PATH:${PWD=`pwd`} ; export PATH
...@@ -1096,7 +1096,7 @@ for subdir in . ${subdirs} ; do ...@@ -1096,7 +1096,7 @@ for subdir in . ${subdirs} ; do
case "${srcdir}" in case "${srcdir}" in
".") # no -srcdir option. We're building in place. ".") # no -srcdir option. We're building in place.
makesrcdir=. ;; makesrcdir=. ;;
/*) # absolute path /* | [A-Za-z]:[\\/]* ) # absolute path
makesrcdir=`echo ${srcdir}/${subdir} | sed -e 's|/\.$||'` makesrcdir=`echo ${srcdir}/${subdir} | sed -e 's|/\.$||'`
;; ;;
*) # otherwise relative *) # otherwise relative
...@@ -1322,19 +1322,19 @@ EOF ...@@ -1322,19 +1322,19 @@ EOF
case "${package_makefile_frag}" in case "${package_makefile_frag}" in
"") ;; "") ;;
/*) echo package_makefile_frag = ${package_makefile_frag} >>${Makefile} ;; /* | [A-Za-z]:[\\/]* ) echo package_makefile_frag = ${package_makefile_frag} >>${Makefile} ;;
*) echo package_makefile_frag = ${invsubdir}${package_makefile_frag} >>${Makefile} ;; *) echo package_makefile_frag = ${invsubdir}${package_makefile_frag} >>${Makefile} ;;
esac esac
case "${target_makefile_frag}" in case "${target_makefile_frag}" in
"") ;; "") ;;
/*) echo target_makefile_frag = ${target_makefile_frag} >>${Makefile} ;; /* | [A-Za-z]:[\\/]* ) echo target_makefile_frag = ${target_makefile_frag} >>${Makefile} ;;
*) echo target_makefile_frag = ${invsubdir}${target_makefile_frag} >>${Makefile} ;; *) echo target_makefile_frag = ${invsubdir}${target_makefile_frag} >>${Makefile} ;;
esac esac
case "${host_makefile_frag}" in case "${host_makefile_frag}" in
"") ;; "") ;;
/*) echo host_makefile_frag = ${host_makefile_frag} >>${Makefile} ;; /* | [A-Za-z]:[\\/]* ) echo host_makefile_frag = ${host_makefile_frag} >>${Makefile} ;;
*) echo host_makefile_frag = ${invsubdir}${host_makefile_frag} >>${Makefile} ;; *) echo host_makefile_frag = ${invsubdir}${host_makefile_frag} >>${Makefile} ;;
esac esac
...@@ -1545,11 +1545,7 @@ if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then ...@@ -1545,11 +1545,7 @@ if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then
### figure out what to do with srcdir ### figure out what to do with srcdir
case "${srcdir}" in case "${srcdir}" in
".") newsrcdir=${srcdir} ;; # no -srcdir option. We're building in place. ".") newsrcdir=${srcdir} ;; # no -srcdir option. We're building in place.
/*) # absolute path /* | [A-Za-z]:[\\/]* ) # absolute path
newsrcdir=${srcdir}/${cfg_dir}
srcdiroption="--srcdir=${newsrcdir}"
;;
?:*) # absolute path on win32
newsrcdir=${srcdir}/${cfg_dir} newsrcdir=${srcdir}/${cfg_dir}
srcdiroption="--srcdir=${newsrcdir}" srcdiroption="--srcdir=${newsrcdir}"
;; ;;
...@@ -1563,10 +1559,7 @@ if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then ...@@ -1563,10 +1559,7 @@ if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then
case "${cache_file}" in case "${cache_file}" in
"") # empty "") # empty
;; ;;
/*) # absolute path /* | [A-Za-z]:[\\/]* ) # absolute path
cache_file_option="--cache-file=${cache_file}"
;;
?:*) # absolute path on win32
cache_file_option="--cache-file=${cache_file}" cache_file_option="--cache-file=${cache_file}"
;; ;;
*) # relative path *) # relative path
...@@ -1579,9 +1572,8 @@ if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then ...@@ -1579,9 +1572,8 @@ if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then
recprog=${newsrcdir}/configure recprog=${newsrcdir}/configure
elif [ -f ${newsrcdir}/configure.in ] ; then elif [ -f ${newsrcdir}/configure.in ] ; then
case "${progname}" in case "${progname}" in
/*) recprog=${progname} ;; /* | [A-Za-z]:[\\/]* ) recprog=${progname} ;;
?:*) recprog=${progname} ;; *) recprog=../${progname} ;;
*) recprog=../${progname} ;;
esac esac
else else
eval echo No configuration information in ${cfg_dir} ${redirect} eval echo No configuration information in ${cfg_dir} ${redirect}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment