|
32 | 32 |
|
33 | 33 | # ------------------------------------------------------------------------------------------------- |
34 | 34 | POST_COMPILE_MSG="" |
35 | | -CXXFLAGS="${CXXFLAGS+$CXXFLAGS }-std=gnu++17" |
| 35 | +CXXFLAGS="${CXXFLAGS:+$CXXFLAGS }-std=gnu++17" |
36 | 36 | CUDA_FLAGS="$CUDA_FLAGS${CUDA_FLAGS:+${CUDAFLAGS:+ }}$CUDAFLAGS" |
37 | 37 | INC="${INC-}" |
38 | 38 | LDFLAGS="${LDFLAGS-}" |
|
150 | 150 | if test $system = Linux; then |
151 | 151 | AC_CHECK_HEADERS([linux/version.h]) |
152 | 152 | LDFLAGS="$LDFLAGS -Wl,--dynamic-list-data" |
153 | | - COMMON_FLAGS="${COMMON_FLAGS+$COMMON_FLAGS }-D_GNU_SOURCE" |
| 153 | + COMMON_FLAGS="${COMMON_FLAGS:+$COMMON_FLAGS }-D_GNU_SOURCE" |
154 | 154 | fi |
155 | 155 |
|
156 | 156 | if test $system = MacOSX; then |
@@ -225,9 +225,9 @@ test $ac_cv_sizeof_int_p -eq 4; } |
225 | 225 | then |
226 | 226 | LIBS="${LIBS:+$LIBS }-latomic" # needed for atomic_uint64_t |
227 | 227 | fi |
228 | | -CFLAGS="$CFLAGS${ARCH+ $ARCH}" |
229 | | -CXXFLAGS="$CXXFLAGS${ARCH+ $ARCH}" |
230 | | -LDFLAGS="$LDFLAGS${ARCH+ $ARCH}" |
| 228 | +CFLAGS="$CFLAGS${ARCH:+ $ARCH}" |
| 229 | +CXXFLAGS="$CXXFLAGS${ARCH:+ $ARCH}" |
| 230 | +LDFLAGS="$LDFLAGS${ARCH:+ $ARCH}" |
231 | 231 |
|
232 | 232 | if expr "x$CFLAGS" : 'x.*-O' >/dev/null; then |
233 | 233 | OFAST="" |
|
514 | 514 | fi |
515 | 515 | DEFAULT_LIB_P=$($LINKER --verbose 2>&1 | awk \ |
516 | 516 | 'BEGIN { ORS="" } /InstalledDir: / { print $2 }')/../lib |
517 | | - CUDA_LIB="${CUDA_LIB+$CUDA_LIB }-L$DEFAULT_LIB_P" |
| 517 | + CUDA_LIB="${CUDA_LIB:+$CUDA_LIB }-L$DEFAULT_LIB_P" |
518 | 518 | CUDA_LIB="$CUDA_LIB -L\"$cl_lib_path\"" |
519 | 519 | FOUND_CUDA=yes |
520 | 520 | fi |
|
545 | 545 | fi |
546 | 546 | fi |
547 | 547 |
|
548 | | - CUDA_LIB="${CUDA_LIB+$CUDA_LIB }-L$CUDA_LIB_PATH -lcudart" |
| 548 | + CUDA_LIB="${CUDA_LIB:+$CUDA_LIB }-L$CUDA_LIB_PATH -lcudart" |
549 | 549 | CUDA_INC="-I$CUDA_PATH/include" |
550 | 550 | CUDA_COMPILER="$NVCC" |
551 | 551 | INC="$INC $CUDA_INC" |
@@ -3205,8 +3205,8 @@ then |
3205 | 3205 | if test "${found_cl?}" = yes && test "${found_cl_h?}" = yes; then |
3206 | 3206 | AC_DEFINE([HAVE_OPENCL], [1], [OpenCL is supported]) |
3207 | 3207 | cmpto_libs="$cmpto_libs $OpenCL_LIBS" |
3208 | | - CFLAGS="$CFLAGS${OpenCL_CFLAGS+ $OPENCL_CFLAGS}" |
3209 | | - CFLAGS="$CFLAGS${OpenCL_Headers_CFLAGS+ $OPENCL_Headers_CFLAGS}" |
| 3208 | + CFLAGS="$CFLAGS${OpenCL_CFLAGS:+ $OPENCL_CFLAGS}" |
| 3209 | + CFLAGS="$CFLAGS${OpenCL_Headers_CFLAGS:+ $OPENCL_Headers_CFLAGS}" |
3210 | 3210 | fi |
3211 | 3211 |
|
3212 | 3212 | add_module vcompress_cmpto_j2k "src/video_compress/cmpto_j2k.o \ |
@@ -3413,7 +3413,7 @@ then |
3413 | 3413 | SDL_MIXER_LIBS=$(remove_mwindows "$SDL_MIXER_LIBS") |
3414 | 3414 | SDL_MIXER_CFLAGS=$($PKG_CONFIG --cflags-only-I SDL${sdl_ver_suffix}_mixer) |
3415 | 3415 | add_module acap_sdl_mixer src/audio/capture/sdl_mixer.o "$SDL_MIXER_LIBS" |
3416 | | - INC="$INC${SDL_MIXER_CFLAGS+ $SDL_MIXER_CFLAGS}" |
| 3416 | + INC="$INC${SDL_MIXER_CFLAGS:+ $SDL_MIXER_CFLAGS}" |
3417 | 3417 | sdl_mixer=yes |
3418 | 3418 | fi |
3419 | 3419 | fi |
|
0 commit comments