← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Monty Taylor
  • Date: 2009-03-02 08:09:49 UTC
  • mfrom: (907.3.4 solaris-flags)
  • mto: This revision was merged to the branch mainline in revision 910.
  • Revision ID: mordred@inaugust.com-20090302080949-1rioypdwkuj001q3
Merged from solaris-flags.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
119
119
    [SYSTEM_TYPE="$host_vendor-$host_os"])
120
120
AC_ARG_WITH([machine-type],
121
121
    [AS_HELP_STRING([--with-machine-type],
122
 
       [Set the machine type, like "powerpc"])],
 
122
       [Set the machine type, like "sparc"])],
123
123
    [MACHINE_TYPE="$withval"],
124
124
    [MACHINE_TYPE="$host_cpu"])
125
125
AC_SUBST(SYSTEM_TYPE)
234
234
then
235
235
  case "$host_cpu" in
236
236
    *ppc* | *powerpc*)
237
 
      AM_CFLAGS="$AM_CFLAGS -mno-fused-madd"
238
 
      AM_CXXFLAGS="$AM_CXXFLAGS -mno-fused-madd"
 
237
      CFLAGS="$CFLAGS -mno-fused-madd"
 
238
      CXXFLAGS="$CXXFLAGS -mno-fused-madd"
239
239
    ;;
240
240
  esac
241
241
fi
243
243
# First check for gcc and g++
244
244
if test "$GCC" = "yes"
245
245
then
246
 
  AM_CFLAGS="${AM_CPPFLAGS} -ggdb3 -std=gnu99"
247
 
  AM_CXXFLAGS="${AM_CXXFLAGS} -ggdb3 -std=gnu++98"
 
246
  CFLAGS="${CFLAGS} -ggdb3 -std=gnu99"
 
247
  CXXFLAGS="${CXXFLAGS} -ggdb3 -std=gnu++98"
248
248
 
249
249
  DEBUG_CFLAGS="-O0"
250
250
  DEBUG_CXXFLAGS="-O0"
257
257
  if test "$target_cpu" = "sparc"
258
258
  then
259
259
    MEMALIGN_FLAGS="-xmemalign=8s"
 
260
    IS_64="-m64"
 
261
  else
 
262
    isainfo_k=`isainfo -k`
 
263
    if test "$isainfo_k" = "amd64"
 
264
    then
 
265
      IS_64="-m64"
 
266
      LDFLAGS="${LDFLAGS} -L/usr/lib/amd64 -L/usr/local/lib/amd64"
 
267
    fi
260
268
  fi
261
 
  AM_CXXFLAGS="${AM_CXXFLAGS} -xlang=c99 -g -compat=5 -library=stlport4 -template=no%extdef ${MEMALIGN_FLAGS}"
262
 
  AM_CFLAGS="${AM_CFLAGS} -g ${MEMALIGN_FLAGS}"
 
269
  CXXFLAGS="${CXXFLAGS} -xlang=c99 -g -mt -compat=5 -library=stlport4 -template=no%extdef ${IS_64} ${MEMALIGN_FLAGS}"
 
270
  CFLAGS="${CFLAGS} -g -mt -xc99=all ${IS_64} ${MEMALIGN_FLAGS}"
263
271
  DEBUG_CFLAGS="-xO0"
264
272
  DEBUG_CXXFLAGS="-xO0" 
265
273
 
266
 
  OPTIMIZE_FLAGS="-xO4 -xlibmil -xdepend -xprefetch=explicit"
 
274
  dnl TODO: -xO4 causes a Sun Studio failure in innodb... let's check back
 
275
  dnl       in on this one.
 
276
  OPTIMIZE_FLAGS="-xO3 -xlibmil -xdepend"
267
277
  OPTIMIZE_CFLAGS="${OPTIMIZE_FLAGS} -Xa -xstrconst"
268
278
  OPTIMIZE_CXXFLAGS="${OPTIMIZE_FLAGS}"
 
279
 
269
280
fi
270
281
 
271
282
# We use libtool
296
307
if test "$with_debug" = "yes"
297
308
then
298
309
  # Debuging. No optimization.
299
 
  AM_CFLAGS="${DEBUG_CFLAGS} -DDEBUG ${AM_CFLAGS}"
300
 
  AM_CXXFLAGS="${DEBUG_CXXFLAGS} -DDEBUG ${AM_CXXFLAGS}"
 
310
  CFLAGS="${DEBUG_CFLAGS} -DDEBUG ${CFLAGS}"
 
311
  CXXFLAGS="${DEBUG_CXXFLAGS} -DDEBUG ${CXXFLAGS}"
301
312
else
302
313
  # Optimized version. No debug
303
 
  AM_CFLAGS="${OPTIMIZE_CFLAGS} ${AM_CFLAGS}"
304
 
  AM_CXXFLAGS="$OPTIMIZE_CXXFLAGS ${AM_CXXFLAGS}"
 
314
  CFLAGS="${OPTIMIZE_CFLAGS} ${CFLAGS}"
 
315
  CXXFLAGS="${OPTIMIZE_CXXFLAGS} ${CXXFLAGS}"
305
316
fi
306
317
 
307
318
 
395
406
 
396
407
ACX_PTHREAD(,AC_MSG_ERROR(could not find libpthread))
397
408
LIBS="$PTHREAD_LIBS $LIBS"
398
 
AM_CFLAGS="${AM_CFLAGS} $PTHREAD_CFLAGS"
 
409
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
399
410
CC="$PTHREAD_CC"
400
411
 
401
412
#--------------------------------------------------------------------
1336
1347
  NO_REDUNDANT_DECLS="-Wno-redundant-decls"
1337
1348
  # Disable exceptions as they seams to create problems with gcc and threads.
1338
1349
  # drizzled doesn't use run-time-type-checking, so we disable it.
1339
 
  AM_CXXFLAGS="${AM_CXXFLAGS} -fno-rtti"
1340
 
  AM_CPPFLAGS="${AM_CPPFLAGS} -fpch-deps"
 
1350
  CXXFLAGS="${CXXFLAGS} -fno-rtti"
 
1351
  CPPFLAGS="${CPPFLAGS} -fpch-deps"
1341
1352
  PROTOSKIP_WARNINGS="${NO_SHADOW}"
1342
1353
fi
1343
1354
if test "$SUNCC" = "yes"
1344
1355
then
1345
1356
  if test "$ac_datarace" = "yes"
1346
1357
  then
1347
 
    AM_CFLAGS="${AM_CFLAGS} -xinstrument=datarace"
1348
 
    AM_CXXFLAGS="${AM_CXXFLAGS} -xinstrument=datarace"
 
1358
    CFLAGS="${CFLAGS} -xinstrument=datarace"
 
1359
    CXXFLAGS="${CXXFLAGS} -xinstrument=datarace"
1349
1360
  fi
1350
1361
 
1351
1362
  if test "$ac_warn_fail" = "yes"
1353
1364
    W_FAIL="-errwarn=%all"
1354
1365
  fi
1355
1366
 
1356
 
  CC_WARNINGS="-v -xc99=all -errtags=yes -erroff=E_ATTRIBUTE_NOT_VAR"
1357
 
  CXX_WARNINGS="+w +w2 -xport64 -errtags=yes -erroff=attrskipunsup,doubunder,reftotemp,inllargeuse -compat=5"
1358
 
  #CC_WARNINGS="-v -xc99=all -errtags=yes -erroff=E_ATTRIBUTE_NOT_VAR"
1359
 
  #CXX_WARNINGS="+w +w2 -xport64 -errtags=yes -erroff=attrskipunsup,doubunder -compat=5"
1360
 
  PROTOSKIP_WARNINGS="-erroff=attrskipunsup,doubunder,reftotemp,wbadinitl,identexpected,inllargeuse"
 
1367
  CC_WARNINGS="-v -errtags=yes -erroff=E_ATTRIBUTE_NOT_VAR ${W_FAIL}"
 
1368
  CXX_WARNINGS="+w +w2 -xport64 -errtags=yes -erroff=attrskipunsup,doubunder,reftotemp,inllargeuse,truncwarn1 ${W_FAIL}" 
 
1369
  PROTOSKIP_WARNINGS="-erroff=attrskipunsup,doubunder,reftotemp,wbadinitl,identexpected,inllargeuse,truncwarn1"
1361
1370
  NO_UNREACHED="-erroff=E_STATEMENT_NOT_REACHED"
1362
1371
  if test "$ac_exceptions" = "no"
1363
1372
  then
1365
1374
    W_EXCEPTIONS="-features=except"
1366
1375
  fi
1367
1376
fi
1368
 
AM_CXXFLAGS="${CXX_WARNINGS} ${NO_EXCEPTIONS}  ${AM_CXXFLAGS}"
1369
 
AM_CFLAGS="${CC_WARNINGS} ${AM_CFLAGS}"
1370
 
 
1371
1377
AC_SUBST(NO_EXCEPTIONS)
1372
1378
AC_SUBST(W_EXCEPTIONS)
1373
1379
AC_SUBST(NO_SHADOW)
1376
1382
AC_SUBST(PROTOSKIP_WARNINGS)
1377
1383
AC_SUBST(NO_UNREACHED)
1378
1384
 
1379
 
GLOBAL_CPPFLAGS='-I$(top_srcdir) -I$(top_builddir)'
 
1385
CPPFLAGS='${CPPFLAGS} -I$(top_srcdir) -I$(top_builddir)'
1380
1386
if test "$ac_cv_func_timegm" = "no" -o "$gl_cv_func_gnu_getopt" = "no"
1381
1387
then
1382
 
  GLOBAL_CPPFLAGS="${GLOBAL_CPPFLAGS} -I\$(top_srcdir)/gnulib -I\$(top_builddir)/gnulib"
 
1388
  CPPFLAGS="${CPPFLAGS} -I\$(top_srcdir)/gnulib -I\$(top_builddir)/gnulib"
1383
1389
fi
1384
 
AC_SUBST([GLOBAL_CPPFLAGS])
1385
 
AC_SUBST([AM_CPPFLAGS],['${GLOBAL_CPPFLAGS}'])
1386
 
AC_SUBST([GLOBAL_CXXFLAGS],[${AM_CXXFLAGS}])
 
1390
 
 
1391
AM_CPPFLAGS="${CPPFLAGS}"
 
1392
AM_CFLAGS="${CC_WARNINGS} ${CFLAGS}"
 
1393
AM_CXXFLAGS="${CXX_WARNINGS} ${NO_EXCEPTIONS} ${CXXFLAGS}"
 
1394
 
 
1395
AC_SUBST([AM_CPPFLAGS])
1387
1396
AC_SUBST([AM_CFLAGS])
1388
1397
AC_SUBST([AM_CXXFLAGS])
1389
1398
 
1390
 
 
1391
 
# Some usefull subst
1392
 
AC_SUBST(CC)
1393
 
AC_SUBST(GXX)
1394
 
 
1395
 
# Set configuration options for make_binary_distribution
1396
 
case $SYSTEM_TYPE in
1397
 
  *netware*)
1398
 
    MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --no-strip"
1399
 
    ;;
1400
 
  *)
1401
 
    : # no change for other platforms yet
1402
 
    ;;
1403
 
esac
1404
 
AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
 
1399
dnl We've collected the flags in AM_*FLAGS now, so blank these.
 
1400
CFLAGS=""
 
1401
CXXFLAGS=""
 
1402
CPPFLAGS=""
1405
1403
 
1406
1404
AC_SUBST(pkgplugindir,"\$(pkglibdir)/plugin")
1407
1405