← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Andrew Hutchings
  • Date: 2011-02-01 10:23:22 UTC
  • mto: (2136.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 2137.
  • Revision ID: andrew@linuxjedi.co.uk-20110201102322-oxztcyrjzg3c7yta
Fix counters cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
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) 
28
28
 
29
 
LIBDRIZZLE_LIBRARY_VERSION=3:0:0
 
29
LIBDRIZZLE_LIBRARY_VERSION=1:0:0
30
30
#                          | | |
31
31
#                   +------+ | +---+
32
32
#                   |        |     |
40
40
#                   +- increment if interfaces have been added, removed or
41
41
#                      changed
42
42
AC_SUBST(LIBDRIZZLE_LIBRARY_VERSION)
43
 
OLDLIBDRIZZLE_LIBRARY_VERSION=2:0:1
44
 
#                             | | |
45
 
#                      +------+ | +---+
46
 
#                      |        |     |
47
 
#                   current:revision:age
48
 
#                      |        |     |
49
 
#                      |        |     +- increment if interfaces have been added
50
 
#                      |        |        set to zero if interfaces have been
51
 
#                      |        |        removed or changed
52
 
#                      |        +- increment if source code has changed
53
 
#                      |           set to zero if current is incremented
54
 
#                      +- increment if interfaces have been added, removed or
55
 
#                         changed
56
 
AC_SUBST(OLDLIBDRIZZLE_LIBRARY_VERSION)
57
 
 
58
 
libdrizzleincludedir='${includedir}/libdrizzle-2.0'
59
 
libdrizzleinstalldir='${libdrizzleincludedir}/libdrizzle'
60
 
AC_SUBST(libdrizzleinstalldir)
61
 
AC_SUBST(libdrizzleincludedir)
62
 
 
63
 
oldlibdrizzleincludedir='${includedir}/libdrizzle-1.0'
64
 
oldlibdrizzleinstalldir='${oldlibdrizzleincludedir}/libdrizzle'
65
 
AC_SUBST(oldlibdrizzleinstalldir)
66
 
AC_SUBST(oldlibdrizzleincludedir)
67
43
 
68
44
# libdrizzle versioning when linked with GNU ld.
69
45
AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
77
53
  localstatedir='${prefix}/var/drizzle'
78
54
])
79
55
 
80
 
AC_ARG_WITH([server],
81
 
    [AS_HELP_STRING([--without-server],
82
 
      [Do not build the drizzled server.])],
83
 
    [ pandora_cv_skip_requires="$withval" ]
84
 
    [ pandora_cv_skip_requires=no ])
85
 
 
86
 
AS_IF([test "x${pandora_cv_skip_requires}" != "xno"],[
87
 
 
88
 
  AC_PATH_PROG(GPERF, gperf)
89
 
  AS_IF([test "x$GPERF" = "x"],
90
 
    AC_MSG_ERROR("Drizzle requires gperf to build."))
91
 
 
92
 
  # libexecinfo provides backtrace_symbols on FreeBSD
93
 
  AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
94
 
 
95
 
  AC_FUNC_STRERROR_R
96
 
 
97
 
  DRIZZLE_STACK_DIRECTION
98
 
 
99
 
  PANDORA_USE_BETTER_MALLOC
100
 
  AC_CHECK_FUNC(inet_ntoa, [], [AC_CHECK_LIB(nsl, inet_ntoa)])
101
 
 
102
 
 
103
 
  AC_ARG_WITH([server-suffix],
104
 
      [AS_HELP_STRING([--with-server-suffix],
105
 
        [Append value to the version string.])],
106
 
      [ DRIZZLE_SERVER_SUFFIX="$withval" ]
107
 
      [ DRIZZLE_SERVER_SUFFIX= ])
108
 
 
109
 
  AC_DEFINE_UNQUOTED([DRIZZLE_SERVER_SUFFIX],[$DRIZZLE_SERVER_SUFFIX],
110
 
    [Append value to the version string])
111
 
 
112
 
  AC_DEFINE([BUILDING_DRIZZLED],[1],
113
 
    [Define indicating we are building and not consuming drizzle.])
114
 
 
115
 
 
116
 
  AC_ARG_WITH([drizzled-user],
117
 
    [AS_HELP_STRING([--with-drizzled-user=username],
118
 
      [What user the drizzled daemon shall be run as.
119
 
      @<:@default=drizzle@:>@])],
120
 
    [ DRIZZLED_USER="$withval" ],
121
 
    [ DRIZZLED_USER=drizzle ])
122
 
  AC_SUBST(DRIZZLED_USER)
123
 
 
124
 
 
125
 
  AC_ARG_WITH([comment],
126
 
    [AS_HELP_STRING([--with-comment],
127
 
      [Comment about compilation environment. @<:@default=off@:>@])],
128
 
    [with_comment=$withval],
129
 
    [with_comment=no])
130
 
  AS_IF([test "$with_comment" != "no"],[
131
 
    COMPILATION_COMMENT=$with_comment
132
 
    ],[
133
 
    COMPILATION_COMMENT="Source distribution (${PANDORA_RELEASE_COMMENT})"
134
 
    ])
135
 
  AC_DEFINE_UNQUOTED([COMPILATION_COMMENT],["$COMPILATION_COMMENT"],
136
 
    [Comment about compilation environment])
137
 
])
 
56
AC_PATH_PROG(GPERF, gperf)
 
57
AS_IF([test "x$GPERF" = "x"],
 
58
      AC_MSG_ERROR("Drizzle requires gperf to build."))
 
59
 
 
60
# libexecinfo provides backtrace_symbols on FreeBSD
 
61
AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
 
62
 
 
63
PANDORA_RUN_CPPLINT
138
64
 
139
65
PANDORA_REQUIRE_LIBPROTOBUF
140
66
PANDORA_PROTOBUF_REQUIRE_VERSION([2.1.0])
149
75
PANDORA_REQUIRE_LIBDL
150
76
AC_LANG_POP
151
77
 
 
78
DRIZZLE_STACK_DIRECTION
 
79
 
 
80
PANDORA_USE_BETTER_MALLOC
 
81
 
152
82
PANDORA_DRIZZLE_BUILD
 
83
AC_DEFINE([BUILDING_DRIZZLED],[1],
 
84
          [Define indicating we are building and not consuming drizzle.])
 
85
 
153
86
PANDORA_HAVE_BOOST_TEST
154
87
PANDORA_HAVE_LIBSQLITE3
155
88
 
 
89
AC_CHECK_FUNC(inet_ntoa, [], [AC_CHECK_LIB(nsl, inet_ntoa)])
 
90
 
 
91
 
 
92
AC_ARG_WITH([server-suffix],
 
93
    [AS_HELP_STRING([--with-server-suffix],
 
94
      [Append value to the version string.])],
 
95
    [ DRIZZLE_SERVER_SUFFIX="$withval" ]
 
96
    [ DRIZZLE_SERVER_SUFFIX= ])
 
97
 
 
98
AC_DEFINE_UNQUOTED([DRIZZLE_SERVER_SUFFIX],[$DRIZZLE_SERVER_SUFFIX],
 
99
                   [Append value to the version string])
 
100
 
 
101
 
 
102
AC_ARG_WITH([drizzled-user],
 
103
    [AS_HELP_STRING([--with-drizzled-user=username],
 
104
            [What user the drizzled daemon shall be run as.
 
105
                @<:@default=drizzle@:>@])],
 
106
    [ DRIZZLED_USER="$withval" ],
 
107
    [ DRIZZLED_USER=drizzle ])
 
108
AC_SUBST(DRIZZLED_USER)
 
109
 
 
110
 
 
111
AC_ARG_WITH([comment],
 
112
    [AS_HELP_STRING([--with-comment],
 
113
            [Comment about compilation environment. @<:@default=off@:>@])],
 
114
    [with_comment=$withval],
 
115
    [with_comment=no])
 
116
AS_IF([test "$with_comment" != "no"],[
 
117
  COMPILATION_COMMENT=$with_comment
 
118
],[
 
119
  COMPILATION_COMMENT="Source distribution (${PANDORA_RELEASE_COMMENT})"
 
120
])
 
121
AC_DEFINE_UNQUOTED([COMPILATION_COMMENT],["$COMPILATION_COMMENT"],
 
122
                   [Comment about compilation environment])
156
123
 
157
124
 
158
125
#########################################################################
171
138
  LDFLAGS="${LDFLAGS} ${LD_VERSION_SCRIPT}"
172
139
  ])
173
140
 
 
141
WITH_VALGRIND
174
142
AS_IF([test "x${ac_gcc_profile_mode}" = "xyes" -a "x${pandora_cv_boost_profile}" = "xyes"],[
175
143
    AC_DEFINE([_GLIBCXX_PROFILE],[1],[Enable GCC Profile Mode])
176
144
    ])
179
147
AC_CONFIG_FILES(Makefile dnl
180
148
 tests/Makefile dnl
181
149
 drizzled/plugin/version.h dnl
182
 
 support-files/drizzle7.pc dnl
183
 
 support-files/libdrizzle-1.0.pc dnl
184
 
 support-files/libdrizzle-2.0.pc dnl
185
150
 support-files/smf/install.sh dnl
186
151
 support-files/smf/drizzle.xml dnl
187
152
 support-files/smf/drizzle)