From ea16d760117c3d9f60a9c34968e0df94b6ea1acd Mon Sep 17 00:00:00 2001 From: Ove Kåven Date: Sun, 5 Aug 2012 04:07:37 +0200 Subject: Various packaging and build system patches for the Maemo 5 port. --- configure.ac | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index bf6b19ae..704da463 100644 --- a/configure.ac +++ b/configure.ac @@ -44,7 +44,7 @@ if test "$enable_release_mode" = "yes"; then AC_DEFINE(SYNCEVOLUTION_STABLE_RELEASE, 1, [binary is meant for end-users]) fi -AM_INIT_AUTOMAKE([1.11.1 silent-rules subdir-objects -Wno-portability]) +AM_INIT_AUTOMAKE([subdir-objects -Wno-portability]) AM_PROG_CC_C_O @@ -55,7 +55,8 @@ dnl Specify git revisions/branches without prefix, i.e., without 'origin'. dnl We'll sort that out below. define([SYNTHESISSRC_REVISION], [syncevolution-0.9]) AC_CONFIG_HEADERS(config.h) -LT_INIT([dlopen]) +AC_LIBTOOL_DLOPEN +AC_PROG_LIBTOOL dnl check for programs. AC_PROG_CXX @@ -615,7 +616,11 @@ AX_BOOST_BASE(1.34) # C++ regular expression support is required often enough to make it # mandatory. -PKG_CHECK_MODULES(PCRECPP, libpcrecpp) +PKG_CHECK_MODULES(PCRECPP, libpcrecpp,, +AC_CHECK_LIB(pcrecpp,main, +AC_SUBST(PCRECPP_LIBS,-lpcrecpp), +AC_MSG_ERROR([pcrecpp not found]) +)) # need rst2man for man pages AC_ARG_WITH(rst2man, -- cgit v1.2.3