← 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-03-09 15:52:42 UTC
  • mfrom: (919.2.14 mordred)
  • Revision ID: brian@tangent.org-20090309155242-lv5dje0wgd44rcm8
Merge of Monty's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
43
43
gl_USE_SYSTEM_EXTENSIONS
44
44
if test "$GCC" = "yes"
45
45
then
 
46
  # If you're on a Mac, and you didn't ask for a specific compiler
 
47
  # You're gonna get 4.2.
 
48
  if test "$host_vendor" = "apple" -a "x${ac_cv_env_CC_set}" = "x"
 
49
  then
 
50
    CPP="/usr/bin/gcc-4.2 -E"
 
51
    CC=/usr/bin/gcc-4.2
 
52
    CXX=/usr/bin/g++-4.2
 
53
  fi
46
54
  AC_CACHE_CHECK([if GCC is recent enough], [drizzle_cv_gcc_recent],
47
55
    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
48
 
#if !defined(__GNUC__) || (__GNUC__ < 4)
 
56
#if !defined(__GNUC__) || (__GNUC__ < 4) || ((__GNUC__ >= 4) && (__GNUC_MINOR__ < 2))
49
57
# error GCC is Too Old!
50
58
#endif
51
59
      ]])],
53
61
      [drizzle_cv_gcc_recent=no])])
54
62
  if test "$drizzle_cv_gcc_recent" = "no"
55
63
  then
56
 
    AC_MSG_ERROR([Your version of GCC is too old. Drizzle requires at least version 4.0.2])
 
64
    AC_MSG_ERROR([Your version of GCC is too old. Drizzle requires at least version 4.2. If you are on OSX, you may need to specify ./configure CC=gcc-4.2 CXX=g++4.2])
57
65
  fi
58
66
fi
59
67
AC_CXX_HEADER_STDCXX_98
336
344
AC_CXX_STL_HASH
337
345
AC_CXX_CSTDINT
338
346
AC_CXX_CINTTYPES
339
 
AC_CXX_CMATH
340
347
 
341
348
DRIZZLE_PROG_AR
342
349
 
1363
1370
    W_EXCEPTIONS="-fexceptions"
1364
1371
  fi
1365
1372
  NO_REDUNDANT_DECLS="-Wno-redundant-decls"
1366
 
  # Disable exceptions as they seams to create problems with gcc and threads.
1367
 
  # drizzled doesn't use run-time-type-checking, so we disable it.
1368
 
  CXXFLAGS="${CXXFLAGS} -fno-rtti"
1369
 
  CPPFLAGS="${CPPFLAGS} -fpch-deps"
1370
 
  PROTOSKIP_WARNINGS="${NO_SHADOW}"
 
1373
  PROTOSKIP_WARNINGS=""
1371
1374
fi
1372
1375
if test "$SUNCC" = "yes"
1373
1376
then
1408
1411
 
1409
1412
AM_CPPFLAGS="${CPPFLAGS}"
1410
1413
AM_CFLAGS="${CC_WARNINGS} ${CFLAGS}"
1411
 
AM_CXXFLAGS="${CXX_WARNINGS} ${NO_EXCEPTIONS} ${CXXFLAGS}"
 
1414
AM_CXXFLAGS="${CXX_WARNINGS} ${W_EXCEPTIONS} ${CXXFLAGS}"
1412
1415
 
1413
1416
AC_SUBST([AM_CPPFLAGS])
1414
1417
AC_SUBST([AM_CFLAGS])
1503
1506
echo "   * C++ cstdint location:      $ac_cv_cxx_cstdint"
1504
1507
echo "   * C++ hash_map location:     $ac_cv_cxx_hash_map"
1505
1508
echo "   * C++ hash namespace:        $ac_cv_cxx_hash_namespace"
1506
 
echo "   * C++ cmath location:        $ac_cv_cxx_cmath"
1507
 
echo "   * C++ cmath namespace:       $ac_cv_cxx_cmath_namespace"
1508
1509
echo ""
1509
1510
echo "---"
1510
1511