From 24604a2b5b5cdf4cee733c5bd655d7cf04a4e28a Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sat, 18 Feb 2017 16:25:01 -0800 Subject: [PATCH] Use spaces to avoid pasting arguments together Don't rely on variables starting with a space, it's too fragile (backport of b6fea21140c8b7ea2dc023399526430fcb21e7a1) --- configure | 24 ++++++++++++------------ configure.in | 22 +++++++++++----------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/configure b/configure index 47d59e8f6f..5d6c17d239 100755 --- a/configure +++ b/configure @@ -25999,7 +25999,7 @@ $as_echo "found in $ac_find_includes" >&6; } fi fi - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include" + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" else save_CFLAGS=$CFLAGS CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" @@ -26072,7 +26072,7 @@ $as_echo "found in $ac_find_libraries" >&6; } fi fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" else save_CFLAGS=$CFLAGS CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" @@ -26126,7 +26126,7 @@ $as_echo_n "checking if we need -lXp and/or -lSM -lICE... " >&6; } for libsm_ice in "" " -lSM -lICE"; do if test "$libs_found" = 0; then save_LIBS="$LIBS" - LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11" + LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt ${libsm_ice} -lX11" save_CFLAGS=$CFLAGS CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" @@ -26153,8 +26153,8 @@ if ac_fn_c_try_link "$LINENO"; then : libp_link="$libp" libsm_ice_link="$libsm_ice" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: need${libp_link}${libsm_ice_link}" >&5 -$as_echo "need${libp_link}${libsm_ice_link}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: need ${libp_link} ${libsm_ice_link}" >&5 +$as_echo "need ${libp_link} ${libsm_ice_link}" >&6; } libs_found=1 fi @@ -26299,7 +26299,7 @@ $as_echo "$wx_cv_lib_lesstif" >&6; } CFLAGS=$save_CFLAGS - GUI_TK_LIBRARY="$GUI_TK_LIBRARY${libsgm_link} -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY ${libsgm_link} -lXm ${libp_link} -lXmu -lXext -lXt ${libsm_ice_link} -lX11" TOOLKIT=MOTIF GUIDIST=MOTIF_DIST fi @@ -26334,7 +26334,7 @@ $as_echo_n "checking for Xpm library... " >&6; } fi fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_libraries" >&5 $as_echo "found in $ac_find_libraries" >&6; } @@ -28522,7 +28522,7 @@ fi if test "$ac_path_to_link" != " -L/usr/lib" -a \ "$ac_path_to_link" != "$LDFLAGS_GL" ; then - LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link" + LDFLAGS_GL="$LDFLAGS_GL $ac_path_to_link" fi fi @@ -28888,7 +28888,7 @@ fi fi if test "$ac_path_to_link" != " -L/usr/lib" ; then - LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link" + LDFLAGS_GL="$LDFLAGS_GL $ac_path_to_link" fi fi OPENGL_LIBS="-lMesaGL -lMesaGLU" @@ -33370,7 +33370,7 @@ if test "x$ac_cv_lib_dl_dlopen" = xyes; then : $as_echo "#define HAVE_DLOPEN 1" >>confdefs.h HAVE_DL_FUNCS=1 - DL_LINK=" -ldl$DL_LINK" + DL_LINK="-ldl $DL_LINK" else @@ -33427,7 +33427,7 @@ $as_echo "$ac_cv_lib_shl_load_dld" >&6; } if test "x$ac_cv_lib_shl_load_dld" = xyes; then : HAVE_SHL_FUNCS=1 - DL_LINK=" -ldld$DL_LINK" + DL_LINK="-ldld $DL_LINK" fi @@ -35978,7 +35978,7 @@ $as_echo "yes" >&6; } WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fvtable-thunks" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS" + LIBS="-lrpcrt4 -loleaut32 -lole32 -luuid $LIBS" if test "$wxUSE_OLE" = "yes" ; then $as_echo "#define wxUSE_OLE 1" >>confdefs.h diff --git a/configure.in b/configure.in index 97db3a7a4f..c88523aadc 100644 --- a/configure.in +++ b/configure.in @@ -3150,7 +3150,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config if test "$ac_find_includes" != "" ; then AC_MSG_RESULT(found in $ac_find_includes) WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE) - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include" + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" else save_CFLAGS=$CFLAGS CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" @@ -3184,7 +3184,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config AC_MSG_RESULT(found in $ac_find_libraries) WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY) - GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" else dnl it might happen that we found headers in one of the standard dnl paths but the libs are elsewhere but still in default (linker) @@ -3225,7 +3225,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config for libsm_ice in "" " -lSM -lICE"; do if test "$libs_found" = 0; then save_LIBS="$LIBS" - LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11" + LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt ${libsm_ice} -lX11" save_CFLAGS=$CFLAGS CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" @@ -3244,7 +3244,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config libp_link="$libp" libsm_ice_link="$libsm_ice" AC_MSG_RESULT( - [need${libp_link}${libsm_ice_link}]) + [need ${libp_link} ${libsm_ice_link}]) libs_found=1 ], [] ) @@ -3307,7 +3307,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config CFLAGS=$save_CFLAGS - GUI_TK_LIBRARY="$GUI_TK_LIBRARY${libsgm_link} -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY ${libsgm_link} -lXm ${libp_link} -lXmu -lXext -lXt ${libsm_ice_link} -lX11" TOOLKIT=MOTIF GUIDIST=MOTIF_DIST fi @@ -3320,7 +3320,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config WX_PATH_FIND_LIBRARIES(Xpm) if test "$ac_find_libraries" != "" ; then WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) - GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" AC_MSG_RESULT(found in $ac_find_libraries) AC_CACHE_CHECK([for X11/xpm.h], @@ -3638,7 +3638,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) if test "$ac_path_to_link" != " -L/usr/lib" -a \ "$ac_path_to_link" != "$LDFLAGS_GL" ; then - LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link" + LDFLAGS_GL="$LDFLAGS_GL $ac_path_to_link" fi fi @@ -3653,7 +3653,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then if test "$ac_find_libraries" != "std" ; then WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) if test "$ac_path_to_link" != " -L/usr/lib" ; then - LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link" + LDFLAGS_GL="$LDFLAGS_GL $ac_path_to_link" fi fi OPENGL_LIBS="-lMesaGL -lMesaGLU" @@ -5412,7 +5412,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then [ AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1 - DL_LINK=" -ldl$DL_LINK" + DL_LINK="-ldl $DL_LINK" ], [ AC_CHECK_FUNCS(shl_load, @@ -5424,7 +5424,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then AC_CHECK_LIB(shl_load, dld, [ HAVE_SHL_FUNCS=1 - DL_LINK=" -ldld$DL_LINK" + DL_LINK="-ldld $DL_LINK" ]) ]) ]) @@ -6537,7 +6537,7 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ [AC_MSG_RESULT(no)], [AC_MSG_RESULT(yes) WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fvtable-thunks"]) - LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS" + LIBS="-lrpcrt4 -loleaut32 -lole32 -luuid $LIBS" if test "$wxUSE_OLE" = "yes" ; then AC_DEFINE(wxUSE_OLE) AC_DEFINE(wxUSE_OLE_AUTOMATION)