← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: pcrews
  • Date: 2011-05-24 17:36:24 UTC
  • mfrom: (1099.4.232 drizzle)
  • Revision ID: pcrews@lucid32-20110524173624-mwr1bvq6fa1r01ao
Updated translations + 2011.05.18 tarball tag

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
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
 
29
LIBDRIZZLE_LIBRARY_VERSION=3: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)
43
67
 
44
68
# libdrizzle versioning when linked with GNU ld.
45
69
AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
53
77
  localstatedir='${prefix}/var/drizzle'
54
78
])
55
79
 
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])
 
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
])
62
138
 
63
139
PANDORA_REQUIRE_LIBPROTOBUF
64
140
PANDORA_PROTOBUF_REQUIRE_VERSION([2.1.0])
73
149
PANDORA_REQUIRE_LIBDL
74
150
AC_LANG_POP
75
151
 
76
 
DRIZZLE_STACK_DIRECTION
77
 
 
78
 
PANDORA_USE_BETTER_MALLOC
79
 
 
80
152
PANDORA_DRIZZLE_BUILD
81
 
AC_DEFINE([BUILDING_DRIZZLED],[1],
82
 
          [Define indicating we are building and not consuming drizzle.])
83
 
 
84
153
PANDORA_HAVE_BOOST_TEST
85
154
PANDORA_HAVE_LIBSQLITE3
86
155
 
87
 
AC_CHECK_FUNC(inet_ntoa, [], [AC_CHECK_LIB(nsl, inet_ntoa)])
88
 
 
89
 
 
90
 
AC_ARG_WITH([server-suffix],
91
 
    [AS_HELP_STRING([--with-server-suffix],
92
 
      [Append value to the version string.])],
93
 
    [ DRIZZLE_SERVER_SUFFIX="$withval" ]
94
 
    [ DRIZZLE_SERVER_SUFFIX= ])
95
 
 
96
 
AC_DEFINE_UNQUOTED([DRIZZLE_SERVER_SUFFIX],[$DRIZZLE_SERVER_SUFFIX],
97
 
                   [Append value to the version string])
98
 
 
99
 
 
100
 
AC_ARG_WITH([drizzled-user],
101
 
    [AS_HELP_STRING([--with-drizzled-user=username],
102
 
            [What user the drizzled daemon shall be run as.
103
 
                @<:@default=drizzle@:>@])],
104
 
    [ DRIZZLED_USER="$withval" ],
105
 
    [ DRIZZLED_USER=drizzle ])
106
 
AC_SUBST(DRIZZLED_USER)
107
 
 
108
 
 
109
 
AC_ARG_WITH([comment],
110
 
    [AS_HELP_STRING([--with-comment],
111
 
            [Comment about compilation environment. @<:@default=off@:>@])],
112
 
    [with_comment=$withval],
113
 
    [with_comment=no])
114
 
AS_IF([test "$with_comment" != "no"],[
115
 
  COMPILATION_COMMENT=$with_comment
116
 
],[
117
 
  COMPILATION_COMMENT="Source distribution (${PANDORA_RELEASE_COMMENT})"
118
 
])
119
 
AC_DEFINE_UNQUOTED([COMPILATION_COMMENT],["$COMPILATION_COMMENT"],
120
 
                   [Comment about compilation environment])
121
156
 
122
157
 
123
158
#########################################################################
136
171
  LDFLAGS="${LDFLAGS} ${LD_VERSION_SCRIPT}"
137
172
  ])
138
173
 
139
 
WITH_VALGRIND
140
174
AS_IF([test "x${ac_gcc_profile_mode}" = "xyes" -a "x${pandora_cv_boost_profile}" = "xyes"],[
141
175
    AC_DEFINE([_GLIBCXX_PROFILE],[1],[Enable GCC Profile Mode])
142
176
    ])
146
180
 tests/Makefile dnl
147
181
 drizzled/plugin/version.h dnl
148
182
 support-files/drizzle7.pc dnl
149
 
 support-files/libdrizzle.pc dnl
 
183
 support-files/libdrizzle-1.0.pc dnl
 
184
 support-files/libdrizzle-2.0.pc dnl
150
185
 support-files/smf/install.sh dnl
151
186
 support-files/smf/drizzle.xml dnl
152
187
 support-files/smf/drizzle)