libgda r3342 - in trunk: . tools

[vivien svn gnome org]

Author: vivien
Date: Wed Mar  4 14:28:55 2009
New Revision: 3342
URL: http://svn.gnome.org/viewvc/libgda?rev=3342&view=rev

Log:
2009-03-04  Vivien Malerba <malerba gnome-db org>

        * configure.in: use ncurses if found instead of ncuses, fixes bug #574021
        * tools/tools-input.c: currected compilation issue if readline is not found,
        fixes bug #574020


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/tools/tools-input.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Mar  4 14:28:55 2009
@@ -1355,7 +1355,13 @@
   		AC_CHECK_LIB(readline, readline, READLINE_LIB='-lreadline -lcurses', [], -lcurses)
 	fi
 else
-	AC_CHECK_LIB(readline, readline, READLINE_LIB='-lreadline -lcurses', [], -lcurses)
+	AC_CHECK_LIB(ncurses, initscr, curses_lib='-lncurses', curses_lib='')
+	if test "x$curses_lib" = "x"; then
+		AC_CHECK_LIB(curses, initscr, curses_lib='-lcurses', [])
+        fi
+	if test "x$curses_lib" != "x"; then
+		AC_CHECK_LIB(readline, readline, READLINE_LIB="-lreadline ${curses_lib}", [], $curses_lib)
+	fi
 fi
 if test ! x"$READLINE_LIB" = x ; then
    	AC_DEFINE(HAVE_READLINE)

Modified: trunk/tools/tools-input.c
==============================================================================
--- trunk/tools/tools-input.c	(original)
+++ trunk/tools/tools-input.c	Wed Mar  4 14:28:55 2009
@@ -248,7 +248,9 @@
 init_history ()
 {
 #ifdef HAVE_HISTORY
+#ifdef HAVE_READLINE
 	rl_set_signals ();
+#endif
 	
 	if (history_init_done)
 		return;