Remove unused variable.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 994f1b6f3e7aee7c90de95c21dba1272849f3cff..591a10e5445c6989026cee35183e706d81e03a46 100644 (file)
--- a/wscript
+++ b/wscript
@@ -126,15 +126,9 @@ def configure(conf):
         if int(gcc[0]) >= 8:
             # I tried and failed to ignore these with _Pragma
             conf.env.append_value('CXXFLAGS', ['-Wno-cast-function-type'])
-        if int(gcc[0]) >= 9:
-            # I can't get #pragma GCC diagnostic ignored "-Wsuggest-override" to work on older GCCs,
-            # so only enable this if we're on a newer one
-            conf.env.append_value('CXXFLAGS', '-Wsuggest-override')
-        have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
         # Most gccs still give these warnings from boost::optional
         conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized'])
-    else:
-        have_c11 = False
+        conf.env.append_value('CXXFLAGS', ['-Wsuggest-override'])
 
     if conf.options.enable_debug:
         conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG', '-fno-omit-frame-pointer'])
@@ -351,6 +345,18 @@ def configure(conf):
     # libpng
     conf.check_cfg(package='libpng', args='--cflags --libs', uselib_store='PNG', mandatory=True)
 
+    # libjpeg
+    conf.check_cxx(fragment="""
+                            #include <cstddef>
+                            #include <cstdio>
+                            #include <jpeglib.h>
+                            int main() { struct jpeg_compress_struct compress; jpeg_create_compress (&compress); return 0; }
+                            """,
+                   msg='Checking for libjpeg',
+                   libpath='/usr/local/lib',
+                   lib=['jpeg'],
+                   uselib_store='JPEG')
+
     # lwext4
     if conf.options.enable_disk:
         conf.check_cxx(fragment="""