Go back to old way of doing NLS nuisance test.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 5f9f4fbb40c1251e48379ced7453285988b46f3e..390e282956fcbc2c6c0f17259463beeff3687998 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -376,8 +376,8 @@ done
 # Only set `LANG' and `LC_ALL' to "C" if already set.
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
-if test "${LC_ALL-unset}" != unset; then LC_ALL=C; export LC_ALL; fi
-if test "${LANG-unset}"   != unset; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -rf conftest* confdefs.h
@@ -684,7 +684,7 @@ dnl
 dnl AC_CACHE_VAL(cache-id, commands-to-set-it)
 dnl The name cache-id must contain the string `_cv_' in order to get saved.
 define(AC_CACHE_VAL,
-[if test "x${$1-unset}" != xunset; then 
+[if test "${$1+set}" = set; then 
 dnl This verbose message is just for testing the caching code.
   AC_VERBOSE(using cached value for $1)
 else

diff --git a/autoconf.in b/autoconf.in
index f7887f1337ee4bac3db2a96dec097e7fbb8f4382..cc037b03ef5fdf8f777fad541b6c755b6cd27b5c 100644 (file)
--- a/autoconf.in
+++ b/autoconf.in
@@ -28,8 +28,8 @@ Usage: autoconf [-h] [--help] [-m dir] [--macrodir=dir]
 # Only set `LANG' and `LC_ALL' to "C" if already set.
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
-if test "${LC_ALL-unset}" != unset; then LC_ALL=C; export LC_ALL; fi
-if test "${LANG-unset}"   != unset; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
 
 test -z "${AC_MACRODIR}" && AC_MACRODIR=@datadir@
 test -z "${M4}" && M4=@M4@

diff --git a/autoconf.sh b/autoconf.sh
index f7887f1337ee4bac3db2a96dec097e7fbb8f4382..cc037b03ef5fdf8f777fad541b6c755b6cd27b5c 100644 (file)
--- a/autoconf.sh
+++ b/autoconf.sh
@@ -28,8 +28,8 @@ Usage: autoconf [-h] [--help] [-m dir] [--macrodir=dir]
 # Only set `LANG' and `LC_ALL' to "C" if already set.
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
-if test "${LC_ALL-unset}" != unset; then LC_ALL=C; export LC_ALL; fi
-if test "${LANG-unset}"   != unset; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
 
 test -z "${AC_MACRODIR}" && AC_MACRODIR=@datadir@
 test -z "${M4}" && M4=@M4@

diff --git a/autoheader.in b/autoheader.in
index 6e9e5f846eb14e01eb109ae67de4128a0c17f922..ddade82b02984737aa2a62876476180406d8840b 100644 (file)
--- a/autoheader.in
+++ b/autoheader.in
@@ -30,8 +30,8 @@ Usage: autoheader [-h] [--help] [-m dir] [--macrodir=dir]
 # Only set `LANG' and `LC_ALL' to "C" if already set.
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
-if test "${LC_ALL-unset}" != unset; then LC_ALL=C; export LC_ALL; fi
-if test "${LANG-unset}"   != unset; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
 
 test -z "${AC_MACRODIR}" && AC_MACRODIR=@datadir@
 test -z "${M4}" && M4=@M4@

diff --git a/autoheader.sh b/autoheader.sh
index 6e9e5f846eb14e01eb109ae67de4128a0c17f922..ddade82b02984737aa2a62876476180406d8840b 100644 (file)
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -30,8 +30,8 @@ Usage: autoheader [-h] [--help] [-m dir] [--macrodir=dir]
 # Only set `LANG' and `LC_ALL' to "C" if already set.
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
-if test "${LC_ALL-unset}" != unset; then LC_ALL=C; export LC_ALL; fi
-if test "${LANG-unset}"   != unset; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
 
 test -z "${AC_MACRODIR}" && AC_MACRODIR=@datadir@
 test -z "${M4}" && M4=@M4@

diff --git a/bin/autoconf.in b/bin/autoconf.in
index f7887f1337ee4bac3db2a96dec097e7fbb8f4382..cc037b03ef5fdf8f777fad541b6c755b6cd27b5c 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -28,8 +28,8 @@ Usage: autoconf [-h] [--help] [-m dir] [--macrodir=dir]
 # Only set `LANG' and `LC_ALL' to "C" if already set.
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
-if test "${LC_ALL-unset}" != unset; then LC_ALL=C; export LC_ALL; fi
-if test "${LANG-unset}"   != unset; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
 
 test -z "${AC_MACRODIR}" && AC_MACRODIR=@datadir@
 test -z "${M4}" && M4=@M4@

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 6e9e5f846eb14e01eb109ae67de4128a0c17f922..ddade82b02984737aa2a62876476180406d8840b 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -30,8 +30,8 @@ Usage: autoheader [-h] [--help] [-m dir] [--macrodir=dir]
 # Only set `LANG' and `LC_ALL' to "C" if already set.
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
-if test "${LC_ALL-unset}" != unset; then LC_ALL=C; export LC_ALL; fi
-if test "${LANG-unset}"   != unset; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
 
 test -z "${AC_MACRODIR}" && AC_MACRODIR=@datadir@
 test -z "${M4}" && M4=@M4@

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 5f9f4fbb40c1251e48379ced7453285988b46f3e..390e282956fcbc2c6c0f17259463beeff3687998 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -376,8 +376,8 @@ done
 # Only set `LANG' and `LC_ALL' to "C" if already set.
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
-if test "${LC_ALL-unset}" != unset; then LC_ALL=C; export LC_ALL; fi
-if test "${LANG-unset}"   != unset; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -rf conftest* confdefs.h
@@ -684,7 +684,7 @@ dnl
 dnl AC_CACHE_VAL(cache-id, commands-to-set-it)
 dnl The name cache-id must contain the string `_cv_' in order to get saved.
 define(AC_CACHE_VAL,
-[if test "x${$1-unset}" != xunset; then 
+[if test "${$1+set}" = set; then 
 dnl This verbose message is just for testing the caching code.
   AC_VERBOSE(using cached value for $1)
 else