← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Brian Aker
  • Date: 2010-02-14 01:56:51 UTC
  • mto: (1273.16.5 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: brian@gaz-20100214015651-ror9j0xu7dccz0ct
Two fixes for "make dist"

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],[http://bugs.launchpad.net/drizzle])
24
24
AC_CONFIG_SRCDIR([drizzled/drizzled.cc])
25
25
AC_CONFIG_AUX_DIR([config])
26
26
 
27
 
PANDORA_CANONICAL_TARGET(less-warnings, warnings-always-on, require-cxx, force-gcc42, version-from-vc, skip-visibility)
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
42
 
AC_SUBST(LIBDRIZZLE_LIBRARY_VERSION)
43
 
 
44
 
# libdrizzle versioning when linked with GNU ld.
45
 
AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
46
 
  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/config/drizzle.ver"
47
 
  ])
48
 
AC_SUBST(LD_VERSION_SCRIPT)
 
27
PANDORA_CANONICAL_TARGET(less-warnings, warnings-always-on, require-cxx, force-gcc42, skip-visibility, version-from-vc)
49
28
 
50
29
dnl Set the default datadir location to /usr/local/var/drizzle. If a
51
30
dnl localstatedir is explicitly given, just use that.
57
36
AS_IF([test "x$GPERF" = "x"],
58
37
      AC_MSG_ERROR("Drizzle requires gperf to build."))
59
38
 
60
 
# libexecinfo provides backtrace_symbols on FreeBSD
61
 
AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
 
39
AC_CHECK_PROGS(YACC, ['bison -y'])
 
40
AS_IF([test "x$YACC" = "x" -a "$pandora_building_from_bzr" = "yes"],[
 
41
  AC_MSG_ERROR(["bison is required for Drizzle to build from a bzr branch"])
 
42
])
 
43
 
62
44
 
63
45
PANDORA_RUN_CPPLINT
64
46
 
69
51
AC_LANG_PUSH(C++)
70
52
PANDORA_REQUIRE_PTHREAD
71
53
PANDORA_REQUIRE_LIBUUID
 
54
PANDORA_REQUIRE_LIBDRIZZLE
72
55
PANDORA_REQUIRE_LIBZ
73
56
PANDORA_REQUIRE_LIBPCRE
74
57
PANDORA_REQUIRE_LIBREADLINE
75
58
PANDORA_REQUIRE_LIBDL
76
59
AC_LANG_POP
77
60
 
78
 
DRIZZLE_STACK_DIRECTION
79
 
 
80
61
PANDORA_USE_BETTER_MALLOC
81
62
 
82
63
PANDORA_DRIZZLE_BUILD
83
 
AC_DEFINE([BUILDING_DRIZZLED],[1],
 
64
AC_DEFINE([BUILDING_DRIZZLE],[1],
84
65
          [Define indicating we are building and not consuming drizzle.])
85
66
 
86
 
PANDORA_HAVE_LIBGTEST
87
 
PANDORA_HAVE_LIBSQLITE3
88
 
 
89
 
AC_CHECK_FUNC(inet_ntoa, [], [AC_CHECK_LIB(nsl, inet_ntoa)])
90
 
 
91
67
 
92
68
AC_ARG_WITH([server-suffix],
93
69
    [AS_HELP_STRING([--with-server-suffix],
127
103
 
128
104
dnl Has to be done late, as the plugin may need to check for existence of
129
105
dnl functions tested above
130
 
PANDORA_PLUGINS([drizzled/module/load_list.h])
 
106
PANDORA_PLUGINS([drizzled/plugin/load_list.h])
131
107
 
132
108
dnl GCC Precompiled Header Support
133
109
dnl re-enable later
134
110
dnl AM_CONDITIONAL([BUILD_GCC_PCH],[test "$GCC" = "yes"])
135
111
AM_CONDITIONAL([BUILD_GCC_PCH],[test "no" = "yes"])
136
112
 
137
 
AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
138
 
  LDFLAGS="${LDFLAGS} ${LD_VERSION_SCRIPT}"
139
 
  ])
140
 
 
141
 
WITH_VALGRIND
142
 
 
143
113
AC_CONFIG_FILES(Makefile dnl
 
114
 gnulib/Makefile dnl
 
115
 po/Makefile.in dnl
144
116
 tests/Makefile dnl
145
117
 drizzled/plugin/version.h dnl
146
 
 support-files/libdrizzle.pc dnl
147
118
 support-files/drizzle.server support-files/drizzle-log-rotate
148
119
 support-files/smf/install.sh dnl
149
120
 support-files/drizzle.spec dnl
172
143
echo ""
173
144
echo "   * Installation prefix:       $prefix"
174
145
echo "   * System type:               $host_vendor-$host_os"
175
 
echo "   * pandora-build version:     PANDORA_CANONICAL_VERSION"
176
146
echo "   * Host CPU:                  $host_cpu"
177
147
echo "   * C Compiler:                $CC_VERSION"
178
148
echo "   * C++ Compiler:              $CXX_VERSION"
 
149
echo "   * Build auth_pam:            $ac_cv_libpam"
179
150
echo "   * Assertions enabled:        $ac_cv_assert"
180
151
echo "   * Debug enabled:             $with_debug"
181
152
echo "   * Profiling enabled:         $ac_profiling"
182
153
echo "   * Coverage enabled:          $ac_coverage"
183
154
echo "   * Warnings as failure:       $ac_cv_warnings_as_errors"
 
155
echo "   * C++ cstdint location:      $ac_cv_cxx_cstdint"
 
156
echo "   * C++ hash_map location:     $ac_cv_cxx_hash_map"
 
157
echo "   * C++ hash namespace:        $ac_cv_cxx_hash_namespace"
 
158
echo "   * C++ shared_ptr namespace:  $ac_cv_shared_ptr_namespace"
184
159
echo ""
185
160
echo "---"
186
161
 
187
 
case "$host_os" in
188
 
  *freebsd*)
189
 
    echo "*****"
190
 
    echo "*"
191
 
    echo "*  NOTE: You are on FreeBSD. BSD make will not work."
192
 
    echo "*"
193
 
    echo "*   use 'gmake' To build Drizzle"
194
 
    echo "*"
195
 
    echo "*  And ensure that /usr/local/lib/gcc44 is in your LD_LIBRARY_PATH"
196
 
    echo "*" 
197
 
    echo "*****"
198
 
  ;;
199
 
esac
200
 
 
201
 
 
202
162
dnl libtoolize scans configure.ac  and needs to see some text
203
163
m4_define([LIBTOOLIZE_AC_INIT], [])