Skip to content

Commit 38da0cd

Browse files
committed
configure: avoid excess spaces
While the construction ${var+ $var} works if var is not defined, it will produce extra space if var is empty. Added ':' to '+' to avoid this.
1 parent cc2e710 commit 38da0cd

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

configure.ac

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fi
3232

3333
# -------------------------------------------------------------------------------------------------
3434
POST_COMPILE_MSG=""
35-
CXXFLAGS="${CXXFLAGS+$CXXFLAGS }-std=gnu++17"
35+
CXXFLAGS="${CXXFLAGS:+$CXXFLAGS }-std=gnu++17"
3636
CUDA_FLAGS="$CUDA_FLAGS${CUDA_FLAGS:+${CUDAFLAGS:+ }}$CUDAFLAGS"
3737
INC="${INC-}"
3838
LDFLAGS="${LDFLAGS-}"
@@ -150,7 +150,7 @@ fi
150150
if test $system = Linux; then
151151
AC_CHECK_HEADERS([linux/version.h])
152152
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"
154154
fi
155155

156156
if test $system = MacOSX; then
@@ -225,9 +225,9 @@ test $ac_cv_sizeof_int_p -eq 4; }
225225
then
226226
LIBS="${LIBS:+$LIBS }-latomic" # needed for atomic_uint64_t
227227
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}"
231231

232232
if expr "x$CFLAGS" : 'x.*-O' >/dev/null; then
233233
OFAST=""
@@ -514,7 +514,7 @@ then
514514
fi
515515
DEFAULT_LIB_P=$($LINKER --verbose 2>&1 | awk \
516516
'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"
518518
CUDA_LIB="$CUDA_LIB -L\"$cl_lib_path\""
519519
FOUND_CUDA=yes
520520
fi
@@ -545,7 +545,7 @@ then
545545
fi
546546
fi
547547

548-
CUDA_LIB="${CUDA_LIB+$CUDA_LIB }-L$CUDA_LIB_PATH -lcudart"
548+
CUDA_LIB="${CUDA_LIB:+$CUDA_LIB }-L$CUDA_LIB_PATH -lcudart"
549549
CUDA_INC="-I$CUDA_PATH/include"
550550
CUDA_COMPILER="$NVCC"
551551
INC="$INC $CUDA_INC"
@@ -3205,8 +3205,8 @@ then
32053205
if test "${found_cl?}" = yes && test "${found_cl_h?}" = yes; then
32063206
AC_DEFINE([HAVE_OPENCL], [1], [OpenCL is supported])
32073207
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}"
32103210
fi
32113211

32123212
add_module vcompress_cmpto_j2k "src/video_compress/cmpto_j2k.o \
@@ -3413,7 +3413,7 @@ then
34133413
SDL_MIXER_LIBS=$(remove_mwindows "$SDL_MIXER_LIBS")
34143414
SDL_MIXER_CFLAGS=$($PKG_CONFIG --cflags-only-I SDL${sdl_ver_suffix}_mixer)
34153415
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}"
34173417
sdl_mixer=yes
34183418
fi
34193419
fi

0 commit comments

Comments
 (0)