← 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-02-26 05:21:02 UTC
  • mfrom: (896.1.5 fix-osxs)
  • Revision ID: brian@intel-mini-2.local-20090226052102-8xtbjt8kph6mi0qx
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
296
296
if test "$with_debug" = "yes"
297
297
then
298
298
  # Debuging. No optimization.
299
 
  AM_CFLAGS="${OPTIMIZE_CFLAGS} -DDEBUG ${AM_CFLAGS}"
300
 
  AM_CXXFLAGS="${OPTIMIZE_CXXFLAGS} -DDEBUG ${AM_CXXFLAGS}"
 
299
  AM_CFLAGS="${DEBUG_CFLAGS} -DDEBUG ${AM_CFLAGS}"
 
300
  AM_CXXFLAGS="${DEBUG_CXXFLAGS} -DDEBUG ${AM_CXXFLAGS}"
301
301
else
302
302
  # Optimized version. No debug
303
303
  AM_CFLAGS="${OPTIMIZE_CFLAGS} ${AM_CFLAGS}"
465
465
 
466
466
AC_LIB_HAVE_LINKFLAGS(pcre,, [#include <pcre.h>], [pcre *re= NULL])
467
467
AS_IF([test "x$ac_cv_libpcre" = "xno"],[
 
468
  ac_cv_libpcre=
468
469
  AC_LIB_HAVE_LINKFLAGS(pcre,, [#include <pcre/pcre.h>], [pcre *re= NULL])
469
470
    AS_IF([test "x$ac_cv_libpcre" = "xno"],
470
471
          [AC_MSG_ERROR([libpcre is required for Drizzle])]
1176
1177
    [ac_warn_cast="$enableval"],
1177
1178
    [ac_warn_cast="no"])
1178
1179
 
1179
 
AC_ARG_ENABLE([overloaded-virtual],
1180
 
    [AS_HELP_STRING([--enable-overloaded-virtual],
1181
 
       [Enable warnings about overloaded virtuals @<:@default=off@:>@])],
1182
 
    [ac_warn_virtual="$enableval"],
1183
 
    [ac_warn_virtual="no"])
1184
 
 
1185
1180
AC_ARG_ENABLE([effective-style],
1186
1181
    [AS_HELP_STRING([--enable-effective-style],
1187
1182
       [Enable warnings violating Effective C++ Style Guidelines @<:@default=off@:>@])],
1194
1189
    [ac_warn_shadow="$enableval"],
1195
1190
    [ac_warn_shadow="yes"])
1196
1191
 
1197
 
AC_ARG_ENABLE([go-crazy],
1198
 
    [AS_HELP_STRING([--enable-go-crazy],
1199
 
       [Enables extra little warnings that might be too much @<:@default=off@:>@])],
1200
 
    [ac_warn_go_crazy="$enableval"],
1201
 
    [ac_warn_go_crazy="no"])
 
1192
AC_ARG_ENABLE([conversion],
 
1193
    [AS_HELP_STRING([--enable-conversion],
 
1194
       [Enables conversion warnings @<:@default=off@:>@])],
 
1195
    [ac_warn_conversion="$enableval"],
 
1196
    [ac_warn_conversion="no"])
1202
1197
 
1203
1198
AC_ARG_ENABLE([datarace],
1204
1199
    [AS_HELP_STRING([--enable-datarace],
1287
1282
    fi
1288
1283
    
1289
1284
    GCC_PEDANTIC="-pedantic -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls ${W_STRICT_ALIASING}"
1290
 
    GXX_PEDANTIC="-pedantic -Wundef ${GXX_W_REDUNDANT_DECLS} ${W_LONGLONG} ${W_STRICT_ALIASING}"
 
1285
    GXX_PEDANTIC="-pedantic -Wundef -Woverloaded-virtual  -Wnon-virtual-dtor -Wctor-dtor-privacy ${GXX_W_REDUNDANT_DECLS} ${W_LONGLONG} ${W_STRICT_ALIASING}"
1291
1286
 
1292
1287
    AC_CACHE_CHECK([whether __attribute__ visibility "hidden" is supported],
1293
1288
      [ac_cv_can_use_hidden_],
1314
1309
  then
1315
1310
    W_UNREACHABLE="-Wunreachable-code"
1316
1311
  fi
 
1312
 
1317
1313
  if test "$ac_warn_cast" = "yes"
1318
1314
  then
1319
1315
    W_CAST="-Wold-style-cast"
1320
1316
  fi
1321
1317
 
1322
 
  if test "$ac_warn_virtual" = "yes"
1323
 
  then
1324
 
    W_VIRTUAL="-Woverloaded-virtual"
1325
 
  fi
1326
 
 
1327
1318
  if test "$ac_warn_effc" = "yes"
1328
1319
  then
1329
1320
    W_EFFC="-Weffc++"
1330
1321
  fi
1331
1322
 
1332
 
  if test "$ac_warn_gocrazy" = "yes"
 
1323
  if test "$ac_warn_conversion" = "yes"
1333
1324
  then
1334
 
    W_CRAZY="-Wconversion -Winvalid-pch"
 
1325
    W_CONVERSION="-Wconversion"
1335
1326
  fi
1336
1327
 
1337
 
  CC_WARNINGS="${C99_SUPPORT_HACK} ${BASE_WARNINGS} ${GCC_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_SHADOW} ${W_CRAZY}"
1338
 
  CXX_WARNINGS="${BASE_WARNINGS} ${GXX_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_CAST} ${W_SHADOW} ${W_EFFC} ${W_CRAZY} ${W_VIRTUAL}"
 
1328
  CC_WARNINGS="${C99_SUPPORT_HACK} ${BASE_WARNINGS} ${GCC_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_SHADOW} ${W_CONVERSION}"
 
1329
  CXX_WARNINGS="${BASE_WARNINGS} ${GXX_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_CAST} ${W_SHADOW} ${W_EFFC} ${W_CONVERSION}"
1339
1330
 
1340
1331
  if test "$ac_exceptions" = "no"
1341
1332
  then
1356
1347
    AM_CFLAGS="${AM_CFLAGS} -xinstrument=datarace"
1357
1348
    AM_CXXFLAGS="${AM_CXXFLAGS} -xinstrument=datarace"
1358
1349
  fi
1359
 
  #CC_WARNINGS="-v -xc99=all -errtags=yes -errwarn=%all -erroff=E_ATTRIBUTE_NOT_VAR"
1360
 
  #CXX_WARNINGS="+w +w2 -xport64 -errtags=yes -errwarn=%all -erroff=attrskipunsup,doubunder -compat=5"
1361
 
  CC_WARNINGS="-v -xc99=all -errtags=yes -erroff=E_ATTRIBUTE_NOT_VAR"
1362
 
  CXX_WARNINGS="+w +w2 -xport64 -errtags=yes -erroff=attrskipunsup,doubunder -compat=5"
1363
 
  PROTOSKIP_WARNINGS="-erroff=attrskipunsup,doubunder,reftotemp,wbadinitl"
 
1350
  CC_WARNINGS="-v -xc99=all -errtags=yes -errwarn=%all -erroff=E_ATTRIBUTE_NOT_VAR"
 
1351
  CXX_WARNINGS="+w +w2 -xport64 -errtags=yes -errwarn=%all -erroff=attrskipunsup,doubunder,reftotemp,inllargeuse -compat=5"
 
1352
  #CC_WARNINGS="-v -xc99=all -errtags=yes -erroff=E_ATTRIBUTE_NOT_VAR"
 
1353
  #CXX_WARNINGS="+w +w2 -xport64 -errtags=yes -erroff=attrskipunsup,doubunder -compat=5"
 
1354
  PROTOSKIP_WARNINGS="-erroff=attrskipunsup,doubunder,reftotemp,wbadinitl,identexpected,inllargeuse"
1364
1355
  NO_UNREACHED="-erroff=E_STATEMENT_NOT_REACHED"
1365
1356
  if test "$ac_exceptions" = "no"
1366
1357
  then