X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=99b74df27d41eaaa4afb77b3544cc5bf03e0501b;hp=cfad704f257112dd14886d6ac9a01236aab116bc;hb=aba59fd3555ac8b38ae554a729970afd80e05404;hpb=5ebf3a39340696fea0582a58074d22d11247a6e7 diff --git a/configure.ac b/configure.ac index cfad704..99b74df 100644 --- a/configure.ac +++ b/configure.ac @@ -17,8 +17,8 @@ # major/minor/release must be numbers m4_define([libguestfs_major], [1]) -m4_define([libguestfs_minor], [0]) -m4_define([libguestfs_release], [86]) +m4_define([libguestfs_minor], [3]) +m4_define([libguestfs_release], [5]) # extra can be any string m4_define([libguestfs_extra], []) @@ -345,9 +345,9 @@ if test "x$enable_appliance" = "xyes"; then dnl --with-updates to specify a Fedora updates repository. AC_ARG_WITH([updates], [AS_HELP_STRING([--with-updates], - [set name of Fedora updates repository @<:@default=updates-released-f11@:>@])], + [set name of Fedora updates repository @<:@default=updates-released-f12@:>@])], [], - [with_updates=updates-released-f11]) + [with_updates=updates-released-f12]) UPDATES="$with_updates" AC_SUBST(UPDATES) @@ -364,9 +364,9 @@ fi dnl --with-repo to specify a Fedora repository. AC_ARG_WITH([repo], [AS_HELP_STRING([--with-repo], - [set name of Fedora repository @<:@default=fedora-11@:>@])], + [set name of Fedora repository @<:@default=fedora-12@:>@])], [], - [with_repo=fedora-11]) + [with_repo=fedora-12]) REPO="$with_repo" AC_SUBST(REPO) AC_DEFINE_UNQUOTED([REPO],["$REPO"],[Name of Fedora repository.]) @@ -440,7 +440,12 @@ AS_IF([test "x$with_readline" != xno], AC_MSG_FAILURE( [--with-readline was given, but test for readline failed]) fi - ], -lncurses)]) + ], -lncurses) + old_LIBS="$LIBS" + LIBS="$LIBS $LIBREADLINE" + AC_CHECK_FUNCS([append_history completion_matches rl_completion_matches]) + LIBS="$old_LIBS" + ]) dnl For i18n. AM_GNU_GETTEXT([external]) @@ -713,7 +718,7 @@ AM_CONDITIONAL([HAVE_HASKELL], dnl Check for Perl modules needed by virt-df, inspector, etc. missing_perl_modules=no -for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer Locale::TextDomain; do +for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer Locale::TextDomain Win::Hivex Win::Hivex::Regedit; do AC_MSG_CHECKING([for $pm]) if ! perl -M$pm -e1 >/dev/null 2>&1; then AC_MSG_RESULT([no])