← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Brian Aker
  • Date: 2009-01-28 19:37:25 UTC
  • mfrom: (779.3.11 devel)
  • Revision ID: brian@tangent.org-20090128193725-pz7g7dnp2dx0863e
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1182
1182
    [ac_warn_effc="$enableval"],
1183
1183
    [ac_warn_effc="no"])
1184
1184
 
 
1185
AC_ARG_ENABLE([shadow],
 
1186
    [AS_HELP_STRING([--disable-shadow],
 
1187
       [Disables warnings about scope shadowing @<:@default=on@:>@])],
 
1188
    [ac_warn_shadow="$enableval"],
 
1189
    [ac_warn_shadow="yes"])
 
1190
 
1185
1191
AC_ARG_ENABLE([go-crazy],
1186
1192
    [AS_HELP_STRING([--enable-go-crazy],
1187
1193
       [Enables extra little warnings that might be too much @<:@default=off@:>@])],
1223
1229
    W_STRICT_ALIASING="-Wno-strict-aliasing"
1224
1230
  fi
1225
1231
 
 
1232
  if test "$ac_warn_shadow" = "yes"
 
1233
  then
 
1234
    W_SHADOW="-Wshadow"
 
1235
    NO_SHADOW="-Wno-shadow"
 
1236
  else
 
1237
    W_SHADOW="-Wno-shadow"
 
1238
    NO_SHADOW=""
 
1239
  fi
 
1240
 
1226
1241
  if test "$ac_profiling" = "yes"
1227
1242
  then
1228
1243
    GPROF_PROFILING="-pg"
1300
1315
 
1301
1316
  if test "$ac_warn_gocrazy" = "yes"
1302
1317
  then
1303
 
    W_CRAZY="-Wshadow -Wconversion -Winvalid-pch"
 
1318
    W_CRAZY="-Wconversion -Winvalid-pch"
1304
1319
  fi
1305
1320
 
1306
 
  CC_WARNINGS="${C99_SUPPORT_HACK} ${BASE_WARNINGS} ${GCC_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_CRAZY}"
1307
 
  CXX_WARNINGS="${BASE_WARNINGS} ${GXX_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_CAST} ${W_EFFC} ${W_CRAZY}"
 
1321
  CC_WARNINGS="${C99_SUPPORT_HACK} ${BASE_WARNINGS} ${GCC_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_SHADOW} ${W_CRAZY}"
 
1322
  CXX_WARNINGS="${BASE_WARNINGS} ${GXX_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_CAST} ${W_SHADOW} ${W_EFFC} ${W_CRAZY}"
1308
1323
 
1309
1324
  if test "$ac_exceptions" = "no"
1310
1325
  then
1325
1340
    CXXFLAGS="${CXXFLAGS} -xinstrument=datarace"
1326
1341
  fi
1327
1342
  CC_WARNINGS="-v -xc99=all -errtags=yes"
1328
 
  CXX_WARNINGS="+w +w2 -xport64 -errtags=yes -erroff=attrskipunsup -compat=5"
 
1343
  CXX_WARNINGS="+w +w2 -xport64 -errtags=yes -erroff=attrskipunsup,doubunder -compat=5"
1329
1344
  if test "$ac_exceptions" = "no"
1330
1345
  then
1331
1346
    NO_EXCEPTIONS="-features=no%except"
1337
1352
 
1338
1353
AC_SUBST(NO_EXCEPTIONS)
1339
1354
AC_SUBST(W_EXCEPTIONS)
 
1355
AC_SUBST(NO_SHADOW)
 
1356
AC_SUBST(W_SHADOW)
1340
1357
AC_SUBST(NO_REDUNDANT_DECLS)
1341
1358
 
1342
1359
AC_SUBST([GLOBAL_CPPFLAGS],['-I$(top_srcdir) -I$(top_builddir)'])
1343
1360
AC_SUBST([AM_CPPFLAGS],['${GLOBAL_CPPFLAGS}'])
 
1361
AC_SUBST([GLOBAL_CXXFLAGS],[${AM_CXXFLAGS}])
1344
1362
AC_SUBST([AM_CFLAGS])
1345
1363
AC_SUBST([AM_CXXFLAGS])
1346
1364
 
 
1365
 
1347
1366
# Some usefull subst
1348
1367
AC_SUBST(CC)
1349
1368
AC_SUBST(GXX)