Meson: Rely on the correct pg_config variables for Postgres

diff --git a/meson/pgsql/meson.build b/meson/pgsql/meson.build
index b51a472a904982ca1df3540bc0720deebd92de47..0374c3d4009565e4b401a8161a9da8fed206da2b 100644 (file)
--- a/meson/pgsql/meson.build
+++ b/meson/pgsql/meson.build
@@ -3,21 +3,32 @@ dep_pgsql = dependency('libpq', required: false)
 if not dep_pgsql.found()
   pg_config = find_program('pg_config', required: true)
 
-  pg_cflags_res = run_command(pg_config, '--cflags', check: true)
-  pg_cflags = pg_cflags_res.stdout().strip().split()
+  pg_includedir_res = run_command(pg_config, '--includedir', check: true)
+  pg_includedir = pg_includedir_res.stdout().strip()
 
-  pg_cppflags_res = run_command(pg_config, '--cppflags', check: true)
-  pg_cppflags = pg_cppflags_res.stdout().strip().split()
+  # pg_cflags_res = run_command(pg_config, '--cflags', check: true)
+  # pg_cflags = pg_cflags_res.stdout().strip().split()
 
-  pg_ldflags_res = run_command(pg_config, '--libs', check: true)
-  pg_ldflags = pg_ldflags_res.stdout().strip().split()
+  # pg_cppflags_res = run_command(pg_config, '--cppflags', check: true)
+  # pg_cppflags = pg_cppflags_res.stdout().strip().split()
+
+  # pg_ldflags_res = run_command(pg_config, '--libs', check: true)
+  # pg_ldflags = pg_ldflags_res.stdout().strip().split()
+
+  pg_libdir_res = run_command(pg_config, '--libdir', check: true)
+  pg_libdir = pg_libdir_res.stdout().strip()
+
+  # pg_libs_res = run_command(pg_config, '--libs', check: true)
+  # pg_libs = pg_libs_res.stdout().strip().split()
 
   pg_version_res = run_command(pg_config, '--version', check: true)
   pg_version = pg_version_res.stdout().strip().split()[1]
 
   dep_pgsql = declare_dependency(
-    compile_args: pg_cflags + pg_cppflags,
-    link_args: pg_ldflags,
+    # compile_args: pg_cflags + pg_cppflags,
+    # link_args: pg_ldflags,
+    compile_args: '-I' + pg_includedir,
+    link_args: ['-L' + pg_libdir, '-lpq'],
     version: pg_version,
   )
 endif