diff --git a/Makefile.am b/Makefile.am index 681034a334..7a3438edae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,8 +19,7 @@ EXTRA_DIST = \ .x-sc_require_config_h \ .x-sc_prohibit_nonreentrant \ Makefile.nonreentrant \ - autogen.sh \ - mylibtool + autogen.sh man_MANS = virsh.1 diff --git a/configure.in b/configure.in index 29c8867dce..552089a881 100644 --- a/configure.in +++ b/configure.in @@ -6,6 +6,11 @@ AC_CONFIG_AUX_DIR([build-aux]) AM_CONFIG_HEADER([config.h]) dnl Make automake keep quiet about wildcards & other GNUmake-isms AM_INIT_AUTOMAKE([-Wno-portability]) + +# Use the silent-rules feature when possible. +m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) +AM_SILENT_RULES([yes]) + AC_CANONICAL_HOST LIBVIRT_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'` @@ -58,10 +63,6 @@ dnl Support building Win32 DLLs (must appear *before* AM_PROG_LIBTOOL) AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL -dnl Override normal libtool in favour of our quiet version -LIBTOOL='$(SHELL) $(top_srcdir)/mylibtool' -AC_SUBST([LIBTOOL]) - AM_PROG_CC_C_O VERSION_SCRIPT_FLAGS=-Wl,--version-script=