← Back to branch summary

~clint-fewbar/drizzle/regex-policy-cache-limiter

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Clint Byrum
  • Date: 2012-03-15 18:05:43 UTC
  • mfrom: (2224.1.302 workspace)
  • Revision ID: clint@ubuntu.com-20120315180543-9jxxm4q10k3np2ws
merging with latest trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
20
20
AC_PREREQ(2.59)dnl              Minimum Autoconf version required.
21
21
dnl Version from the AC_INIT call below is overridden later
22
22
dnl So don't update it here
23
 
AC_INIT([drizzle7],[7],[http://bugs.launchpad.net/drizzle])
 
23
AC_INIT([drizzle],[7.1],[http://bugs.launchpad.net/drizzle],[drizzle],[http://drizzle.org/])
24
24
AC_CONFIG_SRCDIR([drizzled/drizzled.cc])
25
25
AC_CONFIG_AUX_DIR([config])
26
26
 
27
27
PANDORA_CANONICAL_TARGET(less-warnings, require-cxx, force-gcc42, version-from-vc) 
28
28
 
29
 
LIBDRIZZLE_LIBRARY_VERSION=1:0:0
30
 
#                          | | |
31
 
#                   +------+ | +---+
32
 
#                   |        |     |
33
 
#                current:revision:age
34
 
#                   |        |     |
35
 
#                   |        |     +- increment if interfaces have been added
36
 
#                   |        |        set to zero if interfaces have been
37
 
#                   |        |        removed or changed
38
 
#                   |        +- increment if source code has changed
39
 
#                   |           set to zero if current is incremented
40
 
#                   +- increment if interfaces have been added, removed or
41
 
#                      changed
 
29
LIBDRIZZLE_LIBRARY_VERSION=4:0:0
 
30
#                             | | |
 
31
#                      +------+ | +---+
 
32
#                      |        |     |
 
33
#                   current:revision:age
 
34
#                      |        |     |
 
35
#                      |        |     +- increment if interfaces have been added
 
36
#                      |        |        set to zero if interfaces have been
 
37
#                      |        |        removed or changed
 
38
#                      |        +- increment if source code has changed
 
39
#                      |           set to zero if current is incremented
 
40
#                      +- increment if interfaces have been added, removed or
 
41
#                         changed
42
42
AC_SUBST(LIBDRIZZLE_LIBRARY_VERSION)
43
43
 
44
44
# libdrizzle versioning when linked with GNU ld.
55
55
 
56
56
AC_ARG_WITH([server],
57
57
    [AS_HELP_STRING([--without-server],
58
 
      [Don not build the drizzled server.])],
 
58
      [Do not build the drizzled server.])],
59
59
    [ pandora_cv_skip_requires="$withval" ]
60
60
    [ pandora_cv_skip_requires=no ])
61
61
 
130
130
PANDORA_HAVE_LIBSQLITE3
131
131
 
132
132
 
133
 
 
134
133
#########################################################################
135
134
 
136
135
 
155
154
AC_CONFIG_FILES(Makefile dnl
156
155
 tests/Makefile dnl
157
156
 drizzled/plugin/version.h dnl
158
 
 support-files/drizzle7.pc dnl
 
157
 support-files/drizzle.spec dnl
 
158
 support-files/drizzle.pc dnl
159
159
 support-files/libdrizzle.pc dnl
 
160
 support-files/libdrizzle-1.0.pc dnl
160
161
 support-files/smf/install.sh dnl
161
162
 support-files/smf/drizzle.xml dnl
162
163
 support-files/smf/drizzle)
212
213
 
213
214
dnl libtoolize scans configure.ac  and needs to see some text
214
215
m4_define([LIBTOOLIZE_AC_INIT], [])
 
216
m4_define([UNUSED_MACRO], [
 
217
  LT_INIT
 
218
  AC_CONFIG_MACRO_DIR([m4])
 
219
])