← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

Merged from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
22
22
dnl So don't update it here
23
23
AC_INIT([drizzle],[7],[http://bugs.launchpad.net/drizzle])
24
24
AC_CONFIG_SRCDIR([drizzled/drizzled.cc])
25
 
AC_CONFIG_AUX_DIR(config)
26
 
AC_CONFIG_HEADERS([config.h])
27
 
AC_CONFIG_MACRO_DIR([m4])
 
25
AC_CONFIG_AUX_DIR([config])
28
26
 
29
 
PANDORA_CANONICAL_TARGET(less-warnings, warnings-always-on, use-gnulib, require-cxx, force-gcc42, skip-visibility, version-from-vc)
 
27
PANDORA_CANONICAL_TARGET(less-warnings, warnings-always-on, require-cxx, force-gcc42, skip-visibility, version-from-vc)
30
28
 
31
29
dnl Set the default datadir location to /usr/local/var/drizzle. If a
32
30
dnl localstatedir is explicitly given, just use that.
39
37
      AC_MSG_ERROR("Drizzle requires gperf to build."))
40
38
 
41
39
AC_CHECK_PROGS(YACC, ['bison -y'])
42
 
AS_IF([test "x$YACC" = "x" -a "$ac_cv_building_from_bzr" = "yes"],[
 
40
AS_IF([test "x$YACC" = "x" -a "$pandora_building_from_bzr" = "yes"],[
43
41
  AC_MSG_ERROR(["bison is required for Drizzle to build from a bzr branch"])
44
42
])
45
43
 
46
44
 
47
 
PANDORA_WITH_GETTEXT
48
45
PANDORA_RUN_CPPLINT
49
46
 
50
47
PANDORA_REQUIRE_LIBPROTOBUF