Skip to content

Commit

Permalink
MAKE: Fix test errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
jamievlin committed Dec 23, 2024
1 parent 6a5c109 commit 251a75a
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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" && test "x$withval" != "xno"; then
vcpkg_triplet=$withval
fi
],[ # not given
Expand Down Expand Up @@ -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" && test "x$withval" != "xno"; then
VCPKG_INSTALL_ARGUMENTS=$VCPKG_INSTALL_ARGUMENTS"--host-triplet=$withval "
fi
],
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 251a75a

Please sign in to comment.