Skip to content

Commit 3140f65

Browse files
committed
auth geoipbackend: link C++ filesystem lib if necessary
1 parent 5ff6179 commit 3140f65

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

configure.ac

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,11 +309,12 @@ LDFLAGS="$RELRO_LDFLAGS $LDFLAGS"
309309

310310
CFLAGS="$PIE_CFLAGS $CFLAGS"
311311
CXXFLAGS="$PIE_CFLAGS $CXXFLAGS"
312-
PROGRAM_LDFLAGS="$PIE_LDFLAGS $PROGRAM_LDFLAGS"
313312
AS_IF([test "$ax_cxx_cv_filesystem_lib" != "none"],
314-
[PROGRAM_LDFLAGS="$PROGRAM_LDFLAGS -l$ax_cxx_cv_filesystem_lib"],
313+
[CXXFS_LIBS="-l$ax_cxx_cv_filesystem_lib"],
315314
[]
316315
)
316+
AC_SUBST([CXXFS_LIBS])
317+
PROGRAM_LDFLAGS="$PIE_LDFLAGS $PROGRAM_LDFLAGS $CXXFS_LIBS"
317318
AC_SUBST([PROGRAM_LDFLAGS])
318319

319320
PDNS_ENABLE_COVERAGE

modules/geoipbackend/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ libgeoipbackend_la_SOURCES = \
1111
geoipinterface.cc geoipinterface.hh
1212

1313
libgeoipbackend_la_LDFLAGS = -module -avoid-version
14-
libgeoipbackend_la_LIBADD = $(YAML_LIBS) $(GEOIP_LIBS) $(MMDB_LIBS)
14+
libgeoipbackend_la_LIBADD = $(YAML_LIBS) $(GEOIP_LIBS) $(MMDB_LIBS) $(CXXFS_LIBS)

0 commit comments

Comments
 (0)