From: Daniel Veillard <veillard@redhat.com>
Date: Thu, 6 Dec 2007 10:24:52 +0000 (+0000)
Subject: * configure.in src/Makefile.am src/virsh.c: fix compilation problems
X-Git-Tag: LIBVIRT_0_4_1~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7633453cfa077d02bb0e3e4034abd32a24908ee8;p=thirdparty%2Flibvirt.git

* configure.in src/Makefile.am src/virsh.c: fix compilation problems
  when readline headers were found but not the library
Daniel
---

diff --git a/ChangeLog b/ChangeLog
index 302706c2bc..1a100b1140 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec  6 11:23:31 CET 2007 Daniel Veillard <veillard@redhat.com>
+
+	* configure.in src/Makefile.am src/virsh.c: fix compilation problems
+	  when readline headers were found but not the library
+
 Wed Dec  5 23:57:53 CET 2007 Jim Meyering <meyering@redhat.com>
 
 	Accommodate developers using autoconf-2.59.
diff --git a/configure.in b/configure.in
index 8d2a14367b..74028d80d0 100644
--- a/configure.in
+++ b/configure.in
@@ -448,11 +448,21 @@ AC_SUBST(AVAHI_CFLAGS)
 AC_SUBST(AVAHI_LIBS)
 
 dnl virsh libraries
+USE_READLINE=
+READLINE_CFLAGS=
 AC_CHECK_HEADERS([readline/readline.h])
 AC_CHECK_LIB(readline, main,
-	[VIRSH_LIBS="$VIRSH_LIBS -lreadline"],
-	[AC_MSG_WARN([readline library not found])],
+	[USE_READLINE=yes],
+	[USE_READLINE=no],
 	[$VIRSH_LIBS])
+if test "$USE_READLINE" = "yes" ; then
+    VIRSH_LIBS="$VIRSH_LIBS -lreadline"
+    AC_DEFINE_UNQUOTED(USE_READLINE, 1, [whether virsh use readline])
+    READLINE_CFLAGS="-DUSE_READLINE"
+else
+    AC_MSG_WARN([readline library not found])
+fi
+AC_SUBST(READLINE_CFLAGS)
 AC_SUBST(VIRSH_LIBS)
 
 # end of if with_depends
@@ -687,4 +697,5 @@ AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Miscellaneous])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([  Debug: $enable_debug])
+AC_MSG_NOTICE([  Readline: $USE_READLINE])
 AC_MSG_NOTICE([])
diff --git a/src/Makefile.am b/src/Makefile.am
index a14b9b6eac..1979a19431 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -76,7 +76,7 @@ virsh_SOURCES = virsh.c console.c console.h
 virsh_LDFLAGS = $(WARN_CFLAGS) $(COVERAGE_LDFLAGS)
 virsh_DEPENDENCIES = $(DEPS)
 virsh_LDADD = $(LDADDS) $(VIRSH_LIBS)
-virsh_CFLAGS = $(COVERAGE_CFLAGS)
+virsh_CFLAGS = $(COVERAGE_CFLAGS) $(READLINE_CFLAGS)
 
 #
 # target to ease building test programs
diff --git a/src/virsh.c b/src/virsh.c
index d67ba7c068..3486d463b6 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -4661,7 +4661,7 @@ vshCloseLogFile(vshControl *ctl)
     }
 }
 
-#ifdef HAVE_READLINE_READLINE_H
+#ifdef USE_READLINE
 
 /* -----------------
  * Readline stuff
@@ -4786,7 +4786,7 @@ vshReadline (vshControl *ctl ATTRIBUTE_UNUSED, const char *prompt)
     return readline (prompt);
 }
 
-#else /* !HAVE_READLINE_READLINE_H */
+#else /* !USE_READLINE */
 
 static void
 vshReadlineInit (void)
@@ -4813,7 +4813,7 @@ vshReadline (vshControl *ctl, const char *prompt)
     return vshStrdup (ctl, r);
 }
 
-#endif /* !HAVE_READLINE_READLINE_H */
+#endif /* !USE_READLINE */
 
 /*
  * Deinitliaze virsh
@@ -5059,7 +5059,7 @@ main(int argc, char **argv)
             if (ctl->cmdstr == NULL)
                 break;          /* EOF */
             if (*ctl->cmdstr) {
-#if HAVE_READLINE_READLINE_H
+#if USE_READLINE
                 add_history(ctl->cmdstr);
 #endif
                 if (vshCommandParse(ctl, ctl->cmdstr))