diff --git a/ChangeLog b/ChangeLog
index 7ed97f5b29d552e3430206f98d03bbac12f0ded2..a30ecc13d464b1e10eebe2d2e10a4b2398199c2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-05  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* configure.in: Fix quoting bugs.
+
 2012-05-04  Glenn Morris  <rgm@gnu.org>
 
 	* configure.in (INFO_EXT, INFO_OPTS): New output variables.
diff --git a/configure.in b/configure.in
index 81e8765990f865426b5177050a19fc4ce3fc6776..5fe14322a95f0e407dff1236f1e4a5e9633862b7 100644
--- a/configure.in
+++ b/configure.in
@@ -2919,7 +2919,7 @@ case "$opsys" in
   ##  option to use it.
   darwin) LIBS_TERMCAP="-lncurses" ;;
 
-  gnu*) [ "x$LIBS_TERMCAP" = x ] && LIBS_TERMCAP="-lncurses" ;;
+  gnu*) test -z "$LIBS_TERMCAP" && LIBS_TERMCAP="-lncurses" ;;
 
   freebsd)
     AC_MSG_CHECKING([whether FreeBSD is new enough to use terminfo])
@@ -2941,7 +2941,7 @@ fail;
     ;;
 
   netbsd)
-    if [ "x$LIBS_TERMCAP" != "x-lterminfo" ]; then
+    if test "x$LIBS_TERMCAP" != "x-lterminfo"; then
       TERMINFO=no
       LIBS_TERMCAP="-ltermcap"
     fi