Changeset 3159 for trunk/essentials/sys-devel/autoconf-2.13/autoheader.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/autoheader.sh (modified) (2 diffs)

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

@@ -38 +38 @@
 if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
-test -z "${AC_MACRODIR}" && 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
 test -z "${M4}" && M4=@M4@
 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 ;;
@@ -266 +272 @@
 
 if test $# -eq 0; then
+  # bird: OS/2 hack here for missing link counting.
+  exec 2>&1
   if test $status -eq 0; then
     if test -f ${config_h_in} && cmp -s $tmpout ${config_h_in}; then
       rm -f $tmpout # File didn't change, so don't update its mod time.
     else
-      mv -f $tmpout ${config_h_in}
+      # bird: Do a copy just to be on the safe side.
+      cp -f $tmpout ${config_h_in}
+      rm -f $tmpout
     fi
   else