diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2017-06-09 21:27:09 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2017-06-09 21:28:35 +0100 |
| commit | e66d3beb0c6a4204e65d608d7e6aae8d9b95cd13 (patch) | |
| tree | 0eeff16cdb03c9b3b0de45a00a489d509288deb8 | |
| parent | fe8a9bc6d51a8ac09fef5a50dcd902a382014479 (diff) | |
meson: config.h.meson is no longer needed
| -rw-r--r-- | config.h.meson | 16 | ||||
| -rw-r--r-- | meson.build | 20 |
2 files changed, 11 insertions, 25 deletions
diff --git a/config.h.meson b/config.h.meson deleted file mode 100644 index c7709c8..0000000 --- a/config.h.meson +++ /dev/null @@ -1,16 +0,0 @@ -#mesondefine ENABLE_NLS -#mesondefine GETTEXT_PACKAGE -#mesondefine GST_API_VERSION -#mesondefine GST_LICENSE -#mesondefine GST_PACKAGE_NAME -#mesondefine GST_PACKAGE_ORIGIN -#mesondefine GST_PACKAGE_RELEASE_DATETIME -#mesondefine LOCALEDIR -#mesondefine PACKAGE -#mesondefine PACKAGE_BUGREPORT -#mesondefine PACKAGE_NAME -#mesondefine PACKAGE_STRING -#mesondefine PACKAGE_TARNAME -#mesondefine PACKAGE_URL -#mesondefine PACKAGE_VERSION -#mesondefine VERSION diff --git a/meson.build b/meson.build index be6c837..5a7bd56 100644 --- a/meson.build +++ b/meson.build @@ -26,12 +26,16 @@ libversion = '@0@.@1@.0'.format(soversion, gst_version_minor.to_int() * 100 + gs plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir')) cdata = configuration_data() -cdata.set('GETTEXT_PACKAGE', '"gst-rtsp-server-1.0"') -cdata.set('PACKAGE', '"gst-rtsp-server"') -cdata.set('VERSION', '"@0@"'.format(gst_version)) -cdata.set('PACKAGE_VERSION', '"@0@"'.format(gst_version)) -#cdata.set('GST_API_VERSION', '"@0@"'.format(api_version)) -cdata.set('GST_LICENSE', '"LGPL"') +cdata.set_quoted('GETTEXT_PACKAGE', 'gst-rtsp-server-1.0') +cdata.set_quoted('PACKAGE', 'gst-rtsp-server') +cdata.set_quoted('VERSION', gst_version) +cdata.set_quoted('PACKAGE_VERSION', gst_version) +cdata.set_quoted('GST_API_VERSION', api_version) +cdata.set_quoted('GST_LICENSE', 'LGPL') + +# FIXME: ENABLE_NLS (currently also missing from autotools build) +# cdata.set('ENABLE_NLS', true) +# cdata.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir'))) # GStreamer package name and origin url gst_package_name = get_option('with-package-name') @@ -46,9 +50,7 @@ if gst_package_name == '' endif cdata.set_quoted('GST_PACKAGE_ORIGIN', get_option('with-package-origin')) -configure_file(input : 'config.h.meson', - output : 'config.h', - configuration : cdata) +configure_file(output : 'config.h', configuration : cdata) rtspserver_args = ['-DHAVE_CONFIG_H'] |