summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3fbe261)
raw | patch | inline | side by side (parent: 3fbe261)
author | Florian Forster <octo@noris.net> | |
Tue, 18 Jan 2011 14:54:56 +0000 (15:54 +0100) | ||
committer | Florian Forster <octo@noris.net> | |
Tue, 18 Jan 2011 14:54:56 +0000 (15:54 +0100) |
configure.ac | patch | blob | history | |
src/Makefile.am | patch | blob | history |
diff --git a/configure.ac b/configure.ac
index ebbc6c6fc40ed2981494c698894bc353df842f90..e27fd542bc2f4f40aeaae773f10601c5a1431393 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_PROG_INSTALL
AC_PROG_LEX
AC_PROG_YACC
+PKG_PROG_PKG_CONFIG
AM_CONDITIONAL(COMPILER_IS_GCC, test "x$GCC" = "xyes")
#
AC_CHECK_LIB(yajl, yajl_gen_alloc, [],
[AC_MSG_ERROR(cannot find libyajl.)])
+PKG_CHECK_MODULES([libcollectdclient], [libcollectdclient],
+ [with_libcollectdclient="yes"],
+ [with_libcollectdclient="no"])
+
AC_OUTPUT(Makefile share/Makefile src/Makefile)
diff --git a/src/Makefile.am b/src/Makefile.am
index 766331f491f2bb030ab0c3b7f912338e58f0cfa1..9595ebd988e7342c5d2b997e0856cf6f3e526554 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
utils_array.c utils_array.h \
utils_cgi.c utils_cgi.h \
utils_search.c utils_search.h
+collection_fcgi_CFLAGS = $(AM_CFLAGS) $(libcollectdclient_CFLAGS)
+collection_fcgi_LDADD = $(libcollectdclient_LIBS)