From ab91eb8cf5d79aa5d0386584b72c8cc5baa3ebf9 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Tue, 4 Jun 2024 13:01:36 +0200 Subject: [PATCH] auth geoipbackend: link C++ filesystem lib if necessary (cherry picked from commit 3140f65175c9b5636b8a2e6d074ed61ed41184fe) --- configure.ac | 5 +++-- modules/geoipbackend/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 348127854d..93a4e8cee7 100644 --- a/configure.ac +++ b/configure.ac @@ -309,11 +309,12 @@ LDFLAGS="$RELRO_LDFLAGS $LDFLAGS" CFLAGS="$PIE_CFLAGS $CFLAGS" CXXFLAGS="$PIE_CFLAGS $CXXFLAGS" -PROGRAM_LDFLAGS="$PIE_LDFLAGS $PROGRAM_LDFLAGS" AS_IF([test "$ax_cxx_cv_filesystem_lib" != "none"], - [PROGRAM_LDFLAGS="$PROGRAM_LDFLAGS -l$ax_cxx_cv_filesystem_lib"], + [CXXFS_LIBS="-l$ax_cxx_cv_filesystem_lib"], [] ) +AC_SUBST([CXXFS_LIBS]) +PROGRAM_LDFLAGS="$PIE_LDFLAGS $PROGRAM_LDFLAGS $CXXFS_LIBS" AC_SUBST([PROGRAM_LDFLAGS]) PDNS_ENABLE_COVERAGE diff --git a/modules/geoipbackend/Makefile.am b/modules/geoipbackend/Makefile.am index f9622206ff..f7ea40739f 100644 --- a/modules/geoipbackend/Makefile.am +++ b/modules/geoipbackend/Makefile.am @@ -11,4 +11,4 @@ libgeoipbackend_la_SOURCES = \ geoipinterface.cc geoipinterface.hh libgeoipbackend_la_LDFLAGS = -module -avoid-version -libgeoipbackend_la_LIBADD = $(YAML_LIBS) $(GEOIP_LIBS) $(MMDB_LIBS) +libgeoipbackend_la_LIBADD = $(YAML_LIBS) $(GEOIP_LIBS) $(MMDB_LIBS) $(CXXFS_LIBS) -- 2.47.2