VladPolskiy/mod_tile
1
0
Fork 0
mirror of https://github.com/openstreetmap/mod_tile.git synced 2026-01-14 00:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert previous commit as it broke builds under some conditions.

Browse Source 
The following errors appeared on Ubuntu builds:

cc1: warning: command line option '-ftemplate-depth=300' is valid for C++/ObjC++ but not for C [enabled by default]
In file included from store.h:9:0,
                 from store.c:21:
render_config.h:6:1: error: expected identifier or '(' before '/' token
render_config.h:15:1: error: stray '#' in program
...

As I don't know why this broke, or how to fix it, I am reverting this patch for now. It also only triggeres after a make distclean
This commit is contained in:
Kai Krueger
2013-03-02 15:37:30 +00:00
parent 80cd238d06
commit 23be0365a9
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -3,14 +3,13 @@ SUBDIRS = iniparser3.0b
ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = $(PTHREAD_CFLAGS) $(shell mapnik-config --cflags)
AM_CPPFLAGS = $(FT2_CFLAGS) $(PTHREAD_CFLAGS) $(BOOST_CPPFLAGS) $(ICU_CPPFLAGS)
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_LDFLAGS = $(shell mapnik-config --ldflags --libs --dep-libs)
renderd_LDADD = $(PTHREAD_CFLAGS) -Liniparser3.0b/.libs -liniparser
renderd_LDADD = $(FT2_LIBS) $(PTHREAD_CFLAGS) $(MAPNIK_LDFLAGS) $(BOOST_LDFLAGS) $(ICU_LDFLAGS) -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

3
configure.ac
View File

@ -32,11 +32,14 @@ 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],[],[])