sync

commit 9f5600aa5af200650fa21a49b728f4d4716618b1
parent 994b65bc7731c5acc0d260f4fbeee754213968be
Author: Iván Ávalos <avalos@disroot.org>
Date:   Tue, 26 May 2026 10:37:33 +0200

fix build with libmicrohttpd2

Diffstat:
M
meson.build
 | 
13
++++++++++++-
M
src/sync/meson.build
 | 
6
+++---
R
src/sync/sync-httpd2_backup-post.c -> src/sync/sync-httpd2_backup_post.c
 | 
0

3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
@@ -71,7 +71,7 @@ if not get_option('only-doc')
 
     mhd2_dep = dependency('libmicrohttpd2', required: false)
     if not mhd2_dep.found()
-        mhd_dep2 = cc.find_library('microhttpd2', required: false)
+        mhd2_dep = cc.find_library('microhttpd2', required: false)
     endif
 
     json_dep = dependency('jansson', required: false)
@@ -223,6 +223,17 @@ if not get_option('only-doc')
     )
     private_config.set10('HAVE_TALERMHD', talermhd_dep.found())
 
+    talermhd2_dep = dependency('talermhd2', required: false)
+    if not talermhd2_dep.found()
+        talermhd2_dep = cc.find_library('talermhd2', required: true)
+    endif
+    cc.has_header_symbol(
+        'taler/taler_mhd2_lib.h',
+        'TALER_MHD2_get_date_string',
+        required: true,
+        dependencies: [talermhd2_dep],
+    )
+    private_config.set10('HAVE_TALERMHD2', talermhd2_dep.found())
 
     talerjson_dep = dependency('talerjson', required: false)
     if not talerjson_dep.found()
diff --git a/src/sync/meson.build b/src/sync/meson.build
@@ -27,15 +27,14 @@ executable(
     install: true,
 )
 
-if mhd2_dep.found()
+if mhd2_dep.found() and talermhd2_dep.found()
     executable(
         'sync-httpd2',
         [
             'sync-httpd2.c',
             'sync-httpd2_backup.c',
-            'sync-httpd2_backup-post.c',
+            'sync-httpd2_backup_post.c',
             'sync-httpd2_config.c',
-            'sync-httpd2_mhd.c',
         ],
         dependencies: [
             libsyncutil_dep,
@@ -44,6 +43,7 @@ if mhd2_dep.found()
             talerjson_dep,
             talermerchant_dep,
             talermhd_dep,
+            talermhd2_dep,
             gnunetutil_dep,
             gnunetjson_dep,
             gnunetcurl_dep,
diff --git a/src/sync/sync-httpd2_backup-post.c b/src/sync/sync-httpd2_backup_post.c