← 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-10-10 00:15:11 UTC
  • mfrom: (492.1.9 codestyle)
  • Revision ID: brian@tangent.org-20081010001511-eppqbw2u9rdqwffp
Handling Monty's merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
28
28
AC_SUBST(CXXLDFLAGS)
29
29
 
30
30
AC_CANONICAL_TARGET
31
 
AM_INIT_AUTOMAKE(-Wall -Werror)
 
31
AM_INIT_AUTOMAKE(-Wall -Wno-portability -Werror)
32
32
 
33
33
PROTOCOL_VERSION=10
34
34
DOT_FRM_VERSION=6
1315
1315
fi
1316
1316
 
1317
1317
dnl TODO: Remove this define once we are using 2.61 across the board.
1318
 
# AC_HEADER_ASSERT
 
1318
# AX_HEADER_ASSERT
1319
1319
# ----------------
1320
1320
# Check whether to enable assertions.
1321
 
ifdef([AC_HEADER_ASSERT], [], [AC_DEFUN([AC_HEADER_ASSERT],
 
1321
AC_DEFUN([AX_HEADER_ASSERT],
1322
1322
[
1323
1323
  AC_MSG_CHECKING([whether to enable assertions])
1324
1324
  AC_ARG_ENABLE([assert],
1325
 
    [  --disable-assert        turn off assertions],
1326
 
    [AC_MSG_RESULT([no])
1327
 
     AC_DEFINE(NDEBUG, 1, [Define to 1 if assertions should be disabled.])],
1328
 
    [AC_MSG_RESULT(yes)])
1329
 
])])
1330
 
 
1331
 
if test "x${NDEBUG}" -eq "x1"
1332
 
then
1333
 
        ac_assert="no"
1334
 
else
1335
 
        ac_assert="yes"
1336
 
fi
1337
 
 
1338
 
AC_HEADER_ASSERT
 
1325
    [AS_HELP_STRING([--disable-assert],
 
1326
       [Turn off assertions])],
 
1327
    [ac_cv_assert="no"],
 
1328
    [ac_cv_assert="yes"])
 
1329
  AC_MSG_RESULT([$ac_cv_assert])
 
1330
])
 
1331
 
 
1332
AX_HEADER_ASSERT
1339
1333
 
1340
1334
CFLAGS="${SYMBOLS_CFLAGS} ${CFLAGS}"
1341
1335
CXXFLAGS="${SYMBOLS_CXXFLAGS} ${CXXFLAGS}"
1475
1469
esac
1476
1470
AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
1477
1471
 
 
1472
dnl GCC Precompiled Header Support
 
1473
AM_CONDITIONAL([GCC_PCH],[test "x$GCC" = "xyes"])
 
1474
 
1478
1475
AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
1479
1476
 mystrings/Makefile storage/Makefile dnl
1480
1477
 vio/Makefile po/Makefile.in dnl
1483
1480
 drizzled/field/Makefile dnl
1484
1481
 drizzled/serialize/Makefile dnl
1485
1482
 drizzled/functions/Makefile dnl
 
1483
 drizzled/util/Makefile dnl
1486
1484
 drizzled/sql_builtin.cc dnl
1487
1485
 support-files/Makefile dnl
1488
1486
 tests/Makefile tests/install_test_db dnl
1502
1500
echo ""
1503
1501
echo "   * Installation prefix:       $prefix"
1504
1502
echo "   * System type:               $SYSTEM_TYPE"
 
1503
echo "   * Host CPU:                  $host_cpu"
1505
1504
echo "   * C Compiler:                $CC_VERSION"
1506
1505
echo "   * C++ Compiler:              $CXX"
1507
 
echo "   * Assertions enabled:        $ac_assert"
 
1506
echo "   * Build auth_pam:            $ac_cv_header_security_pam_appl_h"
 
1507
echo "   * Assertions enabled:        $ac_cv_assert"
1508
1508
echo "   * Debug enabled:             $with_debug"
1509
1509
echo "   * Profiling enabled:         $ac_profiling"
1510
1510
echo "   * Coverage enabled:          $ac_coverage"
1511
1511
echo "   * Warnings as failure:       $ac_warn_fail"
1512
 
echo "   * ac_cv_cxx_cstdint:         $ac_cv_cxx_cstdint"
1513
 
echo "   * ac_cv_cxx_hash_map:        $ac_cv_cxx_hash_map"
1514
 
echo "   * ac_cv_cxx_hash_namespace:  $ac_cv_cxx_hash_namespace"
1515
 
echo "   * ac_cv_cxx_cmath:           $ac_cv_cxx_cmath"
1516
 
echo "   * ac_cv_cxx_cmath_namespace: $ac_cv_cxx_cmath_namespace"
 
1512
echo "   * C++ cstdint location:      $ac_cv_cxx_cstdint"
 
1513
echo "   * C++ hash_map location:     $ac_cv_cxx_hash_map"
 
1514
echo "   * C++ hash namespace:        $ac_cv_cxx_hash_namespace"
 
1515
echo "   * C++ cmath location:        $ac_cv_cxx_cmath"
 
1516
echo "   * C++ cmath namespace:       $ac_cv_cxx_cmath_namespace"
1517
1517
echo ""
1518
1518
echo "---"