diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-11-23 13:53:57 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-03-10 19:05:19 +0530 |
| commit | 8e8523ab3a9ddf4110ffb66ca16213ab29693efd (patch) | |
| tree | e2dd547b072a37d23f5450adff46354bf5227104 | |
| parent | 5d15d65e26504b2188ffb42b2bf8a32e22a5add8 (diff) | |
| download | gobject-introspection-8e8523ab3a9ddf4110ffb66ca16213ab29693efd.tar.gz | |
meson: Fix configuration when libffi is a subproject
| -rw-r--r-- | meson.build | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 0fb029ab..2573776b 100644 --- a/meson.build +++ b/meson.build @@ -98,9 +98,16 @@ else pkgconfig_conf.set('EXEEXT', '') endif pkgconfig_conf.set('VERSION', meson.project_version()) -pkgconfig_conf.set('FFI_PC_CFLAGS', libffi_dep.get_pkgconfig_variable('Cflags')) pkgconfig_conf.set('FFI_PC_PACKAGES', 'libffi') -pkgconfig_conf.set('FFI_PC_LIBS', libffi_dep.get_pkgconfig_variable('Libs')) +if libffi_dep.type_name() == 'pkgconfig' + pkgconfig_conf.set('FFI_PC_CFLAGS', libffi_dep.get_pkgconfig_variable('Cflags')) + pkgconfig_conf.set('FFI_PC_LIBS', libffi_dep.get_pkgconfig_variable('Libs')) +else + # XXX: We can't know the correct values for these, needs meson API. Maybe we + # should use meson's pkgconfig module to generate the whole file. + pkgconfig_conf.set('FFI_PC_CFLAGS', '') + pkgconfig_conf.set('FFI_PC_LIBS', '-lffi') +endif configure_file( input: 'gobject-introspection-no-export-1.0.pc.in', |