From db96adfc006153119f0a423eab0981c043bef6f2 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Sat, 24 Sep 2022 12:26:30 +0200 Subject: [PATCH] Ensure `--vips-config` only prints build configuration (#3062) Also, remove a remnant of Autotools. --- libvips/include/vips/meson.build | 3 ++- libvips/iofuncs/init.c | 2 +- libvips/resample/dummy2.cc | 4 ---- 3 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 libvips/resample/dummy2.cc diff --git a/libvips/include/vips/meson.build b/libvips/include/vips/meson.build index 45539fe7..ab8a630d 100644 --- a/libvips/include/vips/meson.build +++ b/libvips/include/vips/meson.build @@ -88,7 +88,8 @@ foreach _, section : build_summary foreach key, arr : section if key.contains('gtk-doc') or \ key.contains('doxygen') or \ - key.contains('introspection') + key.contains('introspection') or \ + key.contains('examples') continue endif diff --git a/libvips/iofuncs/init.c b/libvips/iofuncs/init.c index c612d67c..3346b6bc 100644 --- a/libvips/iofuncs/init.c +++ b/libvips/iofuncs/init.c @@ -1251,7 +1251,7 @@ vips_version_string( void ) * Get the major, minor or micro library version, with @flag values 0, 1 and * 2. * - * Get the ABI current, revision and age (as used by libtool) with @flag + * Get the ABI current, revision and age (as used by Meson) with @flag * values 3, 4, 5. * * Returns: library version number diff --git a/libvips/resample/dummy2.cc b/libvips/resample/dummy2.cc deleted file mode 100644 index 773a7a51..00000000 --- a/libvips/resample/dummy2.cc +++ /dev/null @@ -1,4 +0,0 @@ -/* mac os x libtool needs to link libraries containing c++ (eg. cimg) with - * g++ ... force this with a dummy c++ file at the top level - */ -const int im__dummy_value = 42;