use pkgconfig for gap and braiding

tobiasdiez · Dec 1, 2024 · 13a7538 · 13a7538
1 parent ad42de2
commit 13a7538
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/meson.build b/src/meson.build
@@ -113,9 +113,8 @@ if not linbox.found()
 endif
 mpc = cc.find_library('mpc')
 mpfi = cc.find_library('mpfi')
-# Cannot be found via pkg-config (pkg-config file will be added in 4.13)
-# Test for common.h header that was added in 4.12 as a indirect version check
-gap = cc.find_library('gap', has_headers: ['gap/common.h'])
+
+gap = dependency('gap', version: '>=4.13.0')
 singular = dependency('Singular')
 maxima = find_program('maxima', required: true)
 # Cannot be found via pkg-config

diff --git a/src/sage/libs/meson.build b/src/sage/libs/meson.build
@@ -1,7 +1,11 @@
 sirocco = cc.find_library('sirocco', required: false, disabler: true)
 # cannot be found via pkg-config
 ecl = cc.find_library('ecl')
-braiding = cc.find_library('braiding')
+braiding = dependency('libbraiding', required: false)
+if not braiding.found()
+  # Fallback since pkg-config support was only added in v1.3.1
+  braiding = cc.find_library('braiding')
+endif
 gc = dependency(['bdw-gc-threaded', 'bdw-gc'], version: '>=7.6.4')
 homfly = cc.find_library('homfly', has_headers: ['homfly.h'])