github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix building with -Wl,--as-needed linker option with older ld versions

Browse Source
This commit is contained in:
Andrei Belov 2016-12-09 12:49:00 +03:00 committed by Felipe Zimmerle
parent 31d5d79089
commit a3787fedb8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/Makefile.am
View File

@ -38,14 +38,14 @@ noinst_HEADERS = \
regression/*.h regression/*.h
unit_tests_LDADD = \ unit_tests_LDADD = \
$(GLOBAL_LDADD) \
$(top_builddir)/src/.libs/libmodsecurity.a \ $(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(YAJL_LDFLAGS) $(YAJL_LDADD) \ $(YAJL_LDFLAGS) $(YAJL_LDADD) \
$(LMDB_LDFLAGS) $(LMDB_LDADD) \ $(LMDB_LDFLAGS) $(LMDB_LDADD) \
$(LIBXML2_LDADD) $(LIBXML2_LDADD) \
$(GLOBAL_LDADD)
unit_tests_CPPFLAGS = \ unit_tests_CPPFLAGS = \
@ -74,14 +74,14 @@ regression_tests_SOURCES = \
regression/custom_debug_log.cc regression/custom_debug_log.cc
regression_tests_LDADD = \ regression_tests_LDADD = \
$(GLOBAL_LDADD) \
$(top_builddir)/src/.libs/libmodsecurity.a \ $(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(YAJL_LDFLAGS) $(YAJL_LDADD) \ $(YAJL_LDFLAGS) $(YAJL_LDADD) \
$(LMDB_LDFLAGS) $(LMDB_LDADD) \ $(LMDB_LDFLAGS) $(LMDB_LDADD) \
$(LIBXML2_LDADD) $(LIBXML2_LDADD) \
$(GLOBAL_LDADD)
regression_tests_CPPFLAGS = \ regression_tests_CPPFLAGS = \
@ -109,14 +109,14 @@ rules_optimization_SOURCES = \
optimization/optimization.cc optimization/optimization.cc
rules_optimization_LDADD = \ rules_optimization_LDADD = \
$(GLOBAL_LDADD) \
$(top_builddir)/src/.libs/libmodsecurity.a \ $(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(YAJL_LDFLAGS) $(YAJL_LDADD) \ $(YAJL_LDFLAGS) $(YAJL_LDADD) \
$(LMDB_LDFLAGS) $(LMDB_LDADD) \ $(LMDB_LDFLAGS) $(LMDB_LDADD) \
$(LIBXML2_LDADD) $(LIBXML2_LDADD) \
$(GLOBAL_LDADD)
rules_optimization_CPPFLAGS = \ rules_optimization_CPPFLAGS = \

4
test/benchmark/Makefile.am
View File

@ -6,14 +6,14 @@ benchmark_SOURCES = \
benchmark.cc benchmark.cc
benchmark_LDADD = \ benchmark_LDADD = \
$(GLOBAL_LDADD) \
$(top_builddir)/src/.libs/libmodsecurity.a \ $(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(YAJL_LDFLAGS) $(YAJL_LDADD) \ $(YAJL_LDFLAGS) $(YAJL_LDADD) \
$(LMDB_LDFLAGS) $(LMDB_LDADD) \ $(LMDB_LDFLAGS) $(LMDB_LDADD) \
$(LIBXML2_LDADD) $(LIBXML2_LDADD) \
$(GLOBAL_LDADD)
benchmark_CPPFLAGS = \ benchmark_CPPFLAGS = \
-std=c++11 \ -std=c++11 \