]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Pull request #4818: Handle empty vars in configure script
authorOleksii Shumeiko -X (oshumeik - SOFTSERVE INC at Cisco) <oshumeik@cisco.com>
Wed, 16 Jul 2025 12:28:36 +0000 (12:28 +0000)
committerOleksii Shumeiko -X (oshumeik - SOFTSERVE INC at Cisco) <oshumeik@cisco.com>
Wed, 16 Jul 2025 12:28:36 +0000 (12:28 +0000)
Merge in SNORT/snort3 from ~OSHUMEIK/snort3:fix_configure to master

Squashed commit of the following:

commit 39afcb145ec708b86767c179ad4e9abe1392b556
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Wed Jul 16 10:31:32 2025 +0300

    build: fix comparison of empty integers

    Thanks to Hatix Ntsoa.

configure_cmake.sh

index a6a1b4e84858c0cca9db9452f4874315998b24be..03db301b2139a30c4ea49b7764d02a0f20c8cac5 100755 (executable)
@@ -520,10 +520,10 @@ while [ $# -ne 0 ]; do
     shift
 done
 
-if [ "$tcm" -eq 1 -a "$jem" -eq 1 ] ; then
+if ((tcm == 1)) ; then if ((jem == 1)) ; then
     echo "--enable-jemalloc and --enable-tcmalloc are mutually exclusive; enable at most one"
     exit 2
-fi
+fi fi
 
 if [ -d $builddir ]; then
     # If build directory exists, check if it has a CMake cache