From b5d0a3db5b179aafd9a3cfcb7e43288424fa110e Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Tue, 16 Jul 2013 11:49:30 +0100 Subject: [PATCH 1/1] Make `rfreezefs' optional, conditioned on whether we find mLib. --- Makefile.am | 10 ++++++++-- configure.ac | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4fa8227..18bceaa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,8 +28,10 @@ sbin_SCRIPTS = sbin_PROGRAMS = dist_noinst_SCRIPTS = dist_man_MANS = +man_MANS = EXTRA_DIST = +EXTRA_PROGRAMS = CLEANFILES = DISTCLEANFILES = @@ -59,10 +61,14 @@ SUBST = $(V_SUBST)$(confsubst) ###-------------------------------------------------------------------------- ### Programs and scripts. -sbin_PROGRAMS += rfreezefs -dist_man_MANS += rfreezefs.8 +EXTRA_PROGRAMS += rfreezefs rfreezefs_SOURCES = rfreezefs.c rfreezefs_LDADD = $(mLib_LIBS) +EXTRA_DIST += rfreezefs.8 +if HAVE_MLIB +sbin_PROGRAMS += rfreezefs +man_MANS += rfreezefs.8 +endif sbin_SCRIPTS += rsync-backup dist_man_MANS += rsync-backup.8 diff --git a/configure.ac b/configure.ac index e03e400..66c16e7 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,8 @@ dnl Programming environments. dnl C compilers and libraries. AC_PROG_CC AX_CFLAGS_WARN_ALL -PKG_CHECK_MODULES([mLib], [mLib >= 2.1.0]) +PKG_CHECK_MODULES([mLib], [mLib >= 2.1.0], [have_mlib=t], [have_mlib=nil]) +AM_CONDITIONAL([HAVE_MLIB], [test $have_mlib = t]) dnl Bourne-Again Shell. AC_PATH_PROG([BASH], [bash]) -- 2.11.0