← 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-05-26 02:54:31 UTC
  • mfrom: (1022.2.34 mordred)
  • Revision ID: brian@gaz-20090526025431-hpjmsrr4j6nftuic
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
411
411
# Check for tcmalloc/mtmalloc
412
412
#--------------------------------------------------------------------
413
413
 
414
 
AC_ARG_ENABLE([tcmalloc],
415
 
    [AS_HELP_STRING([--disable-tcmalloc],
416
 
       [Enable linking with tcmalloc @<:@default=on@:>@])],
417
 
    [ac_enable_tcmalloc="$enableval"],
418
 
    [ac_enable_tcmalloc="yes"])
419
 
 
420
 
if test "x$ac_enable_tcmalloc" != "xno"
421
 
then
422
 
  AC_CHECK_LIB(tcmalloc,malloc,[],[])
423
 
fi
424
 
 
425
 
if test "x$ac_cv_lib_tcmalloc_malloc" != "xyes"
426
 
then
427
 
  AC_CHECK_LIB(mtmalloc,malloc,[],[])
428
 
fi
 
414
case "$target_os" in
 
415
  *linux*)
 
416
    AC_ARG_ENABLE([tcmalloc],
 
417
      [AS_HELP_STRING([--disable-tcmalloc],
 
418
         [Enable linking with tcmalloc @<:@default=on@:>@])],
 
419
      [ac_enable_tcmalloc="$enableval"],
 
420
      [ac_enable_tcmalloc="yes"])
 
421
 
 
422
    if test "x$ac_enable_tcmalloc" != "xno"
 
423
    then
 
424
      AC_CHECK_LIB(tcmalloc-minimal,malloc,[],[])
 
425
 
 
426
      if test "x$ac_cv_lib_tcmalloc_minimal_malloc" != "xyes"
 
427
      then
 
428
        AC_CHECK_LIB(tcmalloc,malloc,[],[])
 
429
      fi
 
430
    fi
 
431
 
 
432
    ;;
 
433
  *solaris*)
 
434
    AC_ARG_ENABLE([mtmalloc],
 
435
      [AS_HELP_STRING([--disable-mtmalloc],
 
436
         [Enable linking with mtmalloc @<:@default=on@:>@])],
 
437
      [ac_enable_mtmalloc="$enableval"],
 
438
      [ac_enable_mtmalloc="yes"])
 
439
 
 
440
    if test "x$ac_enable_mtmalloc" != "xno"
 
441
    then
 
442
      AC_CHECK_LIB(mtmalloc,malloc,[],[])
 
443
    fi
 
444
    ;;
 
445
esac
429
446
 
430
447
 
431
448
#--------------------------------------------------------------------
1241
1258
    [AS_HELP_STRING([--enable-cast-align-warnings],
1242
1259
       [Toggle cast alignment warnings @<:@default=off@:>@])],
1243
1260
    [ac_warn_cast_align="$enableval"],
1244
 
    [ac_warn_cast_align="no"])
 
1261
    [ac_warn_cast_align="yes"])
1245
1262
 
1246
1263
if test "$GCC" = "yes"
1247
1264
then
1256
1273
  then
1257
1274
    W_FAIL="-Werror"
1258
1275
  fi
1259
 
  BASE_WARNINGS="-Wall -Wextra ${W_FAIL} ${W_CAST_ALIGN}"
 
1276
  BASE_WARNINGS="-Wall -Wextra ${W_FAIL} ${W_CAST_ALIGN} -fdiagnostics-show-option"
1260
1277
 
1261
1278
  if test "$ac_warn_longlong" = "yes"
1262
1279
  then
1267
1284
 
1268
1285
  if test "$ac_warn_strict_aliasing" = "yes"
1269
1286
  then
1270
 
    W_STRICT_ALIASING="-Wstrict-aliasing"
 
1287
    W_STRICT_ALIASING="-fstrict-aliasing -Wstrict-aliasing"
1271
1288
  else
1272
1289
    W_STRICT_ALIASING="-Wno-strict-aliasing"
1273
1290
  fi
1452
1469
 drizzled/Makefile dnl
1453
1470
 support-files/Makefile dnl
1454
1471
 tests/Makefile tests/install_test_db dnl
1455
 
 drizzled/drizzled_safe dnl
1456
1472
 support-files/drizzle.server support-files/drizzle-log-rotate
1457
1473
 support-files/smf/Makefile dnl
1458
1474
 support-files/smf/install.sh dnl