diff --git a/CHANGES b/CHANGES index 7391447b9a..808b9959bd 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +3.1.0-dev.529 | 2020-02-03 13:04:30 -0800 + + * CMakeLists.txt: fix cross-compilation with binpac (Fabrice Fontaine) + 3.1.0-dev.527 | 2020-02-03 10:11:00 -0800 * Change requested memory in Cirrus CI config (Jon Siwek, Corelight) diff --git a/CMakeLists.txt b/CMakeLists.txt index 53c6d4faca..f4401d05c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -178,8 +178,7 @@ FindRequiredPackage(OpenSSL) FindRequiredPackage(BIND) FindRequiredPackage(ZLIB) -if (NOT BINPAC_EXE_PATH AND - EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/binpac/CMakeLists.txt) +if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/binpac/CMakeLists.txt) set(ENABLE_STATIC_ONLY_SAVED ${ENABLE_STATIC_ONLY}) diff --git a/VERSION b/VERSION index affde92154..9ab9ece2ac 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.0-dev.527 +3.1.0-dev.529 diff --git a/configure b/configure index 5c7570f469..d1e9c54ded 100755 --- a/configure +++ b/configure @@ -279,7 +279,6 @@ while [ $# -ne 0 ]; do ;; --with-binpac=*) append_cache_entry BINPAC_EXE_PATH PATH $optarg - append_cache_entry BinPAC_ROOT_DIR PATH "$(dirname $optarg)/.." ;; --with-bifcl=*) append_cache_entry BIFCL_EXE_PATH PATH $optarg