Merge branch 'master' of gitlab.eps.surrey.ac.uk:ri0005/binary_c

meson.build

@@ -565,18 +565,19 @@ endif
 ##########################
 # location of libiberty.h
 #
-if compiler.has_header('libiberty.h',
-                       args: cflags,
-                       include_directories: include_directories(incdirs))
-    # Fedora
-    cflags += '-D__HAVE_LIBIBERTYH__'
-elif compiler.has_header('libiberty/libiberty.h',
-                         args: cflags,
-                         include_directories: include_directories(incdirs))
-    # Debian and derivatives e.g. Ubuntu
-    cflags += '-D__HAVE_LIBIBERTY_LIBIBERTYH__'
-else
-    error('cannot find libiberty.h at either <libiberty.h> or <libiberty/libiberty.h>')
+if compiler.find_library('iberty',
+                         required:false).found()
+    if compiler.has_header('libiberty.h',
+                           args: cflags,
+                           include_directories: include_directories(incdirs))
+        # Fedora
+        cflags += '-D__HAVE_LIBIBERTYH__'
+    elif compiler.has_header('libiberty/libiberty.h',
+                             args: cflags,
+                             include_directories: include_directories(incdirs))
+        # Debian and derivatives e.g. Ubuntu
+        cflags += '-D__HAVE_LIBIBERTY_LIBIBERTYH__'
+    endif
 endif
 
 ############################################################