From 9cafd5b42d73945841a779c3c62d1e784ea95fb3 Mon Sep 17 00:00:00 2001 From: deva Date: Wed, 27 Apr 2011 09:09:42 +0000 Subject: Add pkg-config init and with-praxisd parameter. --- server/configure.in | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/server/configure.in b/server/configure.in index dc7856c..068d8c0 100644 --- a/server/configure.in +++ b/server/configure.in @@ -33,6 +33,28 @@ then fi #AM_CONDITIONAL(HAVE_INOTIFY, [test "$inotify_support" = "yes"]) +dnl ====================== +dnl Init pkg-config +dnl ====================== +PKG_PROG_PKG_CONFIG(0.23) + +dnl ====================== +dnl Compile with praxisd support +dnl ====================== +AC_ARG_WITH(praxisd, + [ --with-praxisd build with praxisd support (default=yes)], + [], + [with_praxisd=yes]) +if test x$with_praxisd == xno; then + AC_MSG_WARN([*** Building without praxisd support!]) +else + AC_DEFINE_UNQUOTED(WITH_PRAXISD, , [The project is configured to use praxisd]) + dnl ====================== + dnl Check for cURL library + dnl ====================== + PKG_CHECK_MODULES(CURL, libcurl >= 7.9.5) +fi + dnl ====================== dnl Compile with artefact support dnl ====================== @@ -93,8 +115,6 @@ else dnl ====================== fi -PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7) - AC_PROG_CXX AC_PROG_LIBTOOL @@ -168,6 +188,10 @@ dnl Check for libmicrohttpd dnl ====================== PKG_CHECK_MODULES(HTTPD, libmicrohttpd >= 0.4.4) +dnl ====================== +dnl Compile with openssl +dnl ====================== +PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7) dnl ====================== dnl Check for eXpat library @@ -219,11 +243,6 @@ LIBS="$tmp_LIBS" AC_SUBST(PTHREAD_CFLAGS) AC_SUBST(PTHREAD_LIBS) -dnl ====================== -dnl Check for cURL library -dnl ====================== -PKG_CHECK_MODULES(CURL, libcurl >= 7.9.5) - AC_OUTPUT( Makefile src/Makefile -- cgit v1.2.3