walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Don't add mruby related CPPFLAGS and LDFLAGS if it is disabled 

Setting unused -L really makes libtool get angry
This commit is contained in:
Tatsuhiro Tsujikawa 2015-09-05 18:03:05 +09:00
parent aba7e9e7f9
commit d076d54f67
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -31,7 +31,7 @@ before_script:
- autoreconf -i - autoreconf -i
- automake - automake
- autoconf - autoconf
- ./configure --enable-werror - ./configure --enable-werror --with-mruby
script: script:
- make - make
- make check - make check

23
src/Makefile.am
View File

@ -141,13 +141,16 @@ endif # HAVE_MRUBY
noinst_LIBRARIES = libnghttpx.a noinst_LIBRARIES = libnghttpx.a
libnghttpx_a_SOURCES = ${NGHTTPX_SRCS} libnghttpx_a_SOURCES = ${NGHTTPX_SRCS}
libnghttpx_a_CPPFLAGS = ${AM_CPPFLAGS} \ libnghttpx_a_CPPFLAGS = ${AM_CPPFLAGS}
-I${top_srcdir}/third-party/mruby/include @LIBMRUBY_CFLAGS@
nghttpx_SOURCES = shrpx.cc shrpx.h nghttpx_SOURCES = shrpx.cc shrpx.h
nghttpx_CPPFLAGS = ${libnghttpx_a_CPPFLAGS} nghttpx_CPPFLAGS = ${libnghttpx_a_CPPFLAGS}
nghttpx_LDADD = libnghttpx.a ${LDADD} \ nghttpx_LDADD = libnghttpx.a ${LDADD}
-L${top_builddir}/third-party/mruby/build/lib @LIBMRUBY_LIBS@
if HAVE_MRUBY
nghttpx_CPPFLAGS += -I${top_srcdir}/third-party/mruby/include @LIBMRUBY_CFLAGS@
nghttpx_LDADD += -L${top_builddir}/third-party/mruby/build/lib @LIBMRUBY_LIBS@
endif # HAVE_MRUBY
if HAVE_CUNIT if HAVE_CUNIT
check_PROGRAMS += nghttpx-unittest check_PROGRAMS += nghttpx-unittest
@ -162,11 +165,15 @@ nghttpx_unittest_SOURCES = shrpx-unittest.cc \
buffer_test.cc buffer_test.h \ buffer_test.cc buffer_test.h \
memchunk_test.cc memchunk_test.h memchunk_test.cc memchunk_test.h
nghttpx_unittest_CPPFLAGS = ${AM_CPPFLAGS} \ nghttpx_unittest_CPPFLAGS = ${AM_CPPFLAGS} \
-I${top_srcdir}/third-party/mruby/include @LIBMRUBY_CFLAGS@ \
-DNGHTTP2_TESTS_DIR=\"$(top_srcdir)/tests\" -DNGHTTP2_TESTS_DIR=\"$(top_srcdir)/tests\"
nghttpx_unittest_LDADD = libnghttpx.a ${LDADD} \ nghttpx_unittest_LDADD = libnghttpx.a ${LDADD} @CUNIT_LIBS@ @TESTLDADD@
-L${top_builddir}/third-party/mruby/build/lib @LIBMRUBY_LIBS@ \
@CUNIT_LIBS@ @TESTLDADD@ if HAVE_MRUBY
nghttpx_unittest_CPPFLAGS += \
-I${top_srcdir}/third-party/mruby/include @LIBMRUBY_CFLAGS@
nghttpx_unittest_LDADD += \
-L${top_builddir}/third-party/mruby/build/lib @LIBMRUBY_LIBS@
endif # HAVE_MRUBY
TESTS += nghttpx-unittest TESTS += nghttpx-unittest
endif # HAVE_CUNIT endif # HAVE_CUNIT