mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
use automake-1.11's silent-rules option, when possible
Don't use mylibtool, (subsumed by automake's silent rules) Its use was causing a non-srcdir build to fail. * Makefile.am (EXTRA_DIST): Remove mylibtool. * configure.in: Don't use mylibtool. * configure.in: Use AM_SILENT_RULES([yes]), but only if that m4 macro is defined. Thus, it works even on systems that lack automake-1.11. Daniel Berrange suggested adding the conditional, so that we don't have a hard requirement on 1.11, e.g., for RHEL5.
This commit is contained in:
parent
aef9746874
commit
b731d7830e
@ -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
|
||||
|
||||
|
@ -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=
|
||||
|
Loading…
Reference in New Issue
Block a user