← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Monty Taylor
  • Date: 2009-03-09 19:29:47 UTC
  • mto: (923.2.1 mordred)
  • mto: This revision was merged to the branch mainline in revision 928.
  • Revision ID: mtaylor@orisndriz05-20090309192947-xebxbkqbp65grj0m
Restructured CFLAGS processing to always keep user-supplied options last on the command line, so they take precedence.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
241
241
then
242
242
  case "$host_cpu" in
243
243
    *ppc* | *powerpc*)
244
 
      CFLAGS="$CFLAGS -mno-fused-madd"
245
 
      CXXFLAGS="$CXXFLAGS -mno-fused-madd"
 
244
      CFLAGS="-mno-fused-madd ${CFLAGS}"
 
245
      CXXFLAGS="-mno-fused-madd ${CXXFLAGS}"
246
246
    ;;
247
247
  esac
248
248
fi
273
273
    if test "$isainfo_k" = "amd64"
274
274
    then
275
275
      IS_64="-m64"
276
 
      LDFLAGS="${LDFLAGS} -L/usr/lib/${isainfo_k} -L/usr/local/lib/${isainfo_k}"
 
276
      LDFLAGS="-L/usr/lib/${isainfo_k} -L/usr/local/lib/${isainfo_k} ${LDFLAGS}"
277
277
    fi
278
278
  fi
279
 
  CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
 
279
  CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
280
280
 
281
 
  CXXFLAGS="${CXXFLAGS} -xlang=c99 -g -mt -compat=5 -library=stlport4 -template=no%extdef ${IS_64} ${MEMALIGN_FLAGS}"
282
 
  CFLAGS="${CFLAGS} -g -mt -xc99=all ${IS_64} ${MEMALIGN_FLAGS}"
 
281
  CXXFLAGS="-xlang=c99 -g -mt -compat=5 -library=stlport4 -template=no%extdef ${IS_64} ${MEMALIGN_FLAGS} ${CXXFLAGS}"
 
282
  CFLAGS="-g -mt -xc99=all ${IS_64} ${MEMALIGN_FLAGS} ${CFLAGS}"
283
283
  DEBUG_CFLAGS="-xO0"
284
284
  DEBUG_CXXFLAGS="-xO0" 
285
285
 
1283
1283
 
1284
1284
  if test "$ac_warn_pedantic" = "yes"
1285
1285
  then
1286
 
    save_CXXFLAGS="${CXXFLAGS}"
1287
 
    CXXFLAGS="${CXXFLAGS} ${W_FAIL} -Wredundant-decls"
1288
1286
    AC_CACHE_CHECK([whether it is safe to use -Wredundant-decls],
1289
1287
      [ac_cv_safe_to_use_Wredundant_decls_],
1290
1288
      [AC_LANG_PUSH(C++)
 
1289
       save_CXXFLAGS="${CXXFLAGS}"
 
1290
       CXXFLAGS="${CXXFLAGS} ${W_FAIL} -Wredundant-decls"
1291
1291
       AC_COMPILE_IFELSE(
1292
1292
         [AC_LANG_PROGRAM([
1293
1293
template <typename E> struct C { void foo(); };
1296
1296
            AC_INCLUDES_DEFAULT])],
1297
1297
          [ac_cv_safe_to_use_Wredundant_decls_=yes],
1298
1298
          [ac_cv_safe_to_use_Wredundant_decls_=no])
 
1299
        CXXFLAGS="${save_CXXFLAGS}"
1299
1300
        AC_LANG_POP()])
1300
1301
    if test $ac_cv_safe_to_use_Wredundant_decls_ = yes
1301
1302
    then
1324
1325
      AC_DEFINE(HAVE_ATTR_HIDDEN, 1,
1325
1326
                [Define to 1 if you have support for __attribute__((visibility("hidden")))])
1326
1327
    fi
1327
 
 
1328
 
    CXXFLAGS="${save_CXXFLAGS}"
1329
1328
  fi
1330
1329
 
1331
1330
  if test "$ac_warn_unreachable" = "yes"
1348
1347
    W_CONVERSION="-Wconversion"
1349
1348
  fi
1350
1349
 
1351
 
  CC_WARNINGS="${C99_SUPPORT_HACK} ${BASE_WARNINGS} ${GCC_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_SHADOW} ${W_CONVERSION}"
 
1350
  CC_WARNINGS="${BASE_WARNINGS} ${GCC_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_SHADOW} ${W_CONVERSION}"
1352
1351
  CXX_WARNINGS="${BASE_WARNINGS} ${GXX_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_CAST} ${W_SHADOW} ${W_EFFC} ${W_CONVERSION}"
1353
1352
 
1354
1353
  if test "$ac_exceptions" = "no"
1363
1362
then
1364
1363
  if test "$ac_datarace" = "yes"
1365
1364
  then
1366
 
    CFLAGS="${CFLAGS} -xinstrument=datarace"
1367
 
    CXXFLAGS="${CXXFLAGS} -xinstrument=datarace"
 
1365
    CFLAGS="-xinstrument=datarace ${CFLAGS}"
 
1366
    CXXFLAGS="-xinstrument=datarace ${CXXFLAGS}"
1368
1367
  fi
1369
1368
 
1370
1369
  if test "$ac_warn_fail" = "yes"