diff --git a/Makefile.am b/Makefile.am index ca22f25..4b41cfa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,13 +3,14 @@ SUBDIRS = iniparser3.0b ACLOCAL_AMFLAGS = -I m4 -AM_CPPFLAGS = $(FT2_CFLAGS) $(PTHREAD_CFLAGS) $(BOOST_CPPFLAGS) $(ICU_CPPFLAGS) +AM_CPPFLAGS = $(PTHREAD_CFLAGS) $(shell mapnik-config --cflags) bin_PROGRAMS = render_old render_expired render_list speedtest render_old renderd convert_meta renderddir = $(sysconfdir) renderd_SOURCES = protocol.h store.c daemon.h daemon.c daemon_compat.c gen_tile.h gen_tile.cpp dir_utils.c sys_utils.c sys_utils.h render_config.h dir_utils.h store.h iniparser3.0b/libiniparser.la -renderd_LDADD = $(FT2_LIBS) $(PTHREAD_CFLAGS) $(MAPNIK_LDFLAGS) $(BOOST_LDFLAGS) $(ICU_LDFLAGS) -Liniparser3.0b/.libs -liniparser +renderd_LDFLAGS = $(shell mapnik-config --ldflags --libs --dep-libs) +renderd_LDADD = $(PTHREAD_CFLAGS) -Liniparser3.0b/.libs -liniparser renderd_DATA = renderd.conf speedtest_SOURCES = render_config.h protocol.h dir_utils.c dir_utils.h speedtest.cpp render_list_SOURCES = render_config.h protocol.h dir_utils.c dir_utils.h render_list.c sys_utils.c sys_utils.h diff --git a/configure.ac b/configure.ac index b87403c..3c04c7c 100644 --- a/configure.ac +++ b/configure.ac @@ -32,14 +32,11 @@ AC_TYPE_UINT64_T AC_FUNC_MALLOC AC_FUNC_MKTIME -AC_CHECK_FT2 AX_PTHREAD(,[AC_MSG_ERROR([no])]) AC_SEARCH_LIBS(socket, socket) AC_SEARCH_LIBS(inet_ntoa, nsl) AC_SEARCH_LIBS(gethostbyname, resolv nsl) AC_SEARCH_LIBS(pow,m) -AX_BOOST_BASE -AC_CHECK_ICU(4.2) AX_LIB_MAPNIK AC_CHECK_FUNCS([bzero gethostbyname gettimeofday inet_ntoa memset mkdir pow select socket strchr strdup strerror strrchr strstr strtol strtoul utime],[],[AC_MSG_ERROR([One of the required functions was not found])]) AC_CHECK_FUNCS([daemon getloadavg],[],[])