--- gcl-2.5.0/configure.in	Mon Jun 17 08:52:31 2002
+++ gcl/configure.in	Mon Jun 17 17:30:23 2002
@@ -182,13 +182,18 @@
 #	   declare it.
 #--------------------------------------------------------------------
 
-AC_CHECK_FUNC(BSDgettimeofday, AC_DEFINE(HAVE_BSDGETTIMEOFDAY),
-	AC_CHECK_FUNC(gettimeofday, , AC_DEFINE(NO_GETTOD)))
+AC_CHECK_FUNC([BSDgettimeofday],
+              [AC_DEFINE(HAVE_BSDGETTIMEOFDAY)],
+	      [AC_CHECK_FUNC([gettimeofday], ,
+	                     [AC_DEFINE([NO_GETTOD])])])
+
 AC_MSG_CHECKING([for gettimeofday declaration])
-AC_EGREP_HEADER(gettimeofday, sys/time.h, AC_MSG_RESULT(present), [
-    AC_MSG_RESULT(missing)
-    AC_DEFINE(GETTOD_NOT_DECLARED)
-])
+
+AC_EGREP_HEADER([gettimeofday],
+                [sys/time.h],
+		[AC_MSG_RESULT([present])],
+		[AC_MSG_RESULT([missing])
+    		 AC_DEFINE(GETTOD_NOT_DECLARED)])
 
 
 AC_CHECK_LIB(m,sin,LIBS="${LIBS} -lm",true)
@@ -256,11 +261,19 @@
 fi
 AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 
-AC_CHECK_LIB(readline,main,
-	AC_DEFINE(HAVE_READLINE) 
-	LIBS="$LIBS -lreadline -lncurses"
-	RL_OBJS=readline.o
-	RL_LIB=lsp/readline.o,,-lncurses)
+AC_ARG_WITH([readline],
+	    [--with-readline        enables readline support [[yes]]], ,
+	    [ with_readline="yes" ])
+     
+if test "$with_readline" = "yes" ; then
+	AC_CHECK_LIB([readline],
+		     [main],
+		     [AC_DEFINE(HAVE_READLINE) 
+	              LIBS="$LIBS -lreadline -lncurses"
+	              RL_OBJS=readline.o
+	              RL_LIB=lsp/readline.o],,
+		     [-lncurses])
+fi
 
 if test "$enable_bfd" = "yes" ; then
 	AC_CHECK_HEADER(bfd.h,