meson: remove deprecated meson options

These options are deprecated since
- 87541e254f5b0f7e6c2060867bbfe095d206f573 : -Dcryptolib=
- 710653d3bcc46d6c45d8771e0a74c8d5f6328bc4 : -Dintegration-tests=

diff --git a/NEWS b/NEWS
index 9521cee12c744de30bcc5caa6ed6667ab4122572..481f13ba64fc4988c7c534e229f20c201742833f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 systemd System and Service Manager
 
+CHANGES WITH 260 in spe:
+
+        Feature Removals and Incompatible Changes:
+
+        * Meson options '-Dintegration-tests=' and '-Dcryptolib=' (deprecated
+          in v258) have been removed.
+
 CHANGES WITH 259:
 
         Announcements of Future Feature Removals and Incompatible Changes:

diff --git a/meson_options.txt b/meson_options.txt
index 5061869483b786b563ed1d87c73ee1c34d1b4285..acf1205b36b3c0c5692c31053fb5271be92e6f61 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -450,7 +450,6 @@ option('gnutls', type : 'feature', deprecated : { 'true' : 'enabled', 'false' :
        description : 'gnutls support')
 option('openssl', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
        description : 'openssl support')
-option('cryptolib', type : 'combo', choices : ['auto', 'openssl', 'gcrypt'], deprecated : true)
 option('p11kit', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
        description : 'p11kit support')
 option('libfido2', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
@@ -528,8 +527,6 @@ option('install-tests', type : 'boolean', value : false,
        description : 'install test executables')
 option('log-message-verification', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
        description : 'do fake printf() calls to verify format strings')
-option('integration-tests', type : 'boolean', value : false, deprecated : true,
-       description : 'run the integration tests')
 
 option('ok-color', type : 'combo',
        choices : ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan',