diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2020-01-15 17:27:08 +0000 |
|---|---|---|
| committer | Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com> | 2020-10-16 09:35:48 -0700 |
| commit | f87858c4809a2dd9d48f89edd3c0057fd112413e (patch) | |
| tree | e58ae11ea164054288adfa027936a78dcc4a8364 | |
| parent | 78431a361bed0b6e9f1f3ebc0de8897b069b3848 (diff) | |
| download | libva-f87858c4809a2dd9d48f89edd3c0057fd112413e.tar.gz | |
build: respect SYSCONFDIR for libva.conf
On DragonFly and FreeBSD config are installed to /usr/local/etc by default.
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | va/Makefile.am | 1 | ||||
| -rw-r--r-- | va/meson.build | 2 | ||||
| -rw-r--r-- | va/va.c | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/meson.build b/meson.build index ffac974..24f5f4c 100644 --- a/meson.build +++ b/meson.build @@ -63,6 +63,8 @@ libva_lt_version = '@0@.@1@.@2@'.format(libva_lt_current, libva_lt_age, libva_lt_revision) +sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir')) + driverdir = get_option('driverdir') if driverdir == '' driverdir = join_paths(get_option('prefix'), get_option('libdir'), 'dri') @@ -101,9 +103,9 @@ if get_option('with_wayland') != 'no' wayland_dep = dependency('wayland-client', version : '>= 1.11.0', required : get_option('with_wayland') == 'yes') if wayland_dep.found() - prefix = wayland_dep.get_pkgconfig_variable('prefix') + wl_prefix = wayland_dep.get_pkgconfig_variable('prefix') wl_scanner = find_program('wayland-scanner', - prefix + '/bin/wayland-scanner') + wl_prefix + '/bin/wayland-scanner') endif WITH_WAYLAND = wayland_dep.found() endif diff --git a/va/Makefile.am b/va/Makefile.am index e67c588..1a97b2c 100644 --- a/va/Makefile.am +++ b/va/Makefile.am @@ -24,6 +24,7 @@ SUBDIRS = AM_CPPFLAGS = \ -I$(top_srcdir) \ + -DSYSCONFDIR='"$(sysconfdir)"' \ -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\"" LDADD = \ diff --git a/va/meson.build b/va/meson.build index 45707b6..e140a4b 100644 --- a/va/meson.build +++ b/va/meson.build @@ -63,7 +63,7 @@ libva = shared_library( libva_headers_priv, soversion : libva_lt_current, version : libva_lt_version, - c_args : ['-DVA_DRIVERS_PATH="' + driverdir + '"'] + va_c_args, + c_args : [ '-DSYSCONFDIR="' + sysconfdir + '"'] + ['-DVA_DRIVERS_PATH="' + driverdir + '"'] + va_c_args, include_directories : configinc, link_args : '-Wl,-version-script,' + libva_sym_path, link_depends : libva_sym, @@ -71,7 +71,7 @@ int va_parseConfig(char *env, char *env_value) if (env == NULL) return 1; - fp = fopen("/etc/libva.conf", "r"); + fp = fopen(SYSCONFDIR "/libva.conf", "r"); while (fp && (fgets(oneline, 1024, fp) != NULL)) { if (strlen(oneline) == 1) continue; |