From: Pavel Roskin <proski@gnu.org>
Date: Mon, 25 Sep 2000 13:24:45 +0000 (+0000)
Subject: * autoheader.sh: Don't check status of variable assignments -
X-Git-Tag: autoconf-2.50~609
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=480bbc837624e43b65e75e33db207a72dfbd405a;p=thirdparty%2Fautoconf.git

* autoheader.sh: Don't check status of variable assignments -
* it's undefined in ash 0.2.
* autoreconf.sh: Likewise.
* autoupdate.sh: Likewise.
* autoconf.sh: Likewise. Also eliminated command substitution
inside variable expansion - ash 0.2 coredumps on it.
---

diff --git a/ChangeLog b/ChangeLog
index 7c0fda10b..b520ab4ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-09-25  Pavel Roskin  <proski@gnu.org>
+
+	* autoheader.sh: Don't check status of variable assignments -
+	* it's undefined in ash 0.2.
+	* autoreconf.sh: Likewise.
+	* autoupdate.sh: Likewise.
+	* autoconf.sh: Likewise. Also eliminated command substitution
+	inside variable expansion - ash 0.2 coredumps on it.
+
 2000-09-21  Pavel Roskin  <proski@gnu.org>
 
 	* tests/atspecific.m4 (_AT_CHECK_AC_MACRO): Check stderr from
diff --git a/autoconf.in b/autoconf.in
index cd9b1bec7..2b56600c8 100644
--- a/autoconf.in
+++ b/autoconf.in
@@ -105,7 +105,8 @@ esac
 
 # Variables.
 : ${autoconf_dir=${AC_MACRODIR=@datadir@}}
-: ${AC_ACLOCALDIR=`(aclocal --print-ac-dir) 2>/dev/null`}
+test -z "$AC_ACLOCALDIR" &&
+  AC_ACLOCALDIR=`(aclocal --print-ac-dir) 2>/dev/null`
 : ${AWK=@AWK@}
 debug=false
 # Trace Autoconf's initialization?
@@ -244,7 +245,8 @@ $debug ||
   test -n "$tmp" && test -d "$tmp"
 } ||
 {
-  tmp=$TMPDIR/ac$$ && (umask 077 && mkdir $tmp)
+  tmp=$TMPDIR/ac$$
+  (umask 077 && mkdir $tmp)
 } ||
 {
    echo "$me: cannot create a temporary directory in $TMPDIR" >&2
diff --git a/autoconf.sh b/autoconf.sh
index cd9b1bec7..2b56600c8 100644
--- a/autoconf.sh
+++ b/autoconf.sh
@@ -105,7 +105,8 @@ esac
 
 # Variables.
 : ${autoconf_dir=${AC_MACRODIR=@datadir@}}
-: ${AC_ACLOCALDIR=`(aclocal --print-ac-dir) 2>/dev/null`}
+test -z "$AC_ACLOCALDIR" &&
+  AC_ACLOCALDIR=`(aclocal --print-ac-dir) 2>/dev/null`
 : ${AWK=@AWK@}
 debug=false
 # Trace Autoconf's initialization?
@@ -244,7 +245,8 @@ $debug ||
   test -n "$tmp" && test -d "$tmp"
 } ||
 {
-  tmp=$TMPDIR/ac$$ && (umask 077 && mkdir $tmp)
+  tmp=$TMPDIR/ac$$
+  (umask 077 && mkdir $tmp)
 } ||
 {
    echo "$me: cannot create a temporary directory in $TMPDIR" >&2
diff --git a/autoheader.in b/autoheader.in
index 1b09befdb..1dd9b0ce8 100644
--- a/autoheader.in
+++ b/autoheader.in
@@ -189,7 +189,8 @@ $debug ||
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=$TMPDIR/ah$$ && (umask 077 && mkdir $tmp)
+  tmp=$TMPDIR/ah$$
+  (umask 077 && mkdir $tmp)
 } ||
 {
    echo "$me: cannot create a temporary directory in $TMPDIR" >&2
diff --git a/autoheader.sh b/autoheader.sh
index 1b09befdb..1dd9b0ce8 100644
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -189,7 +189,8 @@ $debug ||
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=$TMPDIR/ah$$ && (umask 077 && mkdir $tmp)
+  tmp=$TMPDIR/ah$$
+  (umask 077 && mkdir $tmp)
 } ||
 {
    echo "$me: cannot create a temporary directory in $TMPDIR" >&2
diff --git a/autoreconf.in b/autoreconf.in
index 95533b557..adffd6ba4 100644
--- a/autoreconf.in
+++ b/autoreconf.in
@@ -251,7 +251,8 @@ $debug ||
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=$TMPDIR/ar$$ && (umask 077 && mkdir $tmp)
+  tmp=$TMPDIR/ar$$
+  (umask 077 && mkdir $tmp)
 } ||
 {
    echo "$me: cannot create a temporary directory in $TMPDIR" >&2
diff --git a/autoreconf.sh b/autoreconf.sh
index 95533b557..adffd6ba4 100644
--- a/autoreconf.sh
+++ b/autoreconf.sh
@@ -251,7 +251,8 @@ $debug ||
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=$TMPDIR/ar$$ && (umask 077 && mkdir $tmp)
+  tmp=$TMPDIR/ar$$
+  (umask 077 && mkdir $tmp)
 } ||
 {
    echo "$me: cannot create a temporary directory in $TMPDIR" >&2
diff --git a/bin/autoconf.in b/bin/autoconf.in
index cd9b1bec7..2b56600c8 100644
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -105,7 +105,8 @@ esac
 
 # Variables.
 : ${autoconf_dir=${AC_MACRODIR=@datadir@}}
-: ${AC_ACLOCALDIR=`(aclocal --print-ac-dir) 2>/dev/null`}
+test -z "$AC_ACLOCALDIR" &&
+  AC_ACLOCALDIR=`(aclocal --print-ac-dir) 2>/dev/null`
 : ${AWK=@AWK@}
 debug=false
 # Trace Autoconf's initialization?
@@ -244,7 +245,8 @@ $debug ||
   test -n "$tmp" && test -d "$tmp"
 } ||
 {
-  tmp=$TMPDIR/ac$$ && (umask 077 && mkdir $tmp)
+  tmp=$TMPDIR/ac$$
+  (umask 077 && mkdir $tmp)
 } ||
 {
    echo "$me: cannot create a temporary directory in $TMPDIR" >&2
diff --git a/bin/autoheader.in b/bin/autoheader.in
index 1b09befdb..1dd9b0ce8 100644
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -189,7 +189,8 @@ $debug ||
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=$TMPDIR/ah$$ && (umask 077 && mkdir $tmp)
+  tmp=$TMPDIR/ah$$
+  (umask 077 && mkdir $tmp)
 } ||
 {
    echo "$me: cannot create a temporary directory in $TMPDIR" >&2
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 95533b557..adffd6ba4 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -251,7 +251,8 @@ $debug ||
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=$TMPDIR/ar$$ && (umask 077 && mkdir $tmp)
+  tmp=$TMPDIR/ar$$
+  (umask 077 && mkdir $tmp)
 } ||
 {
    echo "$me: cannot create a temporary directory in $TMPDIR" >&2