← Back to branch summary

~clint-fewbar/ubuntu/natty/drizzle/beta1-fixes

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2011-03-15 10:41:18 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110315104118-eaf0hvlytjdl4zrf
Tags: 2011.03.13-0ubuntu1
* New upstream release.
* Added slave plugin.
* Removed archive, blackhole and blitzdb plugins.
* Moved location of libdrizzle headers.
* Removed drizzleadmin manpage patch.
* Add drizzle_safe_write_string to symbols.

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=2:0:1
30
30
#                          | | |
31
31
#                   +------+ | +---+
32
32
#                   |        |     |
41
41
#                      changed
42
42
AC_SUBST(LIBDRIZZLE_LIBRARY_VERSION)
43
43
 
 
44
libdrizzleincludedir='${includedir}/libdrizzle-1.0'
 
45
AC_SUBST(libdrizzleincludedir)
 
46
 
44
47
# libdrizzle versioning when linked with GNU ld.
45
48
AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
46
49
  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/config/drizzle.ver"
53
56
  localstatedir='${prefix}/var/drizzle'
54
57
])
55
58
 
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])
 
59
AC_ARG_WITH([server],
 
60
    [AS_HELP_STRING([--without-server],
 
61
      [Don not build the drizzled server.])],
 
62
    [ pandora_cv_skip_requires="$withval" ]
 
63
    [ pandora_cv_skip_requires=no ])
 
64
 
 
65
AS_IF([test "x${pandora_cv_skip_requires}" != "xno"],[
 
66
 
 
67
  AC_PATH_PROG(GPERF, gperf)
 
68
  AS_IF([test "x$GPERF" = "x"],
 
69
    AC_MSG_ERROR("Drizzle requires gperf to build."))
 
70
 
 
71
  # libexecinfo provides backtrace_symbols on FreeBSD
 
72
  AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
 
73
 
 
74
  AC_FUNC_STRERROR_R
 
75
 
 
76
  DRIZZLE_STACK_DIRECTION
 
77
 
 
78
  PANDORA_USE_BETTER_MALLOC
 
79
  AC_CHECK_FUNC(inet_ntoa, [], [AC_CHECK_LIB(nsl, inet_ntoa)])
 
80
 
 
81
 
 
82
  AC_ARG_WITH([server-suffix],
 
83
      [AS_HELP_STRING([--with-server-suffix],
 
84
        [Append value to the version string.])],
 
85
      [ DRIZZLE_SERVER_SUFFIX="$withval" ]
 
86
      [ DRIZZLE_SERVER_SUFFIX= ])
 
87
 
 
88
  AC_DEFINE_UNQUOTED([DRIZZLE_SERVER_SUFFIX],[$DRIZZLE_SERVER_SUFFIX],
 
89
    [Append value to the version string])
 
90
 
 
91
  AC_DEFINE([BUILDING_DRIZZLED],[1],
 
92
    [Define indicating we are building and not consuming drizzle.])
 
93
 
 
94
 
 
95
  AC_ARG_WITH([drizzled-user],
 
96
    [AS_HELP_STRING([--with-drizzled-user=username],
 
97
      [What user the drizzled daemon shall be run as.
 
98
      @<:@default=drizzle@:>@])],
 
99
    [ DRIZZLED_USER="$withval" ],
 
100
    [ DRIZZLED_USER=drizzle ])
 
101
  AC_SUBST(DRIZZLED_USER)
 
102
 
 
103
 
 
104
  AC_ARG_WITH([comment],
 
105
    [AS_HELP_STRING([--with-comment],
 
106
      [Comment about compilation environment. @<:@default=off@:>@])],
 
107
    [with_comment=$withval],
 
108
    [with_comment=no])
 
109
  AS_IF([test "$with_comment" != "no"],[
 
110
    COMPILATION_COMMENT=$with_comment
 
111
    ],[
 
112
    COMPILATION_COMMENT="Source distribution (${PANDORA_RELEASE_COMMENT})"
 
113
    ])
 
114
  AC_DEFINE_UNQUOTED([COMPILATION_COMMENT],["$COMPILATION_COMMENT"],
 
115
    [Comment about compilation environment])
 
116
])
62
117
 
63
118
PANDORA_REQUIRE_LIBPROTOBUF
64
119
PANDORA_PROTOBUF_REQUIRE_VERSION([2.1.0])
72
127
PANDORA_REQUIRE_LIBREADLINE
73
128
PANDORA_REQUIRE_LIBDL
74
129
AC_LANG_POP
75
 
AC_FUNC_STRERROR_R
76
 
 
77
 
DRIZZLE_STACK_DIRECTION
78
 
 
79
 
PANDORA_USE_BETTER_MALLOC
80
130
 
81
131
PANDORA_DRIZZLE_BUILD
82
 
AC_DEFINE([BUILDING_DRIZZLED],[1],
83
 
          [Define indicating we are building and not consuming drizzle.])
84
 
 
85
132
PANDORA_HAVE_BOOST_TEST
86
133
PANDORA_HAVE_LIBSQLITE3
87
134
 
88
 
AC_CHECK_FUNC(inet_ntoa, [], [AC_CHECK_LIB(nsl, inet_ntoa)])
89
 
 
90
 
 
91
 
AC_ARG_WITH([server-suffix],
92
 
    [AS_HELP_STRING([--with-server-suffix],
93
 
      [Append value to the version string.])],
94
 
    [ DRIZZLE_SERVER_SUFFIX="$withval" ]
95
 
    [ DRIZZLE_SERVER_SUFFIX= ])
96
 
 
97
 
AC_DEFINE_UNQUOTED([DRIZZLE_SERVER_SUFFIX],[$DRIZZLE_SERVER_SUFFIX],
98
 
                   [Append value to the version string])
99
 
 
100
 
 
101
 
AC_ARG_WITH([drizzled-user],
102
 
    [AS_HELP_STRING([--with-drizzled-user=username],
103
 
            [What user the drizzled daemon shall be run as.
104
 
                @<:@default=drizzle@:>@])],
105
 
    [ DRIZZLED_USER="$withval" ],
106
 
    [ DRIZZLED_USER=drizzle ])
107
 
AC_SUBST(DRIZZLED_USER)
108
 
 
109
 
 
110
 
AC_ARG_WITH([comment],
111
 
    [AS_HELP_STRING([--with-comment],
112
 
            [Comment about compilation environment. @<:@default=off@:>@])],
113
 
    [with_comment=$withval],
114
 
    [with_comment=no])
115
 
AS_IF([test "$with_comment" != "no"],[
116
 
  COMPILATION_COMMENT=$with_comment
117
 
],[
118
 
  COMPILATION_COMMENT="Source distribution (${PANDORA_RELEASE_COMMENT})"
119
 
])
120
 
AC_DEFINE_UNQUOTED([COMPILATION_COMMENT],["$COMPILATION_COMMENT"],
121
 
                   [Comment about compilation environment])
122
135
 
123
136
 
124
137
#########################################################################
137
150
  LDFLAGS="${LDFLAGS} ${LD_VERSION_SCRIPT}"
138
151
  ])
139
152
 
140
 
WITH_VALGRIND
141
153
AS_IF([test "x${ac_gcc_profile_mode}" = "xyes" -a "x${pandora_cv_boost_profile}" = "xyes"],[
142
154
    AC_DEFINE([_GLIBCXX_PROFILE],[1],[Enable GCC Profile Mode])
143
155
    ])
147
159
 tests/Makefile dnl
148
160
 drizzled/plugin/version.h dnl
149
161
 support-files/drizzle7.pc dnl
150
 
 support-files/libdrizzle.pc dnl
 
162
 support-files/libdrizzle-1.0.pc dnl
151
163
 support-files/smf/install.sh dnl
152
164
 support-files/smf/drizzle.xml dnl
153
165
 support-files/smf/drizzle)