diff options
author | Elliott Sales de Andrade <qulogic@pidgin.im> | 2018-02-16 00:15:22 -0500 |
---|---|---|
committer | Elliott Sales de Andrade <qulogic@pidgin.im> | 2018-02-16 00:15:22 -0500 |
commit | 896a5691ec9da6ac09d761015fcc6435d706c5d2 (patch) | |
tree | 13c5f635813b99bd381b1d9d9d006fa02c133742 | |
parent | a900b99337a4c7806243840cd00697dd8951e8c4 (diff) | |
download | pidgin-896a5691ec9da6ac09d761015fcc6435d706c5d2.tar.gz |
Use correct X flag when configuring GNT plugins.
-rw-r--r-- | finch/plugins/meson.build | 2 | ||||
-rw-r--r-- | meson.build | 49 |
2 files changed, 26 insertions, 25 deletions
diff --git a/finch/plugins/meson.build b/finch/plugins/meson.build index b6364bbd05..9cdb523f7f 100644 --- a/finch/plugins/meson.build +++ b/finch/plugins/meson.build @@ -1,5 +1,5 @@ if PLUGINS - if ENABLE_GTK + if with_x gntclipboard = library('gntclipboard', 'gntclipboard.c', dependencies : [x11, libpurple_dep, libfinch_dep, glib], name_prefix : '', diff --git a/meson.build b/meson.build index e5dfffc2bc..460eb995c1 100644 --- a/meson.build +++ b/meson.build @@ -391,8 +391,6 @@ conf.set_quoted('DISPLAY_VERSION', DISPLAY_VERSION) force_deps = not get_option('missing-dependencies') -with_x = get_option('x') and not IS_WIN32 - # ####################################################################### # # Check for GTK+ 2.18 and other things used by the GTK UI # ####################################################################### @@ -429,28 +427,6 @@ if get_option('gtkui') endif ####################################################################### - # Check if we should compile with X support - ####################################################################### - if with_x - x11 = dependency('x11') - if x11.found() - conf.set('HAVE_X11', true) - else - with_x = false - if force_deps - error(''' -X11 development headers not found. -Use -Dx=false if you do not need X11 support. -''') - endif - endif - endif - if not with_x - enable_gestures = false - x11 = [] - endif - - ####################################################################### # Check for stuff needed by the Evolution integration plugin. ####################################################################### if enable_gevolution @@ -508,6 +484,31 @@ ENABLE_GTK = get_option('gtkui') ####################################################################### +# Check if we should compile with X support +####################################################################### +with_x = get_option('x') and not IS_WIN32 + +if with_x + x11 = dependency('x11') + if x11.found() + conf.set('HAVE_X11', true) + else + with_x = false + if force_deps + error(''' +X11 development headers not found. +Use -Dx=false if you do not need X11 support. +''') + endif + endif +else + x11 = [] +endif +if not get_option('gtkui') or not with_x + enable_gestures = false +endif + +####################################################################### # Check for ncurses and other things used by the console UI ####################################################################### ncurses_inc = [] |