7 files changed, 44 insertions, 31 deletions

diff --git a/contrib/gana b/contrib/gana
-Subproject c9bda21875ea1775f88b71de735d527132e4592
+Subproject c1dc2dc975742c929a523c22d91f7d4f8278723
diff --git a/contrib/sphinx b/contrib/sphinx
-Subproject 0cccef450b037a48170402117f7d3b6c0a4272a
+Subproject 9c5b9d9040d21542eff792e26624cf9669b127a
diff --git a/meson.build b/meson.build
index 513a8da99..a827c1796 100644
--- a/meson.build
+++ b/meson.build
@@ -104,7 +104,7 @@ if not sqlite_dep.found()
 endif
 curl_dep = dependency('libcurl', version: '>=7.85.0', required : false)
 if not curl_dep.found()
-  curl_dep = cc.find_library('curl', version: '>=7.85.0',  required : true)
+  curl_dep = cc.find_library('curl', required : true)
 endif
 zlib_dep = dependency('zlib', required : false)
 if not zlib_dep.found()
diff --git a/src/datacache/meson.build b/src/datacache/meson.build
index b61a5e2a7..8613e527f 100644
--- a/src/datacache/meson.build
+++ b/src/datacache/meson.build
@@ -31,10 +31,12 @@ shared_module('gnunet_plugin_datacache_sqlite',
                        sqlite_dep,
                        libgnunetsq_dep],
         include_directories: [incdir, configuration_inc])
-shared_module('gnunet_plugin_datacache_postgres',
-        ['plugin_datacache_postgres.c'],
-        dependencies: [libgnunetutil_dep,
-                       libgnunetdatacache_dep,
-                       pq_dep,
-                       libgnunetpq_dep],
-        include_directories: [incdir, configuration_inc])
+if pq_dep.found()
+  shared_module('gnunet_plugin_datacache_postgres',
+          ['plugin_datacache_postgres.c'],
+          dependencies: [libgnunetutil_dep,
+                         libgnunetdatacache_dep,
+                         pq_dep,
+                         libgnunetpq_dep],
+          include_directories: [incdir, configuration_inc])
+endif
diff --git a/src/datastore/meson.build b/src/datastore/meson.build
index e54340f8c..6c83b228b 100644
--- a/src/datastore/meson.build
+++ b/src/datastore/meson.build
@@ -35,13 +35,16 @@ shared_module('gnunet_plugin_datastore_sqlite',
                        sqlite_dep,
                        libgnunetsq_dep],
         include_directories: [incdir, configuration_inc])
-shared_module('gnunet_plugin_datastore_postgres',
-        ['plugin_datastore_postgres.c'],
-        dependencies: [libgnunetutil_dep,
-                       libgnunetdatastore_dep,
-                       pq_dep,
-                       libgnunetpq_dep],
-        include_directories: [incdir, configuration_inc])
+
+if pq_dep.found()
+  shared_module('gnunet_plugin_datastore_postgres',
+          ['plugin_datastore_postgres.c'],
+          dependencies: [libgnunetutil_dep,
+                         libgnunetdatastore_dep,
+                         pq_dep,
+                         libgnunetpq_dep],
+          include_directories: [incdir, configuration_inc])
+endif
 
 executable ('gnunet-datastore',
             ['gnunet-datastore.c'],
diff --git a/src/namecache/meson.build b/src/namecache/meson.build
index 24c546c05..719d94c0b 100644
--- a/src/namecache/meson.build
+++ b/src/namecache/meson.build
@@ -34,13 +34,16 @@ shared_module('gnunet_plugin_namecache_sqlite',
                        sqlite_dep,
                        libgnunetsq_dep],
         include_directories: [incdir, configuration_inc])
-shared_module('gnunet_plugin_namecache_postgres',
-        ['plugin_namecache_postgres.c'],
-        dependencies: [libgnunetutil_dep,
-                       libgnunetgnsrecord_dep,
-                       pq_dep,
-                       libgnunetpq_dep],
-        include_directories: [incdir, configuration_inc])
+
+if pq_dep.found()
+  shared_module('gnunet_plugin_namecache_postgres',
+          ['plugin_namecache_postgres.c'],
+          dependencies: [libgnunetutil_dep,
+                         libgnunetgnsrecord_dep,
+                         pq_dep,
+                         libgnunetpq_dep],
+          include_directories: [incdir, configuration_inc])
+endif
 
 executable ('gnunet-namecache',
             gnunetnamecache_src,
diff --git a/src/namestore/meson.build b/src/namestore/meson.build
index 79396915e..5b20d93ae 100644
--- a/src/namestore/meson.build
+++ b/src/namestore/meson.build
@@ -17,6 +17,7 @@ if get_option('monolith')
   endforeach
   subdir_done()
 endif
+
 libgnunetnamestore = library('gnunetnamestore',
         libgnunetnamestore_src,
         soversion: '0.1.0',
@@ -37,15 +38,19 @@ shared_module('gnunet_plugin_namestore_sqlite',
                        libgnunetstatistics_dep,
                        sqlite_dep],
         include_directories: [incdir, configuration_inc])
-shared_module('gnunet_plugin_namestore_postgres',
-        ['plugin_namestore_postgres.c'],
-        dependencies: [libgnunetutil_dep,
-                       libgnunetgnsrecord_dep,
-                       libgnunetidentity_dep,
-                       libgnunetpq_dep,
-                       libgnunetstatistics_dep,
-                       pq_dep],
-        include_directories: [incdir, configuration_inc])
+
+if pq_dep.found()
+  shared_module('gnunet_plugin_namestore_postgres',
+          ['plugin_namestore_postgres.c'],
+          dependencies: [libgnunetutil_dep,
+                         libgnunetgnsrecord_dep,
+                         libgnunetidentity_dep,
+                         libgnunetpq_dep,
+                         libgnunetstatistics_dep,
+                         pq_dep],
+          include_directories: [incdir, configuration_inc])
+endif
+
 executable ('gnunet-namestore',
             gnunetnamestore_src,
             dependencies: [libgnunetnamestore_dep,