← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to m4/pandora_ensure_gcc_version.m4

  • Committer: Monty Taylor
  • Date: 2010-05-21 19:32:50 UTC
  • mto: This revision was merged to the branch mainline in revision 1560.
  • Revision ID: mordred@inaugust.com-20100521193250-knfjjjvyojugfzoe
Don't let's overwrite values the user has provided.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/pandora_ensure_gcc_version.m4
9
9
                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
10
10
  AC_CHECK_PROGS([CC]NAME,[gcc$1])
11
11
  AC_CHECK_PROGS([CXX]NAME,[g++$1])
12
 
  AS_IF([test "x${CC]NAME[}" != "x"],[CC="${CC]NAME[}"])
13
 
  AS_IF([test "x${CXX]NAME[}" != "x"],[CXX="${CXX]NAME[}"])
14
 
  AS_IF([test "x${CC]NAME[}" != "x"],[CPP="${CC]NAME[} -E"])
 
12
  AS_IF([test "x${CC]NAME[}" != "x" -a "x${ac_cv_env_CC_set}" = "x"],
 
13
    [CC="${CC]NAME[}"])
 
14
  AS_IF([test "x${CXX]NAME[}" != "x" -a "x${ac_cv_env_CCX_set}" = "x"],
 
15
    [CXX="${CXX]NAME[}"])
 
16
  AS_IF([test "x${CC]NAME[}" != "x" -a "x${ac_cv_env_CPP_set}" = "x"],
 
17
    [CPP="${CC]NAME[} -E"])
15
18
])
16
19
 
17
20
dnl If the user is on a Mac and didn't ask for a specific compiler