← 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-20 23:03:10 UTC
  • mfrom: (779.1.23 devel)
  • Revision ID: brian@tangent.org-20090120230310-zqygzc4o915d0y3d
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
454
454
 
455
455
 
456
456
#--------------------------------------------------------------------
 
457
# Check for libdrizzle
 
458
#--------------------------------------------------------------------
 
459
 
 
460
AC_LIB_HAVE_LINKFLAGS(drizzle,,
 
461
[#include <libdrizzle/drizzle.h>],
 
462
[
 
463
  const char *version= drizzle_version()
 
464
])
 
465
dnl AS_IF([test x$ac_cv_libdrizzle = xno],
 
466
dnl       AC_MSG_ERROR([libdrizzle is required for Drizzle])
 
467
 
 
468
 
 
469
#--------------------------------------------------------------------
457
470
# Check for libz
458
471
#--------------------------------------------------------------------
459
472
 
1176
1189
    [ac_datarace="$enableval"],
1177
1190
    [ac_datarace="no"])
1178
1191
 
 
1192
AC_ARG_ENABLE([exceptions],
 
1193
    [AS_HELP_STRING([--disable-exceptions],
 
1194
        [Disables use of Exceptions in the build @<:@default=on@:>@])],
 
1195
    [ac_exceptions="$enableval"],
 
1196
    [ac_exceptions="yes"])
1179
1197
 
1180
1198
if test "$GCC" = "yes"
1181
1199
then
1283
1301
  CC_WARNINGS="${C99_SUPPORT_HACK} ${BASE_WARNINGS} ${GCC_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_CRAZY}"
1284
1302
  CXX_WARNINGS="${BASE_WARNINGS} ${GXX_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_CAST} ${W_EFFC} ${W_CRAZY}"
1285
1303
 
1286
 
  NO_EXCEPTIONS="-fno-exceptions"
1287
 
  W_EXCEPTIONS="-fexceptions"
 
1304
  if test "$ac_exceptions" = "no"
 
1305
  then
 
1306
    NO_EXCEPTIONS="-fno-exceptions"
 
1307
    W_EXCEPTIONS="-fexceptions"
 
1308
  fi
1288
1309
  NO_REDUNDANT_DECLS="-Wno-redundant-decls"
1289
1310
  # Disable exceptions as they seams to create problems with gcc and threads.
1290
1311
  # drizzled doesn't use run-time-type-checking, so we disable it.
1300
1321
  fi
1301
1322
  CC_WARNINGS="-v -xc99=all -errtags=yes"
1302
1323
  CXX_WARNINGS="+w +w2 -xport64 -errtags=yes -erroff=attrskipunsup -compat=5"
1303
 
  NO_EXCEPTIONS="-features=no%except"
1304
 
  W_EXCEPTIONS="-features=except"
 
1324
  if test "$ac_exceptions" = "no"
 
1325
  then
 
1326
    NO_EXCEPTIONS="-features=no%except"
 
1327
    W_EXCEPTIONS="-features=except"
 
1328
  fi
1305
1329
fi
1306
1330
AM_CXXFLAGS="${CXX_WARNINGS} ${NO_EXCEPTIONS}  ${AM_CXXFLAGS}"
1307
1331
AM_CFLAGS="${CC_WARNINGS} ${AM_CFLAGS}"