From: Peter van Dijk Date: Mon, 13 Oct 2014 07:36:26 +0000 (+0200) Subject: Merge pull request #1804 from rubenk/conditionalize-lua X-Git-Tag: rec-3.7.0-rc1~189^2~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e6d46d944727bc419ac165c3a3448f20842df8b;p=thirdparty%2Fpdns.git Merge pull request #1804 from rubenk/conditionalize-lua Only add LUA_CFLAGS and LUA_LIBS if we have lua --- 3e6d46d944727bc419ac165c3a3448f20842df8b diff --cc pdns/Makefile.am index 935b827ef0,7dfcfb279d..0dfe883c1a --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@@ -6,9 -6,10 +6,8 @@@ AM_CXXFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" \ -DPKGLIBDIR=\"$(pkglibdir)\" \ -DLOCALSTATEDIR=\"$(socketdir)\" \ - $(LUA_CFLAGS) \ $(POLARSSL_CFLAGS) -YAHTTP_LIBS = -Lext/yahttp/yahttp -lyahttp - AM_LFLAGS = -i AM_YFLAGS = -d --verbose --debug