diff --git a/Makefile.am b/Makefile.am --- a/Makefile.am +++ b/Makefile.am @@ -79,9 +79,6 @@ if HAVE_HASKELL SUBDIRS += haskell endif -if HAVE_PHP -SUBDIRS += php -endif if HAVE_ERLANG SUBDIRS += erlang erlang/examples endif diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -380,6 +380,11 @@ DISTRO=UBUNTU fi fi +if test -f /etc/gentoo-release; then + DISTRO=GENTOO +fi + + if test -f /etc/arch-release; then DISTRO=ARCHLINUX fi @@ -392,6 +397,7 @@ AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[ AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl]) ]) +AS_IF([test "xRPCGEN" = "xno"], [AC_MSG_ERROR([rpcgen not installed])],[]) dnl Check for Augeas (optional). PKG_CHECK_MODULES([AUGEAS], [augeas], @@ -405,9 +411,11 @@ AC_CHECK_FUNCS([aug_load aug_defvar aug_defnode]) LIBS="$old_LIBS" ], - [AC_MSG_WARN([augeas not found, some core features will be disabled])]) + [AC_MSG_ERROR([augeas not found, some core features will be disabled])]) dnl Check for libselinux (optional). +dnl TODO selinux triplet + AC_CHECK_HEADERS([selinux/selinux.h]) AC_CHECK_LIB([selinux],[setexeccon],[ have_libselinux="$ac_cv_header_selinux_selinux_h" @@ -433,7 +441,7 @@ AS_IF([test "x$enable_probes" != "xno"],[ dnl http://sourceware.org/systemtap/wiki/AddingUserSpaceProbingToApps AC_CHECK_HEADERS([sys/sdt.h]) - dnl AC_CHECK_PROG([DTRACE],[dtrace],[dtrace],[no]) + AC_CHECK_PROG([DTRACE],[dtrace],[dtrace],[no]) AS_IF([test "x$ac_cv_header_sys_sdt_h" = "xyes"],[ AC_DEFINE([ENABLE_PROBES],[1],[enable systemtap/DTrace userspace probes]) ]) @@ -488,11 +496,20 @@ dnl Check for optional xmllint. AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no]) +AS_IF([test "xXMLLINT" = "xno"], [AC_MSG_ERROR([xmllint not installed])],[]) + AM_CONDITIONAL([HAVE_XMLLINT],[test "x$XMLLINT" != "xno"]) dnl po4a for translating man pages and POD files (optional). AC_CHECK_PROG([PO4A],[po4a],[po4a],[no]) -AM_CONDITIONAL([HAVE_PO4A], [test "x$PO4A" != "xno"]) +AC_ARG_ENABLE([doc], + AS_HELP_STRING([--enable-doc], [Enable generation translating man pages and doc]), + [enable_doc=no], + [enable_doc=yes]) +AS_IF([test "xPO4A" = "xno"], [AC_MSG_WARN([po4a not installed])],[]) +AM_CONDITIONAL([HAVE_PO4A],[test "x$PO4A" != "xno" && test "x$enable_doc" != "xno"]) + + dnl Check for db_dump, db_load (optional). AC_CHECK_PROGS([DB_DUMP], @@ -683,6 +700,9 @@ []) dnl Readline. +dnl TODO - add ncurses LDFLGS separately +dnl build --without-redline in fact broken with -lncurses not inherited + AC_ARG_WITH([readline], [AS_HELP_STRING([--with-readline], [support fancy command line editing @<:@default=check@:>@])], @@ -1051,11 +1071,13 @@ [test -n "$RUBY" && test -n "$RAKE" && test -n "$have_libruby"]) dnl Check for Java. -AC_ARG_WITH(java_home, - [AS_HELP_STRING([--with-java-home], - [specify path to JDK directory @<:@default=check@:>@])], - [], - [with_java_home=check]) +AC_ARG_ENABLE([java], + AS_HELP_STRING([--enable-java], [Disable Java language bindings]), + [enable_java=no], + [enable_java=yes]) + +AS_IF([test "x$enable_java" = "xyes"], + [ if test "x$with_java_home" != "xno"; then if test "x$with_java_home" != "xyes" && test "x$with_java_home" != "xcheck" @@ -1201,7 +1223,9 @@ AC_SUBST(JNI_INSTALL_DIR) AC_SUBST(JNI_VERSION_INFO) -AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC"]) + +]) +AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC" && test "x$enable_java" != "xno"]) dnl Check for Haskell (GHC). GHC=no @@ -1338,8 +1362,9 @@ dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html -LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool' +dnl LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool' AC_SUBST([LIBTOOL]) +LT_INIT dnl Produce output files. AC_CONFIG_HEADERS([config.h]) diff --git a/inspector/Makefile.am b/inspector/Makefile.am --- a/inspector/Makefile.am +++ b/inspector/Makefile.am @@ -40,7 +40,7 @@ CLEANFILES = stamp-virt-inspector.pod -docdir = @docdir@ +docdir = @docdir@/examples dist_doc_DATA = \ virt-inspector.rng \ $(EXAMPLE_XML)