diff --git a/lvm2.spec b/lvm2.spec
index 6eb2b5c..9180539 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -195,21 +195,43 @@ export LIBRARY_PATH="%{_libdir}/readline5"
   --enable-blkid_wiping \
 %if %{enable_cluster}
   --with-cluster=internal \
-  %{?enable_cmirror:--enable-cmirrord} \
+  %if %{enable_cmirror}
+  --enable-cmirrord \
+  %endif
 %else
   --with-cluster=internal \
 %endif
   --with-udevdir=%{_udevdir} --enable-udev_sync \
-  %{?enable_thin:--with-thin=internal} \
-  %{?enable_cache:--with-cache=internal} \
-  %{?enable_lvmpolld:--enable-lvmpolld} \
-  %{?enable_lockd_dlm:--enable-lvmlockd-dlm --enable-lvmlockd-dlmcontrol} \
-  %{?enable_lockd_sanlock:--enable-lvmlockd-sanlock} \
-  %{?enable_lvmdbusd:--enable-dbus-service --enable-notify-dbus} \
-  %{?enable_dmfilemapd:--enable-dmfilemapd} \
-  %{?enable_writecache:--with-writecache=internal} \
-  %{?enable_vdo:--with-vdo=internal --with-vdo-format=%{_bindir}/vdoformat} \
-  %{?enable_integrity:--with-integrity=internal} \
+%if %{enable_thin}
+  --with-thin=internal \
+%endif
+%if %{enable_cache}
+  --with-cache=internal \
+%endif
+%if %{enable_lvmpolld}
+  --enable-lvmpolld \
+%endif
+%if %{enable_lockd_dlm}
+  --enable-lvmlockd-dlm --enable-lvmlockd-dlmcontrol \
+%endif
+%if %{enable_lockd_sanlock}
+  --enable-lvmlockd-sanlock \
+%endif
+%if %{enable_lvmdbusd}
+  --enable-dbus-service --enable-notify-dbus \
+%endif
+%if %{enable_dmfilemapd}
+  --enable-dmfilemapd \
+%endif
+%if %{enable_writecache}
+  --with-writecache=internal \
+%endif
+%if %{enable_vdo}
+  --with-vdo=internal --with-vdo-format=%{_bindir}/vdoformat \
+%endif
+%if %{enable_integrity}
+  --with-integrity=internal \
+%endif
   --disable-silent-rules
 
 %make_build