← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Diego Medina
  • Date: 2009-10-05 04:05:29 UTC
  • mfrom: (1161 staging)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: diego.medina@sun.com-20091005040529-5g1qe9gxzslpgefd
resolved small merge issue

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
43
43
AS_IF([test "x$GPERF" = "x"],
44
44
      AC_MSG_ERROR("Drizzle requires gperf to build."))
45
45
 
46
 
AC_PATH_PROG(LCOV, lcov)
47
 
AC_PATH_PROG(GENHTML, genhtml)
48
 
 
49
 
AM_CONDITIONAL(HAVE_LCOV,[test "x$LCOV" != "x"])
50
 
 
51
46
AC_CHECK_PROGS(YACC, ['bison -y'])
52
47
AS_IF([test "x$YACC" = "x" -a "$building_from_bzr" = "yes"],[
53
48
  AC_MSG_ERROR(["bison is required for Drizzle to build from a bzr branch"])
451
446
  AC_MSG_ERROR("Drizzle requires fcntl.")
452
447
fi
453
448
 
454
 
AC_CONFIG_LIBOBJ_DIR([gnulib])
 
449
 
 
450
AC_CACHE_CHECK([working fdatasync],[ac_cv_func_fdatasync],[
 
451
  AC_LANG_PUSH(C++)
 
452
  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
 
453
#include <unistd.h>
 
454
    ]],[[
 
455
fdatasync(4);
 
456
    ]])],
 
457
  [ac_cv_func_fdatasync=yes],
 
458
  [ac_cv_func_fdatasync=no])
 
459
  AC_LANG_POP()
 
460
])
 
461
AS_IF([test "x${ac_cv_func_fdatasync}" = "xyes"],
 
462
  [AC_DEFINE([HAVE_FDATASYNC],[1],[If the system has a working fdatasync])])
 
463
 
455
464
 
456
465
AC_CHECK_FUNCS( \
457
466
  cuserid fchmod \
458
 
  fdatasync fpresetsticky fpsetmask fsync \
 
467
  fpresetsticky fpsetmask fsync \
459
468
  getpassphrase getpwnam \
460
469
  getpwuid getrlimit getrusage index initgroups isnan \
461
470
  localtime_r log log2 gethrtime gmtime_r \
656
665
 
657
666
dnl Has to be done late, as the plugin may need to check for existence of
658
667
dnl functions tested above
659
 
PANDORA_PLUGINS
 
668
PANDORA_PLUGINS([drizzled/plugin/config.h])
660
669
 
661
670
dnl GCC Precompiled Header Support
662
671
dnl re-enable later