← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Brian Aker
  • Date: 2008-08-12 00:57:48 UTC
  • mfrom: (287.3.26 codestyle)
  • Revision ID: brian@tangent.org-20080812005748-c0od4bnpov0bvfwn
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
60
60
sinclude(m4/ac_cxx_header_stdcxx_98.m4)
61
61
 
62
62
AM_GNU_GETTEXT([external])
 
63
AM_GNU_GETTEXT_VERSION(0.17)
 
64
 
63
65
 
64
66
AC_SUBST(MYSQL_NO_DASH_VERSION)
65
67
AC_SUBST(MYSQL_BASE_VERSION)
273
275
if test "$GCC" = "yes"
274
276
then
275
277
  # Disable exceptions as they seams to create problems with gcc and threads.
 
278
  # (splitting this is for the future...)
 
279
  NO_EXCEPTIONS="-fno-exceptions"
 
280
  AC_SUBST(NO_EXCEPTIONS)
276
281
  # drizzled doesn't use run-time-type-checking, so we disable it.
277
 
  CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti"
278
 
  AC_DEFINE([HAVE_EXPLICIT_TEMPLATE_INSTANTIATION],
279
 
    [1], [Defined by configure. Use explicit template instantiation.])
 
282
  CXXFLAGS="$CXXFLAGS ${NO_EXCEPTIONS} -fno-rtti"
280
283
fi
281
284
 
282
285
MYSQL_PROG_AR
1056
1059
  tell tempnam vidattr \
1057
1060
  posix_fallocate backtrace backtrace_symbols backtrace_symbols_fd)
1058
1061
 
 
1062
AC_LANG_PUSH(C++)
 
1063
# Test whether madvise() is declared in C++ code -- it is not on some
 
1064
# systems, such as Solaris
 
1065
AC_CHECK_DECLS(madvise, [], [], [#if HAVE_SYS_MMAN_H
 
1066
#include <sys/types.h>
 
1067
#include <sys/mman.h>
 
1068
#endif])
 
1069
AC_LANG_POP()
 
1070
 
 
1071
 
1059
1072
AM_CONDITIONAL(BUILD_THR_RWLOCK,[test "$ac_cv_func_rwlock_init" -a "$ac_cv_funn_pthread_rwlock_rdlock"])
1060
1073
 
1061
1074
# Check that isinf() is available in math.h and can be used in both C and C++
1347
1360
  GCC_WARNINGS="${C99_SUPPORT_HACK} ${BASE_WARNINGS} ${GCC_PEDANTIC} ${W_UNREACHABLE} ${W_FAIL} ${GPROF_PROFILING} ${GPROF_COVERAGE}"
1348
1361
  GXX_WARNINGS="${BASE_WARNINGS} ${GXX_PEDANTIC} ${W_UNREACHABLE} ${W_FAIL} ${GPROF_PROFILING} ${GPROF_COVERAGE}"
1349
1362
 
1350
 
  CXXFLAGS="$CXXFLAGS ${GXX_WARNINGS}"
1351
 
  CFLAGS="$CFLAGS ${GCC_WARNINGS} "
 
1363
  AM_CXXFLAGS="${GXX_WARNINGS}"
 
1364
  AM_CFLAGS="${GCC_WARNINGS} "
1352
1365
fi
1353
1366
 
1354
1367
AC_SUBST([GLOBAL_CPPFLAGS],['-I$(top_srcdir) -I$(top_builddir)'])
1355
1368
AC_SUBST([AM_CPPFLAGS],['${GLOBAL_CPPFLAGS}'])
 
1369
AC_SUBST([AM_CFLAGS])
 
1370
AC_SUBST([AM_CXXFLAGS])
1356
1371
 
1357
1372
# Some usefull subst
1358
1373
AC_SUBST(CC)