From dadab4a39e37d6bcb1b989c25555b5351fce1bc7 Mon Sep 17 00:00:00 2001 From: Jens Reimann Date: Apr 19 2018 14:25:31 +0000 Subject: Fix the "with" flag handling, disable lua again --- diff --git a/4diac-forte.spec b/4diac-forte.spec index 7f0faa4..8363eef 100644 --- a/4diac-forte.spec +++ b/4diac-forte.spec @@ -1,7 +1,6 @@ -%global _with_sysfs 1 -%global _with_opcua 1 -%global _with_lua 1 +%global with_sysfs 1 +%global with_opcua 1 Name: 4diac-forte Version: 1.9.0 @@ -15,11 +14,11 @@ Source0: https://git.eclipse.org/c/4diac/org.eclipse.4diac.forte.git/snapshot/o BuildRequires: cmake, gcc-c++ BuildRequires: systemd -%if %{with opcua} +%if 0%{?with_opcua} BuildRequires: open62541-devel >= 0.2 %endif -%if %{with lua} +%if 0%{?with_lua} BuildRequires: lua-devel >= 5.1 %endif @@ -40,12 +39,12 @@ cd bin/posix -DFORTE_COM_ETH=ON \ -DFORTE_COM_FBDK=ON \ -DFORTE_COM_LOCAL=ON \ - %{?_with_opcua: -DFORTE_COM_OPC_UA=ON -DFORTE_COM_OPC_UA_INCLUDE_DIR=%{_includedir}/open62541 -DFORTE_COM_OPC_UA_LIB_DIR=%{_libdir}} \ + %{?with_opcua: -DFORTE_COM_OPC_UA=ON -DFORTE_COM_OPC_UA_INCLUDE_DIR=%{_includedir}/open62541 -DFORTE_COM_OPC_UA_LIB_DIR=%{_libdir}} \ -DFORTE_MODULE_CONVERT=ON \ -DFORTE_MODULE_IEC61131=ON \ - %{?_with_sysfs: -DFORTE_MODULE_SysFs=ON } \ + %{?with_sysfs: -DFORTE_MODULE_SysFs=ON } \ -DFORTE_MODULE_UTILS=ON \ - %{?_with_lua: -DFORTE_USE_LUATYPES=Lua } \ + %{?with_lua: -DFORTE_USE_LUATYPES=Lua } \ -DFORTE_TESTS=OFF \ ../.. make %{?_smp_mflags}