External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

* configure.in src/Makefile.am src/virsh.c: fix compilation problems

Browse Source 
when readline headers were found but not the library
Daniel
This commit is contained in:
Daniel Veillard 2007-12-06 10:24:52 +00:00
parent d51e7c9ff0
commit 7633453cfa
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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.

15
configure.in
View File

@ -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([])

2
src/Makefile.am
View File

@ -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

8
src/virsh.c
View File

@ -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))