add secondary check for libiberty

8e6645ed · Izzard, Robert Dr (Maths & Physics) · 0c3857e1 · 8e6645ed
Commit 8e6645ed authored 5 years ago by Izzard, Robert Dr (Maths & Physics)
--- a/meson.build
+++ b/meson.build
@@ -565,16 +565,19 @@ endif
 ##########################
 # location of libiberty.h
 #
-if compiler.has_header('libiberty.h',
+if compiler.find_library('iberty',
-                       args: cflags,
+                         required:false)
-                       include_directories: include_directories(incdirs))
+    if compiler.has_header('libiberty.h',
-    # Fedora
+                           args: cflags,
-    cflags += '-D__HAVE_LIBIBERTYH__'
+                           include_directories: include_directories(incdirs))
-elif compiler.has_header('libiberty/libiberty.h',
+        # Fedora
-                         args: cflags,
+        cflags += '-D__HAVE_LIBIBERTYH__'
-                         include_directories: include_directories(incdirs))
+    elif compiler.has_header('libiberty/libiberty.h',
-    # Debian and derivatives e.g. Ubuntu
+                             args: cflags,
-    cflags += '-D__HAVE_LIBIBERTY_LIBIBERTYH__'
+                             include_directories: include_directories(incdirs))
+        # Debian and derivatives e.g. Ubuntu
+        cflags += '-D__HAVE_LIBIBERTY_LIBIBERTYH__'
+    endif
 endif
 ############################################################