cmake: Pass CPPFLAGS in CFLAGS. Closes: #668813 Thanks, Simon Ruderich for the patch...

[debhelper.git] / dh

diff --git a/dh b/dh
index 36130f84fa9db0e33dc20d527eb7d9afe6d0ac82..4d4e31eb898327289647df23ae5741be1a24b779 100755 (executable)
--- a/dh
+++ b/dh
@@ -55,7 +55,9 @@ the sequence addon interface.
 
 =item B<--without> I<addon>
 
-The inverse of B<--with>, disables using the given addon.
+The inverse of B<--with>, disables using the given addon. This option
+can be repeated more than once, or multiple addons to disable can be
+listed, separated by commas.
 
 =item B<--list>, B<-l>
 
@@ -285,7 +287,8 @@ init(options => {
                },
                "without=s" => sub {
                        my ($option,$value)=@_;
-                       @{$dh{WITH}} = grep { $_ ne $value } @{$dh{WITH}};
+                       my %without = map { $_ => 1 } split(",", $value);
+                       @{$dh{WITH}} = grep { ! $without{$_} } @{$dh{WITH}};
                },
                "l" => \&list_addons,
                "list" => \&list_addons,