--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@
 ### along with Octave; see the file COPYING.  If not, write to the Free
 ### Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-AC_REVISION($Revision: 1.99 $)
+AC_REVISION($Revision: 1.100 $)
 AC_PREREQ(2.0)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -67,32 +67,30 @@
 ### Allow the user disable support for GNU info.
 
 USE_GNU_INFO=true
+LIBINFO=../info/libinfo.a
 AC_ARG_ENABLE(info,
   [  --enable-info           use GNU info (default is yes)],
-  USE_GNU_INFO=true, USE_GNU_INFO=false)
-AC_SUBST(USE_GNU_INFO)
-LIBINFO=../info/libinfo.a
-if $USE_GNU_INFO; then
-  true
-else
+  [])
+if test "$enableval" = no; then
+  USE_GNU_INFO=false
   LIBINFO=
 fi
+AC_SUBST(USE_GNU_INFO)
 AC_SUBST(LIBINFO)
 
 ### Allow the user disable support for command line editing using GNU
 ### readline.
 
 USE_READLINE=true
+LIBREADLINE=../readline/libreadline.a
 AC_ARG_ENABLE(readline,
   [  --enable-readline       use readline library (default is yes)],
-  USE_READLINE=true, USE_READLINE=false)
-AC_SUBST(USE_READLINE)
-LIBREADLINE=../readline/libreadline.a
-if $USE_READLINE; then
-  true
-else
+  [])
+if test "$enableval" = no; then
+  USE_READLINE=false
   LIBREADLINE=
 fi
+AC_SUBST(USE_READLINE)
 AC_SUBST(LIBREADLINE)
 
 ### some defaults