git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
out-of-tree build: fix HAVE_OCAML=false case
[libguestfs.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
c5b7bd0
..
ed538f5
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-20,7
+20,7
@@
# freeform string.
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [13])
# freeform string.
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [13])
-m4_define([libguestfs_release], [
1
3])
+m4_define([libguestfs_release], [
2
3])
AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
AC_CONFIG_AUX_DIR([build-aux])
AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
AC_CONFIG_AUX_DIR([build-aux])
@@
-346,6
+346,11
@@
if test "x$have_libselinux" = "xyes"; then
fi
AC_SUBST([SELINUX_LIB])
fi
AC_SUBST([SELINUX_LIB])
+dnl Check for systemtap/DTrace userspace probes (optional).
+dnl http://sourceware.org/systemtap/wiki/AddingUserSpaceProbingToApps
+AC_CHECK_HEADERS([sys/sdt.h])
+dnl AC_CHECK_PROG([DTRACE],[dtrace],[dtrace],[no])
+
dnl Check for cpio which isn't in the default Pardus install amazingly.
AC_CHECK_PROG([CPIO],[cpio],[cpio],[no])
test "x$CPIO" = "xno" &&
dnl Check for cpio which isn't in the default Pardus install amazingly.
AC_CHECK_PROG([CPIO],[cpio],[cpio],[no])
test "x$CPIO" = "xno" &&
@@
-887,12
+892,14
@@
AS_IF([test "x$enable_php" != "xno"],
AM_CONDITIONAL([HAVE_PHP], [test "x$PHP" != "xno" && test "x$PHPIZE" != "xno"])
dnl Erlang
AM_CONDITIONAL([HAVE_PHP], [test "x$PHP" != "xno" && test "x$PHPIZE" != "xno"])
dnl Erlang
+ERLANG=no
AC_ARG_ENABLE([erlang],
AC_ARG_ENABLE([erlang],
-
AS_HELP_STRING([--disable-erlang], [Disable Erlang language bindings]),
- [],
- [enable_erlang=yes])
+ AS_HELP_STRING([--disable-erlang], [Disable Erlang language bindings]),
+
[],
+
[enable_erlang=yes])
AS_IF([test "x$enable_erlang" != "xno"],
[
AS_IF([test "x$enable_erlang" != "xno"],
[
+ ERLANG=
AC_ERLANG_PATH_ERLC([no])
if test "x$ERLC" != "xno"; then
AC_ERLANG_PATH_ERLC([no])
if test "x$ERLC" != "xno"; then
@@
-901,7
+908,7
@@
AS_IF([test "x$enable_erlang" != "xno"],
AC_ERLANG_SUBST_LIB_DIR
fi
])
AC_ERLANG_SUBST_LIB_DIR
fi
])
-AM_CONDITIONAL([HAVE_ERLANG], [test "x$ERLC" != "xno"])
+AM_CONDITIONAL([HAVE_ERLANG], [test "x$ERL
ANG" != "xno" && test "x$ERL
C" != "xno"])
dnl Check for Perl modules needed by Perl virt tools (virt-df, etc.)
AS_IF([test "x$PERL" != "xno"],
dnl Check for Perl modules needed by Perl virt tools (virt-df, etc.)
AS_IF([test "x$PERL" != "xno"],
@@
-936,15
+943,19
@@
AC_SUBST([LIBTOOL])
dnl Produce output files.
AC_CONFIG_HEADERS([config.h])
dnl http://www.mail-archive.com/automake@gnu.org/msg10204.html
dnl Produce output files.
AC_CONFIG_HEADERS([config.h])
dnl http://www.mail-archive.com/automake@gnu.org/msg10204.html
+AC_CONFIG_FILES([clone/virt-sysprep],
+ [chmod +x clone/virt-sysprep])
AC_CONFIG_FILES([podwrapper.sh],
[chmod +x podwrapper.sh])
AC_CONFIG_FILES([run],
[chmod +x run])
AC_CONFIG_FILES([Makefile
AC_CONFIG_FILES([podwrapper.sh],
[chmod +x podwrapper.sh])
AC_CONFIG_FILES([run],
[chmod +x run])
AC_CONFIG_FILES([Makefile
+ align/Makefile
appliance/Makefile
capitests/Makefile
cat/Makefile
caution/Makefile
appliance/Makefile
capitests/Makefile
cat/Makefile
caution/Makefile
+ clone/Makefile
csharp/Makefile
daemon/Makefile
debian/changelog
csharp/Makefile
daemon/Makefile
debian/changelog
@@
-983,6
+994,7
@@
AC_CONFIG_FILES([Makefile
ruby/Makefile
ruby/Rakefile
ruby/examples/Makefile
ruby/Makefile
ruby/Rakefile
ruby/examples/Makefile
+ sparsify/Makefile
src/Makefile
test-tool/Makefile
tools/Makefile])
src/Makefile
test-tool/Makefile
tools/Makefile])