← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: mordred
  • Date: 2008-11-02 08:47:15 UTC
  • mto: (575.1.1 devel)
  • mto: This revision was merged to the branch mainline in revision 573.
  • Revision ID: mordred@opensolaris-20081102084715-y8f52lubmqmmnxpf
A whole bunch of solaris/sun studio compile fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
109
109
 
110
110
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
111
111
 
112
 
AC_CXX_STL_HASH
113
 
AC_CXX_CSTDINT
114
 
AC_CXX_CINTTYPES
115
 
AC_CXX_CMATH
116
 
 
117
112
dnl AC_CANONICAL_HOST thinks it's a good idea to just set CFLAGS to 
118
113
dnl -g -O2 if you're running gcc. We would like to use something else, thanks.
119
114
if test "x${CFLAGS}" = "x-g -O2"
424
419
  SYMBOLS_FLAGS=""
425
420
  DEBUG_OPTIMIZE_CC=""
426
421
  #OPTIMIZE_CFLAGS="-xO4 -xlibmil -xdepend -Xa -xstrconst -mt -D_FORTEC_"
427
 
  OPTIMIZE_CFLAGS="-xO4 -xlibmil -xdepend -Xa -mt -xstrconst -D_FORTEC_ -v -errtags=yes"
 
422
  OPTIMIZE_CFLAGS="-xO4 -xlibmil -xdepend -Xa -mt -xstrconst -D_FORTEC_"
428
423
  DEBUG_OPTIMIZE_CXX=""
429
 
  OPTIMIZE_CXXFLAGS="-xO4 -xlibmil -library=stlport4 -mt -D_FORTEC_ -xport64 +w +w2 -errtags=yes -erroff=attrskipunsup -xlang=c99 -compat=5"
 
424
  OPTIMIZE_CXXFLAGS="-xO4 -xlibmil -library=stlport4 -mt -D_FORTEC_ -xlang=c99 -compat=5"
430
425
fi
431
426
 
432
427
dnl TODO: Remove this define once we are using 2.61 across the board.
476
471
 
477
472
export CC CXX CFLAGS LD LDFLAGS AR ARFLAGS
478
473
 
479
 
if test "$GCC" = "yes"
480
 
then
481
 
  # Disable exceptions as they seams to create problems with gcc and threads.
482
 
  # drizzled doesn't use run-time-type-checking, so we disable it.
483
 
  AM_CXXFLAGS="${AM_CXXFLAGS} -fno-rtti"
484
 
fi
 
474
AC_CXX_STL_HASH
 
475
AC_CXX_CSTDINT
 
476
AC_CXX_CINTTYPES
 
477
AC_CXX_CMATH
485
478
 
486
479
DRIZZLE_PROG_AR
487
480
 
1588
1581
    W_CRAZY="-Wshadow -Wconversion -Winvalid-pch"
1589
1582
  fi
1590
1583
 
1591
 
  GCC_WARNINGS="${C99_SUPPORT_HACK} ${BASE_WARNINGS} ${GCC_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_CRAZY}"
1592
 
  GXX_WARNINGS="${BASE_WARNINGS} ${GXX_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_CAST} ${W_EFFC} ${W_CRAZY}"
 
1584
  CC_WARNINGS="${C99_SUPPORT_HACK} ${BASE_WARNINGS} ${GCC_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_CRAZY}"
 
1585
  CXX_WARNINGS="${BASE_WARNINGS} ${GXX_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_CAST} ${W_EFFC} ${W_CRAZY}"
1593
1586
 
1594
 
  AM_CXXFLAGS="${GXX_WARNINGS} ${AM_CXXFLAGS}"
1595
 
  AM_CFLAGS="${GCC_WARNINGS} ${AM_CFLAGS}"
 
1587
  NO_EXCEPTIONS="-fno-exceptions"
 
1588
  W_EXCEPTIONS="-fexceptions"
 
1589
  NO_UNUSED_MACROS="-Wno-unused-macros"
 
1590
  NO_REDUNDANT_DECLS="-Wno-redundant-decls"
 
1591
  # Disable exceptions as they seams to create problems with gcc and threads.
 
1592
  # drizzled doesn't use run-time-type-checking, so we disable it.
 
1593
  AM_CXXFLAGS="${AM_CXXFLAGS} -fno-rtti"
1596
1594
fi
1597
1595
if test "$SUNCC" = "yes"
1598
1596
then
1599
 
  AM_CFLAGS="-v -xc99=all ${AM_CFLAGS}"
1600
 
  AM_CXXFLAGS="-v ${AM_CXXFLAGS}"
 
1597
  CC_WARNINGS="-v -xc99=all -errtags=yes"
 
1598
  CXX_WARNINGS="+w +w2 -xport64 -errtags=yes -erroff=attrskipunsup -compat=5"
 
1599
  NO_EXCEPTIONS="-features=no%except"
 
1600
  W_EXCEPTIONS="-features=except"
1601
1601
fi
 
1602
AM_CXXFLAGS="${CXX_WARNINGS} ${NO_EXCEPTIONS}  ${AM_CXXFLAGS}"
 
1603
AM_CFLAGS="${CC_WARNINGS} ${AM_CFLAGS}"
 
1604
 
 
1605
AC_SUBST(NO_EXCEPTIONS)
 
1606
AC_SUBST(W_EXCEPTIONS)
 
1607
AC_SUBST(NO_UNUSED_MACROS)
 
1608
AC_SUBST(NO_REDUNDANT_DECLS)
1602
1609
 
1603
1610
AC_SUBST([GLOBAL_CPPFLAGS],['-I$(top_srcdir) -I$(top_builddir)'])
1604
1611
AC_SUBST([AM_CPPFLAGS],['${GLOBAL_CPPFLAGS}'])