← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Monty Taylor
  • Date: 2008-08-12 16:00:19 UTC
  • mfrom: (287.3.37 codestyle)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: monty@inaugust.com-20080812160019-a1gfp3nwvdnopc7t
Merged from codestyle.

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)
253
255
then
254
256
  case "$host_cpu" in
255
257
    *ppc* | *powerpc*)
256
 
      CFLAGS="$CFLAGS -mno-fused-madd"
257
 
      CXXFLAGS="$CXXFLAGS -mno-fused-madd"
 
258
      AM_CFLAGS="$CFLAGS -mno-fused-madd"
 
259
      AM_CXXFLAGS="$CXXFLAGS -mno-fused-madd"
258
260
    ;;
259
261
  esac
260
262
fi
274
276
then
275
277
  # Disable exceptions as they seams to create problems with gcc and threads.
276
278
  # 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.])
 
279
  AM_CXXFLAGS="${AM_CXXFLAGS} -fno-exceptions -fno-rtti"
280
280
fi
281
281
 
282
282
MYSQL_PROG_AR
287
287
fi
288
288
AC_SUBST(LD_VERSION_SCRIPT)
289
289
 
 
290
#--------------------------------------------------------------------
 
291
# Check for Google Proto Buffers
 
292
#--------------------------------------------------------------------
 
293
 
 
294
AC_LANG_PUSH([C++])
 
295
AC_CHECK_HEADERS([google/protobuf/message.h])
 
296
if test "x$ac_cv_header_google_protobuf_message_h" != "xyes"
 
297
then
 
298
  AC_MSG_ERROR([Couldn't find message.h. Try installing Google Protocol Buffer development packages])
 
299
fi
 
300
 
 
301
save_CFLAGS="$CFLAGS"
 
302
save_LIBS="$LIBS"
 
303
CFLAGS=""
 
304
LIBS="-lprotobuf"
 
305
 
 
306
AC_CACHE_CHECK([for Message in libprotobuf], ac_libprotobuf_works, [
 
307
  AC_TRY_LINK([
 
308
#include <google/protobuf/descriptor.pb.h>
 
309
  ],[
 
310
    google::protobuf::FileDescriptorProto testFdp;
 
311
  ], ac_libprotobuf_works=yes, [
 
312
        AC_ERROR([could not find Google's libprotobuf])
 
313
  ])
 
314
 
 
315
])
 
316
 
 
317
PROTOBUF_LIBS="${LIBS}"
 
318
AC_SUBST(PROTOBUF_LIBS)
 
319
CFLAGS="$save_CFLAGS"
 
320
LIBS="$save_LIBS"
 
321
AC_LANG_POP()
290
322
 
291
323
#--------------------------------------------------------------------
292
324
# Check for libevent
431
463
LIBS="$my_save_LIBS"
432
464
AC_SUBST(READLINE_LIBS)
433
465
 
 
466
 
434
467
#--------------------------------------------------------------------
435
468
# Check for libpcre
436
469
#--------------------------------------------------------------------
1056
1089
  tell tempnam vidattr \
1057
1090
  posix_fallocate backtrace backtrace_symbols backtrace_symbols_fd)
1058
1091
 
 
1092
AC_LANG_PUSH(C++)
 
1093
# Test whether madvise() is declared in C++ code -- it is not on some
 
1094
# systems, such as Solaris
 
1095
AC_CHECK_DECLS(madvise, [], [], [#if HAVE_SYS_MMAN_H
 
1096
#include <sys/types.h>
 
1097
#include <sys/mman.h>
 
1098
#endif])
 
1099
AC_LANG_POP()
 
1100
 
 
1101
 
1059
1102
AM_CONDITIONAL(BUILD_THR_RWLOCK,[test "$ac_cv_func_rwlock_init" -a "$ac_cv_funn_pthread_rwlock_rdlock"])
1060
1103
 
1061
1104
# Check that isinf() is available in math.h and can be used in both C and C++
1347
1390
  GCC_WARNINGS="${C99_SUPPORT_HACK} ${BASE_WARNINGS} ${GCC_PEDANTIC} ${W_UNREACHABLE} ${W_FAIL} ${GPROF_PROFILING} ${GPROF_COVERAGE}"
1348
1391
  GXX_WARNINGS="${BASE_WARNINGS} ${GXX_PEDANTIC} ${W_UNREACHABLE} ${W_FAIL} ${GPROF_PROFILING} ${GPROF_COVERAGE}"
1349
1392
 
1350
 
  CXXFLAGS="$CXXFLAGS ${GXX_WARNINGS}"
1351
 
  CFLAGS="$CFLAGS ${GCC_WARNINGS} "
 
1393
  AM_CXXFLAGS="${GXX_WARNINGS} ${AM_CXXFLAGS}"
 
1394
  AM_CFLAGS="${GCC_WARNINGS} ${AM_CFLAGS}"
1352
1395
fi
1353
1396
 
1354
1397
AC_SUBST([GLOBAL_CPPFLAGS],['-I$(top_srcdir) -I$(top_builddir)'])
1355
1398
AC_SUBST([AM_CPPFLAGS],['${GLOBAL_CPPFLAGS}'])
 
1399
AC_SUBST([AM_CFLAGS])
 
1400
AC_SUBST([AM_CXXFLAGS])
1356
1401
 
1357
1402
# Some usefull subst
1358
1403
AC_SUBST(CC)
1386
1431
AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
1387
1432
 
1388
1433
# Ensure that table handlers gets all modifications to CFLAGS/CXXFLAGS
1389
 
AC_CONFIG_COMMANDS_POST(ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'")
 
1434
AC_CONFIG_COMMANDS_POST(ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS' AM_CFLAGS='$AM_CFLAGS' AM_CXXFLAGS='$AM_CXXFLAGS'")
1390
1435
 
1391
1436
AC_OUTPUT