* 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 7c0fda10b04a9860624e29bacafd38a01fa2248c..b520ab4ad085464b57eea302afc1025cb1d10ee7 100644 (file)
--- 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 cd9b1bec7c6907cd3432f63c51236a7399c7c1c6..2b56600c8278cb0a68f85fc6ba4cefeb1494d039 100644 (file)
--- 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 cd9b1bec7c6907cd3432f63c51236a7399c7c1c6..2b56600c8278cb0a68f85fc6ba4cefeb1494d039 100644 (file)
--- 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 1b09befdb34179f9a3772915acbb1c61d6dab425..1dd9b0ce87afad72183ff57e735b3f8ae25c6e12 100644 (file)
--- 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 1b09befdb34179f9a3772915acbb1c61d6dab425..1dd9b0ce87afad72183ff57e735b3f8ae25c6e12 100644 (file)
--- 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 95533b5574dcae13d24d20c0eb1e049eeae5c7ca..adffd6ba45f2605e0be22c167062e30a70ba2dea 100644 (file)
--- 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 95533b5574dcae13d24d20c0eb1e049eeae5c7ca..adffd6ba45f2605e0be22c167062e30a70ba2dea 100644 (file)
--- 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 cd9b1bec7c6907cd3432f63c51236a7399c7c1c6..2b56600c8278cb0a68f85fc6ba4cefeb1494d039 100644 (file)
--- 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 1b09befdb34179f9a3772915acbb1c61d6dab425..1dd9b0ce87afad72183ff57e735b3f8ae25c6e12 100644 (file)
--- 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 95533b5574dcae13d24d20c0eb1e049eeae5c7ca..adffd6ba45f2605e0be22c167062e30a70ba2dea 100644 (file)
--- 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