git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly close fds and unregister handlers in guestfs_close.
[libguestfs.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
4a57fa3
..
30d7c1d
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-15,8
+15,8
@@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-AC_INIT([libguestfs],[1.0.5
5
])
-AM_INIT_AUTOMAKE
+AC_INIT([libguestfs],[1.0.5
6
])
+AM_INIT_AUTOMAKE
([foreign])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_MACRO_DIR([m4])
@@
-167,6
+167,18
@@
else
test "x$DEBIRF" = "xno" &&
AC_MSG_ERROR([debirf must be installed])
DIST="DEBIAN"
test "x$DEBIRF" = "xno" &&
AC_MSG_ERROR([debirf must be installed])
DIST="DEBIAN"
+ case $host_cpu in
+ *86)
+ DEBIAN_KERNEL_ARCH=486
+ ;;
+ x86_64)
+ DEBIAN_KERNEL_ARCH=amd64
+ ;;
+ *)
+ DEBIAN_KERNEL_ARCH=$host_cpu
+ ;;
+ esac
+ AC_SUBST(DEBIAN_KERNEL_ARCH)
fi
AC_SUBST(DIST)
fi
AC_SUBST(DIST)
@@
-494,7
+506,7
@@
AC_CHECK_PROG([GHC],[ghc],[ghc],[no])
AM_CONDITIONAL([HAVE_HASKELL],
[test "x$GHC" != "xno"])
AM_CONDITIONAL([HAVE_HASKELL],
[test "x$GHC" != "xno"])
-dnl Check for Perl modules needed by
the inspector
.
+dnl Check for Perl modules needed by
virt-df, inspector and V2V
.
missing_perl_modules=no
for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer; do
AC_MSG_CHECKING([for $pm])
missing_perl_modules=no
for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer; do
AC_MSG_CHECKING([for $pm])
@@
-506,11
+518,15
@@
for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer; do
fi
done
if test "x$missing_perl_modules" = "xyes"; then
fi
done
if test "x$missing_perl_modules" = "xyes"; then
- AC_MSG_WARN([some Perl modules required to compile virt-
inspector
are missing])
+ AC_MSG_WARN([some Perl modules required to compile virt-
df, virt-inspector and virt-v2v
are missing])
fi
fi
+AM_CONDITIONAL([HAVE_DF],
+ [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"])
AM_CONDITIONAL([HAVE_INSPECTOR],
[test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"])
AM_CONDITIONAL([HAVE_INSPECTOR],
[test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"])
+AM_CONDITIONAL([HAVE_V2V],
+ [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"])
dnl Library versioning.
MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
dnl Library versioning.
MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
@@
-545,7
+561,9
@@
AC_CONFIG_FILES([Makefile
ruby/Makefile ruby/Rakefile
java/Makefile
haskell/Makefile
ruby/Makefile ruby/Rakefile
java/Makefile
haskell/Makefile
+ df/Makefile
inspector/Makefile
inspector/Makefile
+ v2v/Makefile
libguestfs.pc
ocaml/META perl/Makefile.PL])
AC_OUTPUT
libguestfs.pc
ocaml/META perl/Makefile.PL])
AC_OUTPUT
@@
-571,15
+589,19
@@
echo -n "Java bindings ....................... "
if test "x$HAVE_JAVA_TRUE" = "x"; then echo "yes"; else echo "no"; fi
echo -n "Haskell bindings .................... "
if test "x$HAVE_HASKELL" = "x"; then echo "yes"; else echo "no"; fi
if test "x$HAVE_JAVA_TRUE" = "x"; then echo "yes"; else echo "no"; fi
echo -n "Haskell bindings .................... "
if test "x$HAVE_HASKELL" = "x"; then echo "yes"; else echo "no"; fi
+echo -n "virt-df ............................. "
+if test "x$HAVE_DF" = "x"; then echo "yes"; else echo "no"; fi
echo -n "virt-inspector ...................... "
if test "x$HAVE_INSPECTOR" = "x"; then echo "yes"; else echo "no"; fi
echo -n "virt-inspector ...................... "
if test "x$HAVE_INSPECTOR" = "x"; then echo "yes"; else echo "no"; fi
+echo -n "virt-v2v ............................ "
+if test "x$HAVE_V2V" = "x"; then echo "yes"; else echo "no"; fi
echo "supermin appliance .................. $enable_supermin"
echo
echo "If any optional component is configured 'no' when you expected 'yes'"
echo "then you should check the preceeding messages."
echo
echo "supermin appliance .................. $enable_supermin"
echo
echo "If any optional component is configured 'no' when you expected 'yes'"
echo "then you should check the preceeding messages."
echo
-echo "Please report bugs back to the
fedora-virt
mailing list:"
-echo "http://www.redhat.com/mailman/listinfo/
fedora-virt
"
+echo "Please report bugs back to the mailing list:"
+echo "http://www.redhat.com/mailman/listinfo/
libguestfs
"
echo
echo "Next you should type 'make' to build the package,"
echo "then 'make check' to run the tests."
echo
echo "Next you should type 'make' to build the package,"
echo "then 'make check' to run the tests."