From b867ce936b1aab79a77e7a8a0fab5afaab872e47 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Fri, 13 Dec 2013 11:32:25 +0100 Subject: make libplist dependency/protov1 support mandatory --- configure.ac | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index b730ebf..e259eb3 100644 --- a/configure.ac +++ b/configure.ac @@ -26,30 +26,9 @@ AM_PROG_CC_C_O AC_PROG_LIBTOOL # Checks for libraries. -PKG_CHECK_MODULES(libplist, libplist >= 1.9, have_plist=yes, have_plist=no) +PKG_CHECK_MODULES(libplist, libplist >= 1.11) AC_CHECK_HEADERS([sys/inotify.h], have_inotify=yes, have_inotify=no) -AC_ARG_WITH([protov1], - [AS_HELP_STRING([--without-protov1], - [do not build with protocol v1 support (default is yes)])], - [with_protov1=no], - [with_protov1=yes]) - -if test "x$have_plist" = "xyes"; then - if test "x$with_protov1" != "xyes"; then - have_plist=no - echo "*** Note: Protocol V1 support has been disabled ***" - else - AC_DEFINE(HAVE_PLIST, 1, [Define if you have libplist support]) - AC_SUBST(libplist_CFLAGS) - AC_SUBST(libplist_LIBS) - fi -else - if test "x$with_protov1" == "xyes"; then - AC_MSG_ERROR([protocol V1 support requested but libplist could not be found]) - fi -fi - AC_ARG_WITH([inotify], [AS_HELP_STRING([--without-inotify], [(Linux only) do not build with inotify support (default is yes)])], @@ -120,7 +99,6 @@ Configuration for $PACKAGE $VERSION: ------------------------------------------- Install prefix: .........: $prefix - Protocol v1 support: ....: $have_plist inotify support (Linux) .: $have_inotify Now type 'make' to build $PACKAGE $VERSION, -- cgit v1.1-32-gdbae