From f0e0cef1cf7a32c8cd5bc5d86ad2f169f3ac18d5 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Fri, 6 May 2022 08:54:54 +0100
Subject: Tweak the compiler flags for extra modules a bit.

- Use pkg-config for the pgsql module.
- Remove defaults from argon2, geo_maxmind, and regex_re2 (these
  are not needed with newer package versions).
- Remove old library warning from geo_maxmind (no longer needed).

[skip windows ci]
---
 src/modules/extra/m_argon2.cpp      | 4 ++--
 src/modules/extra/m_geo_maxmind.cpp | 6 ++----
 src/modules/extra/m_mysql.cpp       | 1 +
 src/modules/extra/m_pgsql.cpp       | 4 ++--
 src/modules/extra/m_regex_re2.cpp   | 4 ++--
 5 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/extra/m_argon2.cpp b/src/modules/extra/m_argon2.cpp
index c1ee37e6c..48554cc6d 100644
--- a/src/modules/extra/m_argon2.cpp
+++ b/src/modules/extra/m_argon2.cpp
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/// $CompilerFlags: find_compiler_flags("libargon2" "")
-/// $LinkerFlags: find_linker_flags("libargon2" "-largon2")
+/// $CompilerFlags: find_compiler_flags("libargon2")
+/// $LinkerFlags: find_linker_flags("libargon2")
 
 /// $PackageInfo: require_system("arch") argon2 pkgconf
 /// $PackageInfo: require_system("darwin") argon2 pkg-config
diff --git a/src/modules/extra/m_geo_maxmind.cpp b/src/modules/extra/m_geo_maxmind.cpp
index 52213ad73..6a69d4a0e 100644
--- a/src/modules/extra/m_geo_maxmind.cpp
+++ b/src/modules/extra/m_geo_maxmind.cpp
@@ -17,10 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/// $CompilerFlags: require_version("libmaxminddb" "0" "1.2.1") warning("The version of libmaxminddb you are using may cause a segmentation fault if given a corrupt database file!")
-/// $CompilerFlags: find_compiler_flags("libmaxminddb" "")
-
-/// $LinkerFlags: find_linker_flags("libmaxminddb" "-lmaxminddb")
+/// $CompilerFlags: find_compiler_flags("libmaxminddb")
+/// $LinkerFlags: find_linker_flags("libmaxminddb")
 
 /// $PackageInfo: require_system("arch") libmaxminddb pkgconf
 /// $PackageInfo: require_system("darwin") libmaxminddb pkg-config
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 34c02fa38..9e1406578 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -26,6 +26,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 /// $CompilerFlags: execute("mysql_config --include" "MYSQL_CXXFLAGS")
 /// $LinkerFlags: execute("mysql_config --libs_r" "MYSQL_LDFLAGS" "-lmysqlclient")
 
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 86dcfe6ce..30d2690a6 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -27,8 +27,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/// $CompilerFlags: -isystem execute("pg_config --includedir" "POSTGRESQL_INCLUDE_DIR")
-/// $LinkerFlags: -Lexecute("pg_config --libdir" "POSTGRESQL_LIBRARY_DIR") -lpq
+/// $CompilerFlags: find_compiler_flags("libpq")
+/// $LinkerFlags: find_linker_flags("libpq")
 
 /// $PackageInfo: require_system("arch") postgresql-libs
 /// $PackageInfo: require_system("centos") postgresql-devel
diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp
index 5bf239e03..fdddd242a 100644
--- a/src/modules/extra/m_regex_re2.cpp
+++ b/src/modules/extra/m_regex_re2.cpp
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/// $CompilerFlags: find_compiler_flags("re2" "")
-/// $LinkerFlags: find_linker_flags("re2" "-lre2")
+/// $CompilerFlags: find_compiler_flags("re2")
+/// $LinkerFlags: find_linker_flags("re2")
 
 /// $PackageInfo: require_system("arch") pkgconf re2
 /// $PackageInfo: require_system("darwin") pkg-config re2
-- 
cgit v1.3.1-10-gc9f91