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

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/autoconf.sh (modified) (4 diffs)

trunk/essentials/sys-devel/autoconf-2.13/autoconf.sh

@@ -36 +36 @@
 if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
-: ${AC_MACRODIR=@datadir@}
+if test -z "${AC_MACRODIR}"; then
+    if test -d "${UNIXROOT}@datadir@"; then
+        AC_MACRODIR=${UNIXROOT}@datadir@
+    else
+        AC_MACRODIR=@datadir@
+    fi        
+fi
 : ${M4=@M4@}
 : ${AWK=@AWK@}
 case "${M4}" in
-/*) # Handle the case that m4 has moved since we were configured.
+[/\\]*|[a-zA-Z]:*) # Handle the case that m4 has moved since we were configured.
     # It may have been found originally in a build directory.
     test -f "${M4}" || M4=m4 ;;
@@ -122 +128 @@
 esac
 
-$M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
+$M4 -I$AC_MACRODIR -DAC_MACRODIR=$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
   { rm -f $tmpin $tmpout; exit 2; }
 
@@ -142 +148 @@
 
 if test $# -eq 0; then
-  exec 4> configure; chmod +x configure
+  exec 4> configure; chmod +x configure 2> /dev/null
 else
   exec 4>&1
@@ -153 +159 @@
 ' $tmpout | sed '
 /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/
-' >&4
+' | sed 's/IFS="${IFS}:"/IFS="${PATH_IFS}"/' >&4
 
 rm -f $tmpout