[Pinfo-devel] r262 - in pinfo/trunk: . macros

[Bas Zoetekouw]

Author: bas
Date: 2005-09-29 19:55:55 +0000 (Thu, 29 Sep 2005)
New Revision: 262

Modified:
   pinfo/trunk/configure.ac
   pinfo/trunk/macros/readline.m4
Log:
Fixed readline detection: we requite either version 5, of no readline at all


Modified: pinfo/trunk/configure.ac
===================================================================
--- pinfo/trunk/configure.ac	2005-09-28 20:22:47 UTC (rev 261)
+++ pinfo/trunk/configure.ac	2005-09-29 19:55:55 UTC (rev 262)
@@ -100,8 +100,21 @@
 ####################################################
 # readline
 AC_CHECK_READLINE
-AM_CONDITIONAL(HAS_READLINE, test "$has_readline" = true)
 
+# if we have readline, it needs to be version 5
+if test "x$has_readline" = "xtrue"
+then 
+	if test "x$readline_version" = "x5"
+	then 
+		AM_CONDITIONAL(HAS_READLINE, test "$has_readline" = true)
+	else
+		AC_MSG_WARN([Version 5 of readline is required to compile pinfo.  
+			Yours is only version $readline_version.
+			Readline support will be disabled.])
+	fi
+fi
+					
+
 # curses
 AC_CHECK_CURSES
 if ! test "x$USE_CURSES" = "xtrue"; then

Modified: pinfo/trunk/macros/readline.m4
===================================================================
--- pinfo/trunk/macros/readline.m4	2005-09-28 20:22:47 UTC (rev 261)
+++ pinfo/trunk/macros/readline.m4	2005-09-29 19:55:55 UTC (rev 262)
@@ -74,13 +74,8 @@
 
 	if $has_readline
 	then
+		AC_DEFINE(HAS_READLINE)
 		AC_READLINE_VERSION()
-		if test $readline_version -ge 5
-		then
-			AC_DEFINE(HAS_READLINE)
-		else
-			AC_MSG_RESULT(Readline version $readline_version is too old; needs at least version 5)
-		fi
 	fi