diff options
| author | Rickard Green <[email protected]> | 2015-03-17 12:47:28 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-17 12:47:28 +0100 |
| commit | fbf211e0da1eaad123ebc4434fbe316f34d0f024 (patch) | |
| tree | 2e078826e75aad37ee4f7e1d3667700c060712d6 | |
| parent | 97b96fbb3bd11c663f68af46a6cbbf3d1fe5e81d (diff) | |
| parent | 6177d4fa646eab58f9dfb2c8fffec748aa230aba (diff) | |
| download | otp-fbf211e0da1eaad123ebc4434fbe316f34d0f024.tar.gz otp-fbf211e0da1eaad123ebc4434fbe316f34d0f024.tar.bz2 otp-fbf211e0da1eaad123ebc4434fbe316f34d0f024.zip | |
Merge branch 'maint'
* maint:
Fix missing quotation in LM_FIND_EMU_CC
| -rw-r--r-- | erts/aclocal.m4 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 index 264a1726db..670907a41d 100644 --- a/erts/aclocal.m4 +++ b/erts/aclocal.m4 @@ -246,31 +246,31 @@ lbl1: return 1; lbl2: return 2; -],ac_cv_prog_emu_cc=$CC,ac_cv_prog_emu_cc=no) +],ac_cv_prog_emu_cc="$CC",ac_cv_prog_emu_cc=no) -if test $ac_cv_prog_emu_cc = no; then +if test "$ac_cv_prog_emu_cc" = no; then for ac_progname in emu_cc.sh gcc-4.2 gcc; do IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_progname; then - ac_cv_prog_emu_cc=$ac_dir/$ac_progname + if test -f "$ac_dir/$ac_progname"; then + ac_cv_prog_emu_cc="$ac_dir/$ac_progname" break fi done IFS="$ac_save_ifs" - if test $ac_cv_prog_emu_cc != no; then + if test "$ac_cv_prog_emu_cc" != no; then break fi done fi -if test $ac_cv_prog_emu_cc != no; then - save_CC=$CC +if test "$ac_cv_prog_emu_cc" != no; then + save_CC="$CC" save_CFLAGS=$CFLAGS save_CPPFLAGS=$CPPFLAGS - CC=$ac_cv_prog_emu_cc + CC="$ac_cv_prog_emu_cc" CFLAGS="" CPPFLAGS="" AC_TRY_COMPILE([],[ @@ -291,17 +291,17 @@ if test $ac_cv_prog_emu_cc != no; then return 1; lbl2: return 2; - ],ac_cv_prog_emu_cc=$CC,ac_cv_prog_emu_cc=no) + ],ac_cv_prog_emu_cc="$CC",ac_cv_prog_emu_cc=no) CC=$save_CC CFLAGS=$save_CFLAGS CPPFLAGS=$save_CPPFLAGS fi ]) -if test $ac_cv_prog_emu_cc = no; then +if test "$ac_cv_prog_emu_cc" = no; then AC_DEFINE(NO_JUMP_TABLE,[],[Defined if no found C compiler can handle jump tables]) - EMU_CC=$CC + EMU_CC="$CC" else - EMU_CC=$ac_cv_prog_emu_cc + EMU_CC="$ac_cv_prog_emu_cc" fi AC_SUBST(EMU_CC) ]) |