Changeset 3159 for trunk/essentials/sys-devel/autoconf-2.13/acgeneral.m4

Timestamp:

Apr 22, 2007, 2:29:09 AM (18 years ago)

Author:

bird

Message:

Applied OS/2 patches.

File:

• trunk/essentials/sys-devel/autoconf-2.13/acgeneral.m4 (modified) (21 diffs)

trunk/essentials/sys-devel/autoconf-2.13/acgeneral.m4

@@ -588 +588 @@
 AC_INIT_PARSE_ARGS
 AC_INIT_PREPARE($1)dnl
+AC_PATHIFS
+AC_DIVERT_POP()dnl to NORMAL
+AC_DIVERT_PUSH(AC_DIVERSION_NORMAL_4)dnl
+AC_EXEEXT
 AC_DIVERT_POP()dnl to NORMAL
 ])
@@ -1322 +1326 @@
   ac_cv_prog_$1="[$]$1" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS"
 ifelse([$6], , , [  ac_prog_rejected=no
 ])dnl
@@ -1328 +1332 @@
 dnl POSIX.2 word splitting is done only on the output of word expansions,
 dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$5], , $PATH, [$5])"
+  ac_dummy="ifelse([$5], , $PATH, AC_FORMAT_PATH([$5]))"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
+    if test -f $ac_dir/$ac_word -o \
+            -f $ac_dir/$ac_word$ac_exeext ; then
 ifelse([$6], , , dnl
-[      if test "[$ac_dir/$ac_word]" = "$6"; then
+[      if test "[$ac_dir/$ac_word]" = "$6" -o \
+               "[$ac_dir/$ac_word$ac_exeext]" = "$6" ; then
         ac_prog_rejected=yes
         continue
@@ -1359 +1365 @@
     # Default is a loser.
     AC_MSG_ERROR([$1=$6 unacceptable, but no other $4 found in dnl
-ifelse([$5], , [\$]PATH, [$5])])
+ifelse([$5], , [\$]PATH, AC_FORMAT_PATH([$5]))])
 ])dnl
   fi
@@ -1385 +1391 @@
 AC_CACHE_VAL(ac_cv_path_$1,
 [case "[$]$1" in
-  /*)
+changequote(, )dnl
+  [/\\]* | [a-zA-Z]:*)
+changequote([, ])dnl
   ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
   ;;
@@ -1392 +1400 @@
   ;;
   *)
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS"
 dnl $ac_dummy forces splitting on constant user-supplied paths.
 dnl POSIX.2 word splitting is done only on the output of word expansions,
 dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$4], , $PATH, [$4])"
+  ac_dummy="ifelse([$4], , $PATH, AC_FORMAT_PATH([$4]))"
   for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_$1="$ac_dir/$ac_word"
+      break
+    fi
+    if test -f $ac_dir/$ac_word$ac_exeext; then
+      ac_cv_path_$1="$ac_dir/$ac_word$ac_exeext"
       break
     fi
@@ -1660 +1672 @@
 [AC_REQUIRE_CPP()dnl
 cat > conftest.$ac_ext <<EOF
+#include <sys/types.h>
 [#]line __oline__ "configure"
 #include "confdefs.h"
@@ -2096 +2109 @@
 # Run this file to recreate the current configuration.
 # This directory was configured as follows,
+EOF
+echo ': ${CONFIG_SHELL='"${CONFIG_SHELL-sh.exe}"'}' >> $CONFIG_STATUS
+cat >> $CONFIG_STATUS <<EOF
 dnl hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 dnl so uname gets run too.
@@ -2126 +2142 @@
 ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ac_given_INSTALL="$INSTALL"
 ])dnl
+PATHIFS="$PATH_IFS"
 
 changequote(<<, >>)dnl
@@ -2173 +2190 @@
 changequote([, ])dnl
 EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012\015' '  '`
 rm -f conftest.defs
 ])
@@ -2192 +2209 @@
 $ac_vpsub
 dnl Shell code in configure.in might set extrasub.
+dnl bird - May 1 2003 3:07pm:
+dnl     This replacement isn't safe. '/bin/sh' might be just a part of a path.
+dnl     The best example is on non-unix platforms where it might be a part of
+dnl     an already localized shell reference. Consider g:/unixroot/bin/sh.exe.
+dnl     It will cause two problems if CONFIG_SHELL is used. Both double .exe
+dnl     and a double path.
+dnl     So, in short, don't do this replacement if there not separate shell
+dnl     word. However, my skills as a SED scripter is limited so this fix is
+dnl     not the right one, but it solves my problems.
+dnl     old script: [s,/bin/sh,${CONFIG_SHELL-/bin/sh},g]
 $extrasub
+[s,\([^a-zA-Z0-9:]\)/bin/sh\(.exe\),\1${CONFIG_SHELL-/bin/sh}\2,g]
 dnl Insert the sed substitutions of variables.
 undivert(AC_DIVERSION_SED)
@@ -2268 +2296 @@
       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" ;;
+changequote(, )dnl
+  [/\\]* | [a-zA-Z]:*)
+changequote([, ])dnl
+    srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
   *) # Relative path.
     srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
@@ -2277 +2308 @@
 [  case "$ac_given_INSTALL" in
 changequote(, )dnl
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+  [/$\\]* | [A-Za-z]:*) INSTALL="$ac_given_INSTALL" ;;
 changequote([, ])dnl
   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
@@ -2292 +2323 @@
   esac
 
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%$PATHIFS% $ac_given_srcdir/%g"`
   sed -e "$ac_comsub
 s%@configure_input@%$configure_input%g
@@ -2360 +2391 @@
 
   rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+# kso the other way around might work better with drive letters and such.
+#  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%g" -e "s%^%$ac_given_srcdir/%" `
   cat $ac_file_inputs > conftest.in
 
@@ -2484 +2517 @@
   case "$srcdir" in
 changequote(, )dnl
-  [/$]*) ac_rel_source="$srcdir/$ac_source" ;;
+  [/$\\]* | [A-Za-z]:*) ac_rel_source="$srcdir/$ac_source" ;;
 changequote([, ])dnl
   *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
@@ -2491 +2524 @@
   # Make a symlink if possible; otherwise try a hard link.
   if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
-    ln $srcdir/$ac_source $ac_dest; then :
+    ln $srcdir/$ac_source $ac_dest 2>/dev/null ||
+    cp $srcdir/$ac_source $ac_dest; then :
   else
     AC_MSG_ERROR(can not link $ac_dest to $srcdir/$ac_source)
@@ -2559 +2593 @@
     .) # No --srcdir option.  We are building in place.
       ac_sub_srcdir=$srcdir ;;
-    /*) # Absolute path.
+changequote(, )dnl
+    [/\\]* | [a-zA-Z]:*) # Absolute path.
+changequote([, ])dnl
       ac_sub_srcdir=$srcdir/$ac_config_dir ;;
     *) # Relative path.
@@ -2569 +2605 @@
       ac_sub_configure=$ac_sub_srcdir/configure
     elif test -f $ac_sub_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
+      ac_current_dir=`pwd`
+      cd $ac_sub_srcdir
+      autoconf
+      cd $ac_current_dir
+      ac_sub_configure=$ac_sub_srcdir/configure
     else
       AC_MSG_WARN(no configuration information is in $ac_config_dir)
@@ -2580 +2620 @@
       # Make the cache file name correct relative to the subdirectory.
       case "$cache_file" in
-      /*) ac_sub_cache_file=$cache_file ;;
+changequote(, )dnl
+      [/\\]* | [a-zA-Z]:*) ac_sub_cache_file=$cache_file ;;
+changequote([, ])dnl
       *) # Relative path.
         ac_sub_cache_file="$ac_dots$cache_file" ;;
@@ -2587 +2629 @@
       [  case "$ac_given_INSTALL" in
 changequote(, )dnl
-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+        [/$\\]* | [A-Za-z]:*) INSTALL="$ac_given_INSTALL" ;;
 changequote([, ])dnl
         *) INSTALL="$ac_dots$ac_given_INSTALL" ;;