summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2018-05-31 21:19:23 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2018-05-31 21:19:23 +0100
commit95512220773b898c8c5da8da4193a007bd6b36f1 (patch)
tree0eba8dce2d73988c64381b282cf4bb8c52321027
parent6865a69acba32e346b92c074daca6c50d94b02a6 (diff)
downloadgdk-pixbuf-95512220773b898c8c5da8da4193a007bd6b36f1.tar.gz
build: Add missing configuration symbols
We're not testing for bind_textdomain_codeset() and setrlimit().
-rw-r--r--meson.build29
1 files changed, 19 insertions, 10 deletions
diff --git a/meson.build b/meson.build
index 0fdb60d9a..4ac16ece0 100644
--- a/meson.build
+++ b/meson.build
@@ -85,16 +85,24 @@ if cc.has_function('lrint', dependencies: mathlib_dep)
gdk_pixbuf_conf.set('HAVE_LRINT', 1)
endif
+if cc.has_function('bind_textdomain_codeset', prefix: '#include <libintl.h>')
+ gdk_pixbuf_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', 1)
+endif
+
+if cc.has_function('setrlimit', prefix: '#include <sys/time.h>\n#include <sys/resource.h>')
+ gdk_pixbuf_conf.set('HAVE_SETRLIMIT', 1)
+endif
# We use links() because sigsetjmp() is often a macro hidden behind other macros
-gdk_pixbuf_conf.set('HAVE_SIGSETJMP',
- cc.links('''#define _POSIX_SOURCE
- #include <setjmp.h>
- int main (void) {
- sigjmp_buf env;
- sigsetjmp (env, 0);
- return 0;
- }''', name: 'sigsetjmp'))
+gdk_pixbuf_conf.set10('HAVE_SIGSETJMP',
+ cc.links('''#define _POSIX_SOURCE
+ #include <setjmp.h>
+ int main (void) {
+ sigjmp_buf env;
+ sigsetjmp (env, 0);
+ return 0;
+ }''', name: 'sigsetjmp'),
+)
# Common compiler and linker flags
common_cflags = []
@@ -294,8 +302,9 @@ if get_option('jpeg') and not native_windows_loaders
enabled_loaders += 'jpeg'
loaders_deps += jpeg_dep
- gdk_pixbuf_conf.set('HAVE_PROGRESSIVE_JPEG',
- cc.has_function('jpeg_simple_progression', dependencies: jpeg_dep))
+ gdk_pixbuf_conf.set10('HAVE_PROGRESSIVE_JPEG',
+ cc.has_function('jpeg_simple_progression',
+ dependencies: jpeg_dep))
endif
endif
endif