aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rwxr-xr-xgcc/configure6
-rw-r--r--gcc/configure.in6
3 files changed, 12 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 62a19b7..8fea68a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-05 Pascal Obry <obry@act-europe.fr>
+
+ * configure.in: Quote $enable_win32_registry in case the value has
+ spaces in it.
+ * configure: Ditto.
+
2001-06-05 Mark Mitchell <mark@codesourcery.com>
* print-rtl.c (xspaces): Remove.
diff --git a/gcc/configure b/gcc/configure
index d39c73a..12cd174 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -6398,7 +6398,7 @@ case $host_os in
win32 | pe | cygwin* | mingw32* | uwin*)
echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6
echo "configure:6401: checking whether windows registry support is requested" >&5
-if test x$enable_win32_registry != xno; then
+if test "x$enable_win32_registry" != xno; then
cat >> confdefs.h <<\EOF
#define ENABLE_WIN32_REGISTRY 1
EOF
@@ -6471,7 +6471,7 @@ else
fi
# Check if user specified a different registry key.
-case x${enable_win32_registry} in
+case "x${enable_win32_registry}" in
x | xyes)
# default.
gcc_cv_win32_registry_key="$VERSION"
@@ -6486,7 +6486,7 @@ xno)
;;
esac
-if test x$enable_win32_registry != xno; then
+if test "x$enable_win32_registry" != xno; then
echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6
echo "configure:6492: checking registry key on windows hosts" >&5
cat >> confdefs.h <<EOF
diff --git a/gcc/configure.in b/gcc/configure.in
index 9924517..0c9117a 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -939,7 +939,7 @@ AC_ARG_ENABLE(win32-registry,
case $host_os in
win32 | pe | cygwin* | mingw32* | uwin*)
AC_MSG_CHECKING(whether windows registry support is requested)
-if test x$enable_win32_registry != xno; then
+if test "x$enable_win32_registry" != xno; then
AC_DEFINE(ENABLE_WIN32_REGISTRY, 1,
[Define to 1 if installation paths should be looked up in Windows32
Registry. Ignored on non windows32 hosts.])
@@ -950,7 +950,7 @@ else
fi
# Check if user specified a different registry key.
-case x${enable_win32_registry} in
+case "x${enable_win32_registry}" in
x | xyes)
# default.
gcc_cv_win32_registry_key="$VERSION"
@@ -965,7 +965,7 @@ xno)
;;
esac
-if test x$enable_win32_registry != xno; then
+if test "x$enable_win32_registry" != xno; then
AC_MSG_CHECKING(registry key on windows hosts)
AC_DEFINE_UNQUOTED(WIN32_REGISTRY_KEY, "$gcc_cv_win32_registry_key",
[Define to be the last portion of registry key on windows hosts.])