← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: lbieber
  • Date: 2010-10-01 12:16:18 UTC
  • mfrom: (1802.1.1 fix-bug-651256)
  • Revision ID: lbieber@orisndriz08-20101001121618-uqcboygpjwbiglem
Merge Vijay - fix bug 651256 - Remove --help-extended

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
1
dnl -*- bash -*-
2
2
dnl Process this file with autoconf to produce a configure script.
3
3
 
4
 
dnl  Copyright (C) 2009 Sun Microsystems, Inc.
 
4
dnl  Copyright (C) 2009 Sun Microsystems
5
5
dnl
6
6
dnl  This program is free software; you can redistribute it and/or modify
7
7
dnl  it under the terms of the GNU General Public License as published by
24
24
AC_CONFIG_SRCDIR([drizzled/drizzled.cc])
25
25
AC_CONFIG_AUX_DIR([config])
26
26
 
27
 
PANDORA_CANONICAL_TARGET(less-warnings, require-cxx, force-gcc42, version-from-vc) 
 
27
PANDORA_CANONICAL_TARGET(less-warnings, warnings-always-on, require-cxx, force-gcc42, version-from-vc, skip-visibility)
28
28
 
29
 
LIBDRIZZLE_LIBRARY_VERSION=1:0:0
 
29
LIBDRIZZLE_LIBRARY_VERSION=0:8:0
30
30
#                          | | |
31
31
#                   +------+ | +---+
32
32
#                   |        |     |
43
43
 
44
44
# libdrizzle versioning when linked with GNU ld.
45
45
AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
46
 
  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/config/drizzle.ver"
 
46
  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libdrizzle/libdrizzle.ver"
47
47
  ])
48
48
AC_SUBST(LD_VERSION_SCRIPT)
49
49
 
 
50
 
50
51
dnl Set the default datadir location to /usr/local/var/drizzle. If a
51
52
dnl localstatedir is explicitly given, just use that.
52
53
AS_IF([test "x${localstatedir}" = 'x${prefix}/var'],[
57
58
AS_IF([test "x$GPERF" = "x"],
58
59
      AC_MSG_ERROR("Drizzle requires gperf to build."))
59
60
 
 
61
AC_CHECK_PROGS(YACC, ['bison -y'])
 
62
AS_IF([test "x$YACC" = "x" -a "$pandora_building_from_bzr" = "yes"],[
 
63
  AC_MSG_ERROR(["bison is required for Drizzle to build from a bzr branch"])
 
64
])
 
65
 
60
66
# libexecinfo provides backtrace_symbols on FreeBSD
61
67
AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
62
68
 
 
69
PANDORA_RUN_CPPLINT
 
70
 
63
71
PANDORA_REQUIRE_LIBPROTOBUF
64
72
PANDORA_PROTOBUF_REQUIRE_VERSION([2.1.0])
65
73
PANDORA_REQUIRE_PROTOC
81
89
AC_DEFINE([BUILDING_DRIZZLED],[1],
82
90
          [Define indicating we are building and not consuming drizzle.])
83
91
 
84
 
PANDORA_HAVE_BOOST_TEST
 
92
PANDORA_HAVE_LIBGTEST
85
93
PANDORA_HAVE_LIBSQLITE3
86
94
 
87
95
AC_CHECK_FUNC(inet_ntoa, [], [AC_CHECK_LIB(nsl, inet_ntoa)])
132
140
dnl AM_CONDITIONAL([BUILD_GCC_PCH],[test "$GCC" = "yes"])
133
141
AM_CONDITIONAL([BUILD_GCC_PCH],[test "no" = "yes"])
134
142
 
135
 
AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
136
 
  LDFLAGS="${LDFLAGS} ${LD_VERSION_SCRIPT}"
137
 
  ])
138
 
 
139
 
WITH_VALGRIND
140
 
AS_IF([test "x${ac_gcc_profile_mode}" = "xyes" -a "x${pandora_cv_boost_profile}" = "xyes"],[
141
 
    AC_DEFINE([_GLIBCXX_PROFILE],[1],[Enable GCC Profile Mode])
142
 
    ])
143
 
 
144
 
 
145
143
AC_CONFIG_FILES(Makefile dnl
146
144
 tests/Makefile dnl
147
145
 drizzled/plugin/version.h dnl
148
 
 support-files/drizzle7.pc dnl
149
146
 support-files/libdrizzle.pc dnl
 
147
 support-files/drizzle.server support-files/drizzle-log-rotate
150
148
 support-files/smf/install.sh dnl
 
149
 support-files/drizzle.spec dnl
151
150
 support-files/smf/drizzle.xml dnl
152
151
 support-files/smf/drizzle)
153
152