← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: mordred
  • Date: 2008-10-31 22:23:13 UTC
  • mto: (572.1.1 devel) (575.1.1 devel)
  • mto: This revision was merged to the branch mainline in revision 573.
  • Revision ID: mordred@opensolaris-20081031222313-xvd15xzpy2qrqy3z
https://launchpad.net/bugs/278814
Added an option to specify --with-probuf=<location>

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
408
408
    ;;
409
409
  esac
410
410
fi
 
411
# Build optimized or debug version ?
 
412
# First check for gcc and g++
 
413
SYMBOLS_FLAGS="-g"
 
414
DEBUG_OPTIMIZE_CC=""
 
415
OPTIMIZE_CFLAGS="-O"
 
416
DEBUG_OPTIMIZE_CXX=""
 
417
OPTIMIZE_CXXFLAGS="-O"
 
418
if test "$GCC" = "yes"
 
419
then
 
420
  SYMBOLS_FLAGS="-ggdb3"
 
421
  DEBUG_OPTIMIZE_CC="-O0"
 
422
  OPTIMIZE_CFLAGS="-O3"
 
423
  DEBUG_OPTIMIZE_CXX="-O0"
 
424
  OPTIMIZE_CXXFLAGS="-O3"
 
425
fi
 
426
if test "$SUNCC" = "yes"
 
427
then
 
428
  SYMBOLS_CLAGS="-g"
 
429
  DEBUG_OPTIMIZE_CC=""
 
430
  OPTIMIZE_CFLAGS="-xO4 -xlibmil -xdepend -Xa -xstrcont -mt -D_FORTEC_"
 
431
  DEBUG_OPTIMIZE_CXX=""
 
432
  OPTIMIZE_CXXFLAGS="-xO4 -xlibmil -library=stlport4 -mt -D_FORTEC_"
 
433
fi
 
434
 
 
435
dnl TODO: Remove this define once we are using 2.61 across the board.
 
436
# AX_HEADER_ASSERT
 
437
# ----------------
 
438
# Check whether to enable assertions.
 
439
AC_DEFUN([AX_HEADER_ASSERT],
 
440
[
 
441
  AC_MSG_CHECKING([whether to enable assertions])
 
442
  AC_ARG_ENABLE([assert],
 
443
    [AS_HELP_STRING([--disable-assert],
 
444
       [Turn off assertions])],
 
445
    [ac_cv_assert="no"],
 
446
    [ac_cv_assert="yes"])
 
447
  AC_MSG_RESULT([$ac_cv_assert])
 
448
])
 
449
 
 
450
AX_HEADER_ASSERT
 
451
 
 
452
CFLAGS="${SYMBOLS_FLAGS} ${CFLAGS}"
 
453
CXXFLAGS="${SYMBOLS_FLAGS} ${CXXFLAGS}"
 
454
 
 
455
AC_ARG_WITH([debug],
 
456
    [AS_HELP_STRING([--with-debug],
 
457
       [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],
 
458
    [with_debug=$withval],
 
459
    [with_debug=no])
 
460
if test "$with_debug" = "yes"
 
461
then
 
462
  # Medium debug.
 
463
  CFLAGS="$DEBUG_OPTIMIZE_CC -DDEBUG $CFLAGS ${SAVE_CFLAGS}"
 
464
  CXXFLAGS="$DEBUG_OPTIMIZE_CXX -DDEBUG $CXXFLAGS ${SAVE_CXXFLAGS}"
 
465
else
 
466
  # Optimized version. No debug
 
467
  CFLAGS="${OPTIMIZE_CFLAGS} ${CFLAGS} ${SAVE_CFLAGS}"
 
468
  CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS ${SAVE_CXXFLAGS}"
 
469
fi
411
470
 
412
471
AC_SUBST(CC)
413
472
AC_SUBST(CFLAGS)
439
498
# Check for Google Proto Buffers
440
499
#--------------------------------------------------------------------
441
500
 
 
501
AC_MSG_CHECKING(for Google Protocol Buffers)
 
502
AC_ARG_WITH(protobuf,
 
503
  [AS_HELP_STRING([--with-protobuf],
 
504
       [Use protobuf directory])],
 
505
  [ with_protobuf=$withval ],
 
506
  [ with_protobuf=yes ])
 
507
 
 
508
save_CPPFLAGS="$CPPFLAGS"
 
509
save_LIBS="$LIBS"
 
510
 
 
511
if test "$with_protobuf" = "yes"
 
512
then
 
513
  CPPFLAGS=""
 
514
  LIBS="-lprotobuf"
 
515
else
 
516
  CPPFLAGS="-I$withval/include"
 
517
  LIBS="-L$withval/lib -lprotobuf"
 
518
fi 
 
519
 
442
520
AC_LANG_PUSH([C++])
443
521
AC_CHECK_HEADERS([google/protobuf/message.h])
444
522
if test "x$ac_cv_header_google_protobuf_message_h" != "xyes"
445
523
then
446
524
  AC_MSG_ERROR([Couldn't find message.h. Try installing Google Protocol Buffer development packages])
447
525
fi
448
 
 
449
 
save_CFLAGS="$CFLAGS"
450
 
save_LIBS="$LIBS"
451
 
CFLAGS=""
452
 
LIBS="-lprotobuf"
 
526
AC_MSG_RESULT("$wthval")
453
527
 
454
528
AC_CACHE_CHECK([for Message in libprotobuf], ac_libprotobuf_works, [
455
529
  AC_TRY_LINK([
463
537
])
464
538
 
465
539
PROTOBUF_LIBS="${LIBS}"
 
540
PROTOBUF_CPPFLAGS="${CPPFLAGS}"
466
541
AC_SUBST(PROTOBUF_LIBS)
467
 
CFLAGS="$save_CFLAGS"
 
542
AC_SUBST(PROTOBUF_CPPFLAGS)
 
543
CPPFLAGS="$save_CPPFLAGS"
468
544
LIBS="$save_LIBS"
469
545
AC_LANG_POP()
470
546
 
1351
1427
AC_SUBST(mysql_plugin_libs)
1352
1428
AC_SUBST(mysql_plugin_defs)
1353
1429
 
1354
 
# Build optimized or debug version ?
1355
 
# First check for gcc and g++
1356
 
SYMBOLS_FLAGS="-g"
1357
 
DEBUG_OPTIMIZE_CC=""
1358
 
OPTIMIZE_CFLAGS="-O"
1359
 
DEBUG_OPTIMIZE_CXX=""
1360
 
OPTIMIZE_CXXFLAGS="-O"
1361
 
if test "$GCC" = "yes"
1362
 
then
1363
 
  SYMBOLS_FLAGS="-ggdb3"
1364
 
  DEBUG_OPTIMIZE_CC="-O0"
1365
 
  OPTIMIZE_CFLAGS="-O3"
1366
 
  DEBUG_OPTIMIZE_CXX="-O0"
1367
 
  OPTIMIZE_CXXFLAGS="-O3"
1368
 
fi
1369
 
if test "$SUNCC" = "yes"
1370
 
then
1371
 
  SYMBOLS_CLAGS="-g"
1372
 
  DEBUG_OPTIMIZE_CC=""
1373
 
  OPTIMIZE_CFLAGS="-xO4 -xlibmil -xdepend"
1374
 
  DEBUG_OPTIMIZE_CXX=""
1375
 
  OPTIMIZE_CXXFLAGS="-xO4 -xlibmil"
1376
 
fi
1377
 
 
1378
 
dnl TODO: Remove this define once we are using 2.61 across the board.
1379
 
# AX_HEADER_ASSERT
1380
 
# ----------------
1381
 
# Check whether to enable assertions.
1382
 
AC_DEFUN([AX_HEADER_ASSERT],
1383
 
[
1384
 
  AC_MSG_CHECKING([whether to enable assertions])
1385
 
  AC_ARG_ENABLE([assert],
1386
 
    [AS_HELP_STRING([--disable-assert],
1387
 
       [Turn off assertions])],
1388
 
    [ac_cv_assert="no"],
1389
 
    [ac_cv_assert="yes"])
1390
 
  AC_MSG_RESULT([$ac_cv_assert])
1391
 
])
1392
 
 
1393
 
AX_HEADER_ASSERT
1394
 
 
1395
 
CFLAGS="${SYMBOLS_FLAGS} ${CFLAGS}"
1396
 
CXXFLAGS="${SYMBOLS_FLAGS} ${CXXFLAGS}"
1397
 
 
1398
 
AC_ARG_WITH([debug],
1399
 
    [AS_HELP_STRING([--with-debug],
1400
 
       [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],
1401
 
    [with_debug=$withval],
1402
 
    [with_debug=no])
1403
 
if test "$with_debug" = "yes"
1404
 
then
1405
 
  # Medium debug.
1406
 
  CFLAGS="$DEBUG_OPTIMIZE_CC -DDEBUG $CFLAGS ${SAVE_CFLAGS}"
1407
 
  CXXFLAGS="$DEBUG_OPTIMIZE_CXX -DDEBUG $CXXFLAGS ${SAVE_CXXFLAGS}"
1408
 
else
1409
 
  # Optimized version. No debug
1410
 
  CFLAGS="${OPTIMIZE_CFLAGS} ${CFLAGS} ${SAVE_CFLAGS}"
1411
 
  CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS ${SAVE_CXXFLAGS}"
1412
 
fi
1413
1430
 
1414
1431
AC_ARG_ENABLE([profiling],
1415
1432
    [AS_HELP_STRING([--enable-profiling],