From 44ee0f65be8ff4f1e0cb95126269bd1de8f15e1d Mon Sep 17 00:00:00 2001 From: Supakorn 'Jamie' Rassameemasmuang Date: Mon, 23 Dec 2024 03:46:07 -0700 Subject: [PATCH] MAKE: Fix test errors. --- configure.ac | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index c844e8060..be5a34ee2 100644 --- a/configure.ac +++ b/configure.ac @@ -205,7 +205,7 @@ AC_ARG_WITH(vcpkg-target-triplet, If left blank, will try to determine the triplet ] ), [ # given - if test "x$with_vcpkg" != "xno" -a test "x$withval" != "xno"; then + if test "x$with_vcpkg" != "xno" -a "x$withval" != "xno"; then vcpkg_triplet=$withval fi ],[ # not given @@ -263,7 +263,7 @@ AC_ARG_WITH(vcpkg-host-triplet, If left blank, will try to determine the triplet ] ), [ # given - if test "x$with_vcpkg" != "xno" -a test "x$withval" != "xno"; then + if test "x$with_vcpkg" != "xno" -a "x$withval" != "xno"; then VCPKG_INSTALL_ARGUMENTS=$VCPKG_INSTALL_ARGUMENTS"--host-triplet=$withval " fi ], @@ -390,10 +390,7 @@ if test "x$enable_lsp" != "xno" -a "x$enable_threads" != "xno"; then LSP_CMAKE_OPTIONS="-DLSPCPP_USE_CPP17=ON " if test "x$ac_cv_use_gc" != "xno"; then - LSP_CMAKE_OPTIONS=$LSP_CMAKE_OPTIONS"-DLSPCPP_SUPPORT_BOEHM_GC=ON " - if test "x$with_vcpkg" = "xno" -a test "x$ac_cv_use_gc" != "xsystem"; then - LSP_CMAKE_OPTIONS=$LSP_CMAKE_OPTIONS"-DLSPCPP_GC_DOWNLOADED_ROOT=$ROOT_DIR_RELATIVE_TO_SRC/\$(GC) " - fi + LSP_CMAKE_OPTIONS=$LSP_CMAKE_OPTIONS"-DLSPCPP_SUPPORT_BOEHM_GC=ON -DLSPCPP_GC_DOWNLOADED_ROOT=$ROOT_DIR_RELATIVE_TO_SRC/\$(GC)" fi AC_DEFUN(ENABLE_LSP_MACRO,