changeset
Fix config.h usage with meson.
Mon, 22 Aug 2016 01:17:52 -0400
- author
- Elliott Sales de Andrade <qulogic@pidgin.im>
- date
- Mon, 22 Aug 2016 01:17:52 -0400
- branch
- meson
- changeset 38440
- 98da84139485
- parent 38439
- 03f1a1642a68
- child 38441
- f8a1733e22bf
Fix config.h usage with meson.
Apparently, there's a HAVE_CONFIG_H test that needed to be enabled.
--- a/libpurple/example/meson.build Sun Aug 21 23:15:11 2016 -0400 +++ b/libpurple/example/meson.build Mon Aug 22 01:17:52 2016 -0400 @@ -1,5 +1,5 @@ nullclient = executable('nullclient', 'nullclient.c', 'defines.h', - include_directories : include_directories('..'), + include_directories : [toplevel_inc, libpurple_inc], link_with : libpurple, dependencies : [dbus, dbus_glib, # intllibs, glib, gplugin, libxml],
--- a/libpurple/meson.build Sun Aug 21 23:15:11 2016 -0400 +++ b/libpurple/meson.build Mon Aug 22 01:17:52 2016 -0400 @@ -279,7 +279,7 @@ install_dir : get_option('includedir') + '/libpurple') version_h = configure_file(input : 'version.h.in', output : 'version.h', - configuration : conf, + configuration : version_conf, install : true, install_dir : get_option('includedir') + '/libpurple') @@ -418,9 +418,10 @@ endif +libpurple_inc = include_directories('.') libpurple = library('purple', purple_coresources + purple_builtsources + dbus_sources + purple_builtheaders, - include_directories : include_directories('.'), + include_directories : [toplevel_inc, libpurple_inc], install : true, soversion : purple_lt_current, version : PURPLE_LT_VERSION_INFO,
--- a/libpurple/tests/meson.build Sun Aug 21 23:15:11 2016 -0400 +++ b/libpurple/tests/meson.build Mon Aug 22 01:17:52 2016 -0400 @@ -1,6 +1,6 @@ foreach prog : ['des', 'des3', 'hmac', 'md4', 'md5', 'sha1', 'sha256', 'trie', 'util', 'xmlnode'] e = executable('test_' + prog, 'test_@0@.c'.format(prog), - include_directories : include_directories('..'), + include_directories : [toplevel_inc, libpurple_inc], link_with : libpurple, dependencies : [gplugin, glib]) test(prog, e)
--- a/meson.build Sun Aug 21 23:15:11 2016 -0400 +++ b/meson.build Mon Aug 22 01:17:52 2016 -0400 @@ -67,33 +67,35 @@ gnt_version_suffix) cdefs = [ - ['VERSION', '"' + purple_display_version + '"'] + ['VERSION', '"' + purple_display_version + '"'], + ['HAVE_CONFIG_H', '1'] ] conf = configuration_data() +version_conf = configuration_data() -conf.set('PURPLE_MAJOR_VERSION', purple_major_version) -conf.set('PURPLE_MINOR_VERSION', purple_minor_version) -conf.set('PURPLE_MICRO_VERSION', purple_micro_version) -conf.set('PURPLE_VERSION', purple_display_version) -conf.set('PURPLE_API_VERSION', - purple_lt_current - purple_minor_version) +version_conf.set('PURPLE_MAJOR_VERSION', purple_major_version) +version_conf.set('PURPLE_MINOR_VERSION', purple_minor_version) +version_conf.set('PURPLE_MICRO_VERSION', purple_micro_version) +version_conf.set('PURPLE_VERSION', purple_display_version) +version_conf.set('PURPLE_API_VERSION', + purple_lt_current - purple_minor_version) PURPLE_LT_VERSION_INFO = '@0@.@1@.@2@'.format(purple_lt_current, purple_micro_version, purple_minor_version) -conf.set('PURPLE_LT_VERSION_INFO', PURPLE_LT_VERSION_INFO) +version_conf.set('PURPLE_LT_VERSION_INFO', PURPLE_LT_VERSION_INFO) -conf.set('GNT_MAJOR_VERSION', gnt_major_version) -conf.set('GNT_MINOR_VERSION', gnt_minor_version) -conf.set('GNT_MICRO_VERSION', gnt_micro_version) -conf.set('GNT_VERSION', gnt_display_version) -conf.set('GNT_API_VERSION', gnt_lt_current - gnt_minor_version) +version_conf.set('GNT_MAJOR_VERSION', gnt_major_version) +version_conf.set('GNT_MINOR_VERSION', gnt_minor_version) +version_conf.set('GNT_MICRO_VERSION', gnt_micro_version) +version_conf.set('GNT_VERSION', gnt_display_version) +version_conf.set('GNT_API_VERSION', gnt_lt_current - gnt_minor_version) GNT_LT_VERSION_INFO = '@0@.@1@.@2@'.format(gnt_lt_current, gnt_micro_version, gnt_minor_version) -conf.set('GNT_LT_VERSION_INFO', GNT_LT_VERSION_INFO) +version_conf.set('GNT_LT_VERSION_INFO', GNT_LT_VERSION_INFO) sedpath = find_program('sed') xxdpath = find_program('xxd') @@ -1867,6 +1869,9 @@ language : 'c') endforeach +# So that config.h may be found. +toplevel_inc = include_directories('.') + #subdir('doc') #subdir('doc/reference') #subdir('doc/reference/finch')
