575.4.7
by Monty Taylor
More header cleanup. |
1 |
dnl -*- bash -*- |
1
by brian
clean slate |
2 |
dnl Process this file with autoconf to produce a configure script. |
3 |
||
992.1.25
by Monty Taylor
Moved myisam to new plugin system. |
4 |
dnl Copyright (C) 2009 Sun Microsystems |
5 |
dnl
|
|
6 |
dnl This program is free software; you can redistribute it and/or modify |
|
7 |
dnl it under the terms of the GNU General Public License as published by |
|
8 |
dnl the Free Software Foundation; version 2 of the License. |
|
9 |
dnl
|
|
10 |
dnl This program is distributed in the hope that it will be useful, |
|
11 |
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
12 |
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
13 |
dnl GNU General Public License for more details. |
|
14 |
dnl
|
|
15 |
dnl You should have received a copy of the GNU General Public License |
|
16 |
dnl along with this program; if not, write to the Free Software |
|
17 |
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
|
18 |
||
19 |
||
77.1.65
by Monty Taylor
We don't really require 2.61, 2.59 is actually fine. |
20 |
AC_PREREQ(2.59)dnl Minimum Autoconf version required. |
1
by brian
clean slate |
21 |
|
908.1.3
by Monty Taylor
Updated build system to use new version numbering. Just remember to run ./config/autorun.sh before running make distcheck for release and all should be peachy. |
22 |
m4_include(m4/bzr_version.m4) |
23 |
||
214
by Brian Aker
Rename of fields (fix issue with string and decimal .h clashing). |
24 |
AC_CONFIG_SRCDIR([drizzled/drizzled.cc]) |
39
by Brian Aker
Move build helper files into config |
25 |
AC_CONFIG_AUX_DIR(config) |
236.1.9
by Monty Taylor
Cleaned up configure.ac line. |
26 |
AC_CONFIG_HEADERS([config.h]) |
908.1.4
by Monty Taylor
Fix to fake-out libtoolize, since AC_INIT is in bzr_version.m4 now. |
27 |
AC_CONFIG_MACRO_DIR([m4]) |
435.1.1
by Monty Taylor
Fixed -O3 optimization for gcc. |
28 |
|
722.1.3
by Monty Taylor
Cleaned up a few build things. |
29 |
# Setting CFLAGS here prevents AC_CANONICAL_TARGET from injecting them |
30 |
SAVE_CFLAGS=${CFLAGS} |
|
31 |
SAVE_CXXFLAGS=${CXXFLAGS} |
|
32 |
CFLAGS= |
|
33 |
CXXFLAGS= |
|
435.1.1
by Monty Taylor
Fixed -O3 optimization for gcc. |
34 |
|
28.1.33
by Monty Taylor
Added -Wall |
35 |
AC_CANONICAL_TARGET
|
722.1.3
by Monty Taylor
Cleaned up a few build things. |
36 |
|
37 |
CFLAGS=${SAVE_CFLAGS} |
|
38 |
CXXFLAGS=${SAVE_CXXFLAGS} |
|
39 |
||
779.4.10
by Monty Taylor
Cleaned up a few build things. Thank me... builds should be quicker now. :) |
40 |
AM_INIT_AUTOMAKE(nostdinc subdir-objects -Wall -Werror) |
779.3.21
by Monty Taylor
Fixed solaris fixes for linux. Oh, and I also seem to have fixed some more configure stuff. |
41 |
|
722.1.3
by Monty Taylor
Cleaned up a few build things. |
42 |
if test "x${enable_dependency_tracking}" = "x" |
43 |
then
|
|
44 |
enable_dependency_tracking=yes |
|
45 |
fi
|
|
46 |
||
815.1.1
by Monty Taylor
Add timegm which is missing on Solaris. |
47 |
gl_EARLY
|
722.1.3
by Monty Taylor
Cleaned up a few build things. |
48 |
|
528
by Monty Taylor
Re-arragned a few things in configure.ac. |
49 |
|
50 |
dnl Checks for programs. |
|
755.1.6
by Monty Taylor
One more stupid change. |
51 |
AC_PROG_CXX
|
554
by Monty
Added impl of macro missing from old systems. |
52 |
|
815.1.1
by Monty Taylor
Add timegm which is missing on Solaris. |
53 |
gl_USE_SYSTEM_EXTENSIONS
|
910.2.1
by Monty Taylor
Put in early check and instructive error message for too-old gcc. |
54 |
if test "$GCC" = "yes" |
55 |
then
|
|
919.3.1
by Monty Taylor
Force gcc-4.2 on Mac. |
56 |
# If you're on a Mac, and you didn't ask for a specific compiler |
57 |
# You're gonna get 4.2. |
|
58 |
if test "$host_vendor" = "apple" -a "x${ac_cv_env_CC_set}" = "x"
|
|
59 |
then
|
|
60 |
CPP="/usr/bin/gcc-4.2 -E"
|
|
61 |
CC=/usr/bin/gcc-4.2
|
|
62 |
CXX=/usr/bin/g++-4.2
|
|
63 |
fi
|
|
910.2.2
by Monty Taylor
Split out protobuf version check from the check for protobuf version so that we can give better error message. |
64 |
AC_CACHE_CHECK([if GCC is recent enough], [drizzle_cv_gcc_recent],
|
65 |
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
|
923.2.4
by Monty Taylor
Backed GCC requirement back down to 4.1. Stupid RHEL5. |
66 |
#if !defined(__GNUC__) || (__GNUC__ < 4) || ((__GNUC__ >= 4) && (__GNUC_MINOR__ < 1))
|
910.2.1
by Monty Taylor
Put in early check and instructive error message for too-old gcc. |
67 |
# error GCC is Too Old!
|
68 |
#endif
|
|
910.2.2
by Monty Taylor
Split out protobuf version check from the check for protobuf version so that we can give better error message. |
69 |
]])],
|
70 |
[drizzle_cv_gcc_recent=yes],
|
|
71 |
[drizzle_cv_gcc_recent=no])])
|
|
968.2.24
by Monty Taylor
Split up OSX GCC error codes. |
72 |
if test "$drizzle_cv_gcc_recent" = "no" -a "$host_vendor" = "apple"
|
73 |
then
|
|
968.2.28
by Monty Taylor
Added more informative error message. |
74 |
AC_MSG_ERROR([Your version of GCC is too old. Drizzle requires at least version 4.2 on OSX. You may need to install a version of XCode >= 3.1.2])
|
968.2.24
by Monty Taylor
Split up OSX GCC error codes. |
75 |
fi
|
910.2.2
by Monty Taylor
Split out protobuf version check from the check for protobuf version so that we can give better error message. |
76 |
if test "$drizzle_cv_gcc_recent" = "no"
|
77 |
then
|
|
968.2.24
by Monty Taylor
Split up OSX GCC error codes. |
78 |
AC_MSG_ERROR([Your version of GCC is too old. Drizzle requires at least version 4.1])
|
910.2.2
by Monty Taylor
Split out protobuf version check from the check for protobuf version so that we can give better error message. |
79 |
fi
|
910.2.1
by Monty Taylor
Put in early check and instructive error message for too-old gcc. |
80 |
fi
|
910.2.3
by Monty Taylor
Removed extra checks. |
81 |
AC_CXX_HEADER_STDCXX_98
|
82 |
if test "$ac_cv_cxx_stdcxx_98" = "no"
|
|
83 |
then
|
|
917.1.5
by Monty Taylor
Added more verbose failure messages. |
84 |
AC_MSG_ERROR([No working C++ Compiler has been found. Drizzle requires a C++ compiler that can handle C++98])
|
910.2.3
by Monty Taylor
Removed extra checks. |
85 |
fi
|
86 |
AC_PROG_CPP
|
|
87 |
AM_PROG_CC_C_O
|
|
88 |
||
917.1.5
by Monty Taylor
Added more verbose failure messages. |
89 |
if test "$am_cv_prog_cc_stdc" = "no"
|
90 |
then
|
|
91 |
AC_MSG_ERROR([Drizzle requires an ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.])
|
|
92 |
fi
|
|
93 |
||
94 |
||
910.2.1
by Monty Taylor
Put in early check and instructive error message for too-old gcc. |
95 |
|
815.1.1
by Monty Taylor
Add timegm which is missing on Solaris. |
96 |
gl_INIT
|
528
by Monty Taylor
Re-arragned a few things in configure.ac. |
97 |
|
873.2.41
by Monty Taylor
Fixed the ol build for ol Solaris. |
98 |
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
|
99 |
||
779.3.21
by Monty Taylor
Fixed solaris fixes for linux. Oh, and I also seem to have fixed some more configure stuff. |
100 |
AC_PROG_GCC_TRADITIONAL
|
755.1.6
by Monty Taylor
One more stupid change. |
101 |
|
1
by brian
clean slate |
102 |
|
103 |
# Set all version vars based on $VERSION. How do we do this more elegant ?
|
|
104 |
# Remember that regexps needs to quote [ and ] since this is run through m4
|
|
105 |
# We take some made up examples
|
|
106 |
#
|
|
107 |
# VERSION 5.1.40sp1-alpha 5.0.34a
|
|
319.1.1
by Grant Limberg
renamed all instances of MYSQL_ to DRIZZLE_ |
108 |
# DRIZZLE_NO_DASH_VERSION 5.1.40sp1 5.0.34a
|
109 |
# DRIZZLE_NUMERIC_VERSION 5.1.40 5.0.34
|
|
110 |
# DRIZZLE_BASE_VERSION 5.1 5.0
|
|
111 |
# DRIZZLE_VERSION_ID 50140 50034
|
|
1
by brian
clean slate |
112 |
#
|
319.1.1
by Grant Limberg
renamed all instances of MYSQL_ to DRIZZLE_ |
113 |
DRIZZLE_NO_DASH_VERSION=`echo $VERSION | sed -e "s|-.*$||"`
|
114 |
DRIZZLE_NUMERIC_VERSION=`echo $DRIZZLE_NO_DASH_VERSION | sed -e "s|[[a-z]][[a-z0-9]]*$||"`
|
|
115 |
DRIZZLE_BASE_VERSION=`echo $DRIZZLE_NUMERIC_VERSION | sed -e "s|\.[[^.]]*$||"`
|
|
116 |
DRIZZLE_VERSION_ID=`echo $DRIZZLE_NUMERIC_VERSION | \
|
|
1
by brian
clean slate |
117 |
awk -F. '{printf "%d%0.2d%0.2d", $1, $2, $3}'` |
722.1.3
by Monty Taylor
Cleaned up a few build things. |
118 |
AC_DEFINE_UNQUOTED(DRIZZLE_BASE_VERSION,["$DRIZZLE_BASE_VERSION"],
|
119 |
[Major and minor version])
|
|
120 |
AC_DEFINE_UNQUOTED([DRIZZLE_VERSION_ID],[$DRIZZLE_VERSION_ID],
|
|
121 |
[Version ID that can be easily used for numeric comparison])
|
|
1
by brian
clean slate |
122 |
|
859.1.4
by Monty Taylor
Hack to allow use of hash_map in gcc 4.3. |
123 |
AC_DEFINE([_BACKWARD_BACKWARD_WARNING_H],[1],[Hack to disable deprecation warning in gcc])
|
124 |
||
1
by brian
clean slate |
125 |
# The port should be constant for a LONG time
|
301
by Brian Aker
Clean up port startup |
126 |
DRIZZLE_TCP_PORT_DEFAULT=4427
|
1
by brian
clean slate |
127 |
|
722.2.9
by Monty Taylor
I _think_ I've got the plug.in triggering rebuild thing going on right. |
128 |
m4_include(m4/dtrace.m4)
|
722.1.3
by Monty Taylor
Cleaned up a few build things. |
129 |
|
722.2.9
by Monty Taylor
I _think_ I've got the plug.in triggering rebuild thing going on right. |
130 |
m4_include(m4/character_sets.m4)
|
722.1.3
by Monty Taylor
Cleaned up a few build things. |
131 |
AC_SUBST(AVAILABLE_LANGUAGES)
|
132 |
||
840.1.2
by Monty Taylor
Fix for msgmerge possibly being gmsgmerge. |
133 |
|
722.1.3
by Monty Taylor
Cleaned up a few build things. |
134 |
# Set this for plugins to use
|
135 |
ac_build_drizzle="yes"
|
|
441
by Monty Taylor
Move unconditional defines to config.h. |
136 |
|
137 |
||
1
by brian
clean slate |
138 |
# Canonicalize the configuration name.
|
139 |
||
140 |
# Check whether --with-system-type or --without-system-type was given.
|
|
28.1.33
by Monty Taylor
Added -Wall |
141 |
AC_ARG_WITH([system-type],
|
142 |
[AS_HELP_STRING([--with-system-type],
|
|
143 |
[Set the system type, like "sun-solaris10"])],
|
|
1
by brian
clean slate |
144 |
[SYSTEM_TYPE="$withval"],
|
145 |
[SYSTEM_TYPE="$host_vendor-$host_os"])
|
|
28.1.33
by Monty Taylor
Added -Wall |
146 |
AC_ARG_WITH([machine-type],
|
147 |
[AS_HELP_STRING([--with-machine-type],
|
|
907.3.2
by Monty Taylor
Added tests for 64-bit solaris. Look in /usr/lib/amd64 and /usr/local/lib/amd64 if we are 64-bit. |
148 |
[Set the machine type, like "sparc"])],
|
1
by brian
clean slate |
149 |
[MACHINE_TYPE="$withval"],
|
150 |
[MACHINE_TYPE="$host_cpu"])
|
|
151 |
AC_SUBST(SYSTEM_TYPE)
|
|
152 |
AC_DEFINE_UNQUOTED([SYSTEM_TYPE], ["$SYSTEM_TYPE"],
|
|
153 |
[Name of system, eg sun-solaris])
|
|
154 |
AC_SUBST(MACHINE_TYPE)
|
|
155 |
AC_DEFINE_UNQUOTED([MACHINE_TYPE], ["$MACHINE_TYPE"],
|
|
156 |
[Machine type name, eg sparc])
|
|
157 |
||
158 |
# Detect intel x86 like processor
|
|
159 |
BASE_MACHINE_TYPE=$MACHINE_TYPE
|
|
160 |
case $MACHINE_TYPE in
|
|
161 |
i?86) BASE_MACHINE_TYPE=i386 ;;
|
|
162 |
esac
|
|
163 |
||
481.1.9
by Monty Taylor
Added autoconf tests for location of cstdint and cinttypes. Use those in C++ programs now, so that we don't have to define _STDC_LIMIT_MACROS, etc by hand. Stop, in fact, defining those by hand. |
164 |
|
520.4.41
by mordred
Fixed configure.ac to work cleanly on Solaris - and define some good compile flags. |
165 |
case "$target_os" in
|
166 |
*linux*)
|
|
167 |
TARGET_LINUX="true"
|
|
168 |
AC_SUBST(TARGET_LINUX)
|
|
169 |
AC_DEFINE([TARGET_OS_LINUX], [1], [Whether we build for Linux])
|
|
170 |
;;
|
|
271
by Brian Aker
OSX fix |
171 |
*apple-darwin*)
|
520.4.41
by mordred
Fixed configure.ac to work cleanly on Solaris - and define some good compile flags. |
172 |
TARGET_OSX="true"
|
173 |
AC_SUBST(TARGET_OSX)
|
|
271
by Brian Aker
OSX fix |
174 |
AC_DEFINE([TARGET_OS_OSX], [1], [Whether we build for OSX])
|
1
by brian
clean slate |
175 |
;;
|
520.4.41
by mordred
Fixed configure.ac to work cleanly on Solaris - and define some good compile flags. |
176 |
*solaris*)
|
177 |
TARGET_SOLARIS="true"
|
|
178 |
AC_SUBST(TARGET_SOLARIS)
|
|
179 |
AC_DEFINE([TARGET_OS_SOLARIS], [1], [Whether we are building for Solaris])
|
|
180 |
;;
|
|
1
by brian
clean slate |
181 |
*)
|
182 |
;;
|
|
183 |
esac
|
|
435.1.1
by Monty Taylor
Fixed -O3 optimization for gcc. |
184 |
|
520.4.41
by mordred
Fixed configure.ac to work cleanly on Solaris - and define some good compile flags. |
185 |
DRIZZLE_CHECK_C_VERSION
|
319.1.1
by Grant Limberg
renamed all instances of MYSQL_ to DRIZZLE_ |
186 |
DRIZZLE_CHECK_CXX_VERSION
|
1
by brian
clean slate |
187 |
|
590.2.23
by Monty Taylor
Fixed a few things for solaris builds. |
188 |
AC_SYS_LARGEFILE
|
189 |
||
230.3.1
by Monty Taylor
Bug 252805: ./configure not detecting missing g++ |
190 |
AC_PROG_AWK
|
191 |
||
1
by brian
clean slate |
192 |
|
873.2.4
by Monty Taylor
Fixed some configure errors. |
193 |
AC_PATH_PROG(GPERF, gperf)
|
194 |
AS_IF([test "x$GPERF" = "x"],
|
|
917.1.5
by Monty Taylor
Added more verbose failure messages. |
195 |
AC_MSG_ERROR("Drizzle requires gperf to build."))
|
779.4.5
by Monty Taylor
Replaced gen_lex_hash with gperf. Yay for no more building tools to build source!!! |
196 |
|
840.1.3
by Monty Taylor
Fixed gperf checking to fail properly. |
197 |
AC_PATH_PROG(LCOV, lcov)
|
198 |
AC_PATH_PROG(GENHTML, genhtml)
|
|
779.1.25
by Monty Taylor
Put in LCOV checks. Put output in subdir. |
199 |
|
873.2.4
by Monty Taylor
Fixed some configure errors. |
200 |
AM_CONDITIONAL(HAVE_LCOV,[test "x$LCOV" != "x"])
|
779.1.25
by Monty Taylor
Put in LCOV checks. Put output in subdir. |
201 |
|
1
by brian
clean slate |
202 |
AC_SUBST(NM)dnl
|
203 |
||
204 |
AC_PROG_INSTALL
|
|
205 |
||
590.2.2
by Monty Taylor
Configure cleanups. Added generic search_for_lib m4 macro. |
206 |
dnl Not critical since the generated file is distributed
|
629.1.1
by Monty Taylor
More solaris fixes. |
207 |
AC_CHECK_PROGS(YACC, ['bison -y']) |
77.1.70
by Monty Taylor
Added a failure if you don't have bison and you're building from a .bzr branch. |
208 |
if test -z "$YACC" && test -d ".bzr"
|
209 |
then
|
|
210 |
AC_MSG_ERROR(["bison is required for Drizzle to build from a bzr branch"])
|
|
211 |
fi
|
|
1
by brian
clean slate |
212 |
|
997.2.18
by Monty Taylor
Fixed the isainfo check progs. To be clear, this was to prevent it being called on _NOT_ Solaris. I can't type, apparently. |
213 |
AC_CHECK_PROGS(ISAINFO, [isainfo], [no])
|
997.2.17
by Monty Taylor
Added check for isainfo so that we don't try to run it on Solaris. |
214 |
AS_IF([test "x$ISAINFO" != "xno"],
|
215 |
[isainfo_b=`isainfo -b`],
|
|
216 |
[isainfo_b="x"])
|
|
971.4.1
by Monty Taylor
GCC on Solaris build fixes. |
217 |
|
919.2.21
by Monty Taylor
Fixes for c++0x and shared_ptr support for Solaris. |
218 |
# Build optimized or debug version ?
|
219 |
# First check for gcc and g++
|
|
1
by brian
clean slate |
220 |
if test "$GCC" = "yes"
|
221 |
then
|
|
971.4.1
by Monty Taylor
GCC on Solaris build fixes. |
222 |
if test "$isainfo_b" = "64"
|
223 |
then
|
|
224 |
IS_64="-m64"
|
|
225 |
fi
|
|
226 |
AC_DEFINE([_GNU_SOURCE],[1],[Fix problem with S_ISLNK() on Linux])
|
|
227 |
||
919.2.21
by Monty Taylor
Fixes for c++0x and shared_ptr support for Solaris. |
228 |
dnl The following is required for portable results of floating point
|
229 |
dnl calculations on PowerPC. The same must also be done for IA-64, but
|
|
230 |
dnl this options is missing in the IA-64 gcc backend.
|
|
1
by brian
clean slate |
231 |
case "$host_cpu" in
|
232 |
*ppc* | *powerpc*)
|
|
919.2.18
by Monty Taylor
Restructured CFLAGS processing to always keep user-supplied options last on the command line, so they take precedence. |
233 |
CFLAGS="-mno-fused-madd ${CFLAGS}"
|
234 |
CXXFLAGS="-mno-fused-madd ${CXXFLAGS}"
|
|
1
by brian
clean slate |
235 |
;;
|
236 |
esac
|
|
919.2.21
by Monty Taylor
Fixes for c++0x and shared_ptr support for Solaris. |
237 |
|
971.4.1
by Monty Taylor
GCC on Solaris build fixes. |
238 |
CFLAGS="-ggdb3 ${IS_64} -std=gnu99 ${CFLAGS}"
|
239 |
CXXFLAGS="-ggdb3 ${IS_64} ${CXXFLAGS}"
|
|
919.2.21
by Monty Taylor
Fixes for c++0x and shared_ptr support for Solaris. |
240 |
AC_CXX_CHECK_STANDARD
|
919.2.16
by Monty Taylor
Added check for setting -std=gnu++0x if available. |
241 |
|
873.2.36
by Monty Taylor
Fix to clean up flags. |
242 |
|
243 |
DEBUG_CFLAGS="-O0"
|
|
244 |
DEBUG_CXXFLAGS="-O0"
|
|
245 |
||
520.4.40
by mordred
Added an option to specify --with-probuf=<location> |
246 |
OPTIMIZE_CFLAGS="-O3"
|
247 |
OPTIMIZE_CXXFLAGS="-O3"
|
|
248 |
fi
|
|
249 |
if test "$SUNCC" = "yes"
|
|
250 |
then
|
|
971.4.1
by Monty Taylor
GCC on Solaris build fixes. |
251 |
if test "$isainfo_b" = "64"
|
252 |
then
|
|
253 |
IS_64="-m64"
|
|
254 |
fi
|
|
919.2.22
by Monty Taylor
Fixed the latest stuff on Solaris. |
255 |
dnl we put CPPFLAGS and LDFLAGS first here, because if the user has specified
|
256 |
dnl command line CPPFLAGS or LDFLAGS, their -I or -L should come _first_
|
|
685.1.20
by Monty Taylor
Fixed memalign for only on sparc. |
257 |
if test "$target_cpu" = "sparc"
|
258 |
then
|
|
259 |
MEMALIGN_FLAGS="-xmemalign=8s"
|
|
942.1.9
by Monty Taylor
Cleaned up 64-bit detection on Solaris. |
260 |
fi
|
261 |
||
968.2.1
by Monty Taylor
Build fix making 64-bit atomic<> work on 32-bit systems. |
262 |
if test "x$use_additional" != "xyes"
|
263 |
then
|
|
997.2.17
by Monty Taylor
Added check for isainfo so that we don't try to run it on Solaris. |
264 |
AS_IF([test "$isainfo_b" != "none"],[
|
265 |
LDFLAGS="${LDFLAGS} -L/usr/local/lib/${isainfo_b} -L/usr/local/lib -L/opt/csw/lib/${isainfo_b} -L/opt/csw/lib"
|
|
266 |
],[
|
|
267 |
LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/csw/lib"
|
|
268 |
])
|
|
269 |
CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/csw/include"
|
|
968.2.1
by Monty Taylor
Build fix making 64-bit atomic<> work on 32-bit systems. |
270 |
fi
|
997.2.17
by Monty Taylor
Added check for isainfo so that we don't try to run it on Solaris. |
271 |
AS_IF([test "$isainfo_b" != "none"],
|
272 |
[LDFLAGS="${LDFLAGS} -L/usr/lib/${isainfo_b}"])
|
|
908.1.11
by Monty Taylor
Fixed 64-bit flags for Solaris. |
273 |
|
919.2.18
by Monty Taylor
Restructured CFLAGS processing to always keep user-supplied options last on the command line, so they take precedence. |
274 |
CXXFLAGS="-xlang=c99 -g -mt -compat=5 -library=stlport4 -template=no%extdef ${IS_64} ${MEMALIGN_FLAGS} ${CXXFLAGS}"
|
275 |
CFLAGS="-g -mt -xc99=all ${IS_64} ${MEMALIGN_FLAGS} ${CFLAGS}"
|
|
873.2.36
by Monty Taylor
Fix to clean up flags. |
276 |
DEBUG_CFLAGS="-xO0"
|
277 |
DEBUG_CXXFLAGS="-xO0"
|
|
278 |
||
907.3.3
by Monty Taylor
A whole crapload of build fixes. OpenSolaris AMD64 builds with -m64 now by default... still isn't warning clean yet though. Also cleaned up the AM_*FLAGS situation. |
279 |
dnl TODO: -xO4 causes a Sun Studio failure in innodb... let's check back |
280 |
dnl in on this one. |
|
281 |
OPTIMIZE_FLAGS="-xO3 -xlibmil -xdepend" |
|
873.2.41
by Monty Taylor
Fixed the ol build for ol Solaris. |
282 |
OPTIMIZE_CFLAGS="${OPTIMIZE_FLAGS} -Xa -xstrconst" |
779.1.12
by Monty Taylor
Possible build fixes for Solaris. |
283 |
OPTIMIZE_CXXFLAGS="${OPTIMIZE_FLAGS}" |
907.3.2
by Monty Taylor
Added tests for 64-bit solaris. Look in /usr/lib/amd64 and /usr/local/lib/amd64 if we are 64-bit. |
284 |
|
520.4.40
by mordred
Added an option to specify --with-probuf=<location> |
285 |
fi
|
286 |
||
919.2.22
by Monty Taylor
Fixed the latest stuff on Solaris. |
287 |
m4_include(m4/gettext.m4) |
288 |
AM_GNU_GETTEXT(external, need-formatstring-macros) |
|
289 |
if test "x$MSGMERGE" = "x" -o "x$MSGMERGE" = "x:" |
|
290 |
then
|
|
291 |
AM_PATH_PROG_WITH_TEST(GMSGMERGE, gmsgmerge, |
|
292 |
[$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) |
|
293 |
MSGMERGE="${GMSGMERGE}" |
|
294 |
fi
|
|
295 |
AM_CONDITIONAL([BUILD_GETTEXT],[test "x$MSGMERGE" != "x" -a "x$MSGMERGE" != "x:"]) |
|
296 |
||
297 |
||
779.3.18
by Monty Taylor
Cleaned up warnings up through innodb. |
298 |
# We use libtool |
299 |
AC_PROG_LIBTOOL
|
|
300 |
||
520.4.40
by mordred
Added an option to specify --with-probuf=<location> |
301 |
dnl TODO: Remove this define once we are using 2.61 across the board. |
302 |
# AX_HEADER_ASSERT |
|
303 |
# ---------------- |
|
304 |
# Check whether to enable assertions. |
|
305 |
AC_DEFUN([AX_HEADER_ASSERT], |
|
306 |
[
|
|
307 |
AC_MSG_CHECKING([whether to enable assertions]) |
|
308 |
AC_ARG_ENABLE([assert], |
|
309 |
[AS_HELP_STRING([--disable-assert], |
|
310 |
[Turn off assertions])], |
|
311 |
[ac_cv_assert="no"], |
|
312 |
[ac_cv_assert="yes"]) |
|
313 |
AC_MSG_RESULT([$ac_cv_assert]) |
|
314 |
])
|
|
315 |
||
316 |
AX_HEADER_ASSERT
|
|
317 |
||
318 |
AC_ARG_WITH([debug], |
|
319 |
[AS_HELP_STRING([--with-debug], |
|
320 |
[Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])], |
|
321 |
[with_debug=$withval], |
|
322 |
[with_debug=no]) |
|
323 |
if test "$with_debug" = "yes" |
|
324 |
then
|
|
873.2.36
by Monty Taylor
Fix to clean up flags. |
325 |
# Debuging. No optimization. |
917.1.3
by Monty Taylor
Removed -DDEBUG - we don't use it and it breaks on Solaris. |
326 |
CFLAGS="${DEBUG_CFLAGS} ${CFLAGS}" |
327 |
CXXFLAGS="${DEBUG_CXXFLAGS} ${CXXFLAGS}" |
|
520.4.40
by mordred
Added an option to specify --with-probuf=<location> |
328 |
else
|
329 |
# Optimized version. No debug |
|
907.3.3
by Monty Taylor
A whole crapload of build fixes. OpenSolaris AMD64 builds with -m64 now by default... still isn't warning clean yet though. Also cleaned up the AM_*FLAGS situation. |
330 |
CFLAGS="${OPTIMIZE_CFLAGS} ${CFLAGS}" |
331 |
CXXFLAGS="${OPTIMIZE_CXXFLAGS} ${CXXFLAGS}" |
|
520.4.40
by mordred
Added an option to specify --with-probuf=<location> |
332 |
fi
|
1
by brian
clean slate |
333 |
|
334 |
||
520.4.44
by mordred
A whole bunch of solaris/sun studio compile fixes. |
335 |
AC_CXX_STL_HASH
|
336 |
AC_CXX_CSTDINT
|
|
337 |
AC_CXX_CINTTYPES
|
|
919.2.19
by Monty Taylor
Added check for shared_ptr in advance of actually thinking about using it. I think this should cover all platforms we care about... but let's doublecheck. |
338 |
AC_CXX_SHARED_PTR
|
1
by brian
clean slate |
339 |
|
319.1.1
by Grant Limberg
renamed all instances of MYSQL_ to DRIZZLE_ |
340 |
DRIZZLE_PROG_AR
|
1
by brian
clean slate |
341 |
|
779.2.1
by Monty Taylor
Added new pthread m4 file. Changing lib checks to use AC_LIB_HAVE_LINKFLAGS |
342 |
AC_LIB_PREFIX
|
343 |
||
287.3.30
by Monty Taylor
Added step one of finding libprotobuf. |
344 |
#-------------------------------------------------------------------- |
345 |
# Check for Google Proto Buffers |
|
346 |
#-------------------------------------------------------------------- |
|
347 |
||
629.2.4
by Monty Taylor
Cleaned up the lib searching - now base some searches off of the prefix. |
348 |
AC_LANG_PUSH([C++]) |
779.2.1
by Monty Taylor
Added new pthread m4 file. Changing lib checks to use AC_LIB_HAVE_LINKFLAGS |
349 |
AC_LIB_HAVE_LINKFLAGS(protobuf,, |
350 |
[#include <google/protobuf/descriptor.h> |
|
351 |
],
|
|
992.1.5
by Monty Taylor
Added ability to make a searched-for lib use -isystem so we can do that for protobuf. |
352 |
[google::protobuf::FileDescriptor* file;],system) |
779.2.1
by Monty Taylor
Added new pthread m4 file. Changing lib checks to use AC_LIB_HAVE_LINKFLAGS |
353 |
AS_IF([test x$ac_cv_libprotobuf = xno], |
917.1.5
by Monty Taylor
Added more verbose failure messages. |
354 |
AC_MSG_ERROR([protobuf is required for Drizzle. On Debian this can be found in libprotobuf-dev. On RedHat this can be found in protobuf-devel.])) |
629.2.4
by Monty Taylor
Cleaned up the lib searching - now base some searches off of the prefix. |
355 |
|
910.2.2
by Monty Taylor
Split out protobuf version check from the check for protobuf version so that we can give better error message. |
356 |
AC_CACHE_CHECK([if protobuf is recent enough], [drizzle_cv_protobuf_recent], |
357 |
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
|
358 |
#include <google/protobuf/descriptor.h> |
|
359 |
#if GOOGLE_PROTOBUF_VERSION < 2000002 |
|
360 |
# error Your version of Protobuf is too old |
|
361 |
#endif |
|
362 |
]])],
|
|
363 |
[drizzle_cv_protobuf_recent=yes], |
|
364 |
[drizzle_cv_protobuf_recent=no])]) |
|
365 |
if test "$drizzle_cv_protobuf_recent" = "no" |
|
366 |
then
|
|
367 |
AC_MSG_ERROR([Your version of Google Protocol Buffers is too old. Drizzle requires at least version 2.0.2]) |
|
368 |
fi
|
|
369 |
||
779.2.1
by Monty Taylor
Added new pthread m4 file. Changing lib checks to use AC_LIB_HAVE_LINKFLAGS |
370 |
AC_PATH_PROG([PROTOC],[protoc],[no],[$LIBPROTOBUF_PREFIX/bin:$PATH]) |
520.4.47
by Monty Taylor
Added check for protoc to protobuf checks. |
371 |
if test "x$PROTOC" = "xno" |
372 |
then
|
|
917.1.5
by Monty Taylor
Added more verbose failure messages. |
373 |
AC_MSG_ERROR([Couldn't find the protoc compiler. On Debian this can be found in protobuf-compiler. On RedHat this can be found in protobuf-compiler.]) |
520.4.47
by Monty Taylor
Added check for protoc to protobuf checks. |
374 |
fi
|
375 |
||
287.3.30
by Monty Taylor
Added step one of finding libprotobuf. |
376 |
AC_LANG_POP()
|
77.1.111
by Monty Taylor
Added --enable-tcmalloc which will enable searching for and linking with tcmalloc if you have it. |
377 |
|
77.1.63
by Monty Taylor
Fail also if we can't find libevent or pthread.h. |
378 |
#--------------------------------------------------------------------
|
520.4.27
by Monty Taylor
Fail if we don't find uuid/uuid.h. |
379 |
# Check for libuuid
|
380 |
#--------------------------------------------------------------------
|
|
381 |
||
779.2.1
by Monty Taylor
Added new pthread m4 file. Changing lib checks to use AC_LIB_HAVE_LINKFLAGS |
382 |
dnl Do this by hand. Need to check for uuid/uuid.h, but uuid may or may
|
383 |
dnl not be a lib is weird.
|
|
384 |
||
590.2.13
by Monty Taylor
Reverted libuuid check code. |
385 |
AC_CHECK_HEADERS(uuid/uuid.h)
|
386 |
if test "x$ac_cv_header_uuid_uuid_h" = "xno"
|
|
387 |
then
|
|
917.1.5
by Monty Taylor
Added more verbose failure messages. |
388 |
AC_MSG_ERROR([Couldn't find uuid/uuid.h. On Debian this can be found in uuid-dev. On Redhat this can be found in e2fsprogs-devel.]) |
590.2.13
by Monty Taylor
Reverted libuuid check code. |
389 |
fi
|
779.2.3
by Monty Taylor
Added stdlib.h depend for readline. |
390 |
AC_LIB_HAVE_LINKFLAGS(uuid,, |
391 |
[
|
|
392 |
#include <uuid/uuid.h> |
|
393 |
],
|
|
394 |
[
|
|
395 |
uuid_t uout; |
|
396 |
uuid_generate(uout); |
|
397 |
])
|
|
398 |
||
134.2.1
by Antony Curtis
Changes for proper detection of libraries |
399 |
|
77.1.63
by Monty Taylor
Fail also if we can't find libevent or pthread.h. |
400 |
|
401 |
#-------------------------------------------------------------------- |
|
402 |
# Check for libpthread |
|
403 |
#-------------------------------------------------------------------- |
|
404 |
||
779.2.1
by Monty Taylor
Added new pthread m4 file. Changing lib checks to use AC_LIB_HAVE_LINKFLAGS |
405 |
ACX_PTHREAD(,AC_MSG_ERROR(could not find libpthread)) |
406 |
LIBS="$PTHREAD_LIBS $LIBS" |
|
907.3.3
by Monty Taylor
A whole crapload of build fixes. OpenSolaris AMD64 builds with -m64 now by default... still isn't warning clean yet though. Also cleaned up the AM_*FLAGS situation. |
407 |
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" |
779.2.1
by Monty Taylor
Added new pthread m4 file. Changing lib checks to use AC_LIB_HAVE_LINKFLAGS |
408 |
CC="$PTHREAD_CC" |
77.1.63
by Monty Taylor
Fail also if we can't find libevent or pthread.h. |
409 |
|
410 |
#-------------------------------------------------------------------- |
|
612.2.5
by Monty Taylor
Added test for mtmalloc, if we haven't explicitly asked for tcmalloc. |
411 |
# Check for tcmalloc/mtmalloc |
77.1.111
by Monty Taylor
Added --enable-tcmalloc which will enable searching for and linking with tcmalloc if you have it. |
412 |
#-------------------------------------------------------------------- |
413 |
||
414 |
AC_ARG_ENABLE([tcmalloc], |
|
934.3.5
by Monty Taylor
Addd -Wshadow to PROTOSKIP warnings and turned -Wstrict-aliasing off. Jumped the gun... |
415 |
[AS_HELP_STRING([--disable-tcmalloc], |
416 |
[Enable linking with tcmalloc @<:@default=on@:>@])], |
|
236.1.14
by Monty Taylor
Merged build changes from Antony. |
417 |
[ac_enable_tcmalloc="$enableval"], |
934.3.5
by Monty Taylor
Addd -Wshadow to PROTOSKIP warnings and turned -Wstrict-aliasing off. Jumped the gun... |
418 |
[ac_enable_tcmalloc="yes"]) |
77.1.111
by Monty Taylor
Added --enable-tcmalloc which will enable searching for and linking with tcmalloc if you have it. |
419 |
|
612.2.5
by Monty Taylor
Added test for mtmalloc, if we haven't explicitly asked for tcmalloc. |
420 |
if test "x$ac_enable_tcmalloc" != "xno" |
77.1.111
by Monty Taylor
Added --enable-tcmalloc which will enable searching for and linking with tcmalloc if you have it. |
421 |
then
|
422 |
AC_CHECK_LIB(tcmalloc,malloc,[],[]) |
|
423 |
fi
|
|
424 |
||
612.2.5
by Monty Taylor
Added test for mtmalloc, if we haven't explicitly asked for tcmalloc. |
425 |
if test "x$ac_cv_lib_tcmalloc_malloc" != "xyes" |
426 |
then
|
|
427 |
AC_CHECK_LIB(mtmalloc,malloc,[],[]) |
|
428 |
fi
|
|
429 |
||
779.2.1
by Monty Taylor
Added new pthread m4 file. Changing lib checks to use AC_LIB_HAVE_LINKFLAGS |
430 |
|
77.1.111
by Monty Taylor
Added --enable-tcmalloc which will enable searching for and linking with tcmalloc if you have it. |
431 |
#-------------------------------------------------------------------- |
779.1.15
by Monty Taylor
Added libdrizzle configure support. |
432 |
# Check for libdrizzle |
433 |
#-------------------------------------------------------------------- |
|
434 |
||
435 |
AC_LIB_HAVE_LINKFLAGS(drizzle,, |
|
436 |
[#include <libdrizzle/drizzle.h>], |
|
437 |
[
|
|
438 |
const char *version= drizzle_version() |
|
439 |
])
|
|
928.1.1
by Eric Day
Started client changes. |
440 |
AS_IF([test x$ac_cv_libdrizzle = xno], |
441 |
AC_MSG_ERROR([libdrizzle is required for Drizzle])) |
|
779.1.15
by Monty Taylor
Added libdrizzle configure support. |
442 |
|
443 |
||
444 |
#-------------------------------------------------------------------- |
|
77.1.63
by Monty Taylor
Fail also if we can't find libevent or pthread.h. |
445 |
# Check for libz |
446 |
#-------------------------------------------------------------------- |
|
447 |
||
779.2.1
by Monty Taylor
Added new pthread m4 file. Changing lib checks to use AC_LIB_HAVE_LINKFLAGS |
448 |
AC_LIB_HAVE_LINKFLAGS(z,, |
449 |
[#include <zlib.h>], |
|
450 |
[
|
|
451 |
crc32(0, Z_NULL, 0); |
|
452 |
])
|
|
453 |
AS_IF([test x$ac_cv_libz = xno], |
|
917.1.5
by Monty Taylor
Added more verbose failure messages. |
454 |
AC_MSG_ERROR([libz is required for Drizzle. On Debian this can be found in zlib1g-dev. On RedHat this can be found in zlib-devel.])) |
201.2.3
by Monty Taylor
Cleaned up some LIBS bits in the build. |
455 |
|
612.2.9
by Monty Taylor
Woot. No more extra CFLAGS on the command line! |
456 |
#-------------------------------------------------------------------- |
910.5.2
by Monty Taylor
Applied atomic patch to current tree. |
457 |
# Check for TBB |
458 |
#-------------------------------------------------------------------- |
|
459 |
||
460 |
AC_LANG_PUSH(C++) |
|
461 |
AC_LIB_HAVE_LINKFLAGS(tbb,, |
|
462 |
[#include <tbb/atomic.h> |
|
463 |
#include <stdint.h> |
|
464 |
],
|
|
465 |
[
|
|
466 |
tbb::atomic<uint64_t> x; |
|
467 |
tbb::atomic<uint8_t> y; |
|
468 |
x=0; |
|
469 |
y=0; |
|
470 |
x++; |
|
471 |
y++; |
|
472 |
])
|
|
473 |
AC_LANG_POP() |
|
474 |
||
475 |
#-------------------------------------------------------------------- |
|
182.1.5
by Jim Winstead
Detect and make the Mac OS X libedit readline interface look like the |
476 |
# Check for libreadline or compatible (libedit on Mac OS X) |
477 |
#-------------------------------------------------------------------- |
|
77.1.63
by Monty Taylor
Fail also if we can't find libevent or pthread.h. |
478 |
|
779.2.5
by Monty Taylor
Split out readline. |
479 |
save_LIBS="${LIBS}" |
480 |
LIBS="" |
|
779.2.4
by Monty Taylor
Updated some more build stuff. |
481 |
VL_LIB_READLINE
|
873.2.4
by Monty Taylor
Fixed some configure errors. |
482 |
AS_IF([test "x$vl_cv_lib_readline" = "xno"], |
917.1.5
by Monty Taylor
Added more verbose failure messages. |
483 |
AC_MSG_ERROR([libreadline is required for Drizzle. On Debian this can be found in libreadline5-dev. On RedHat this can be found in readline-devel.])) |
779.2.5
by Monty Taylor
Split out readline. |
484 |
READLINE_LIBS="${LIBS}" |
485 |
LIBS="${save_LIBS}" |
|
486 |
AC_SUBST(READLINE_LIBS) |
|
207.1.2
by Jim Winstead
Fix test for libreadline to test a function that exists in all usable |
487 |
|
319.1.1
by Grant Limberg
renamed all instances of MYSQL_ to DRIZZLE_ |
488 |
DRIZZLE_CHECK_NEW_RL_INTERFACE
|
287.3.30
by Monty Taylor
Added step one of finding libprotobuf. |
489 |
|
77.1.63
by Monty Taylor
Fail also if we can't find libevent or pthread.h. |
490 |
#-------------------------------------------------------------------- |
491 |
# Check for libpcre |
|
492 |
#-------------------------------------------------------------------- |
|
493 |
||
873.2.41
by Monty Taylor
Fixed the ol build for ol Solaris. |
494 |
AC_LIB_HAVE_LINKFLAGS(pcre,, [#include <pcre.h>], [pcre *re= NULL]) |
495 |
AS_IF([test "x$ac_cv_libpcre" = "xno"],[ |
|
914.1.1
by Monty Taylor
Quick OpenSolaris build fix. |
496 |
unset ac_cv_libpcre |
873.2.41
by Monty Taylor
Fixed the ol build for ol Solaris. |
497 |
AC_LIB_HAVE_LINKFLAGS(pcre,, [#include <pcre/pcre.h>], [pcre *re= NULL]) |
914.1.1
by Monty Taylor
Quick OpenSolaris build fix. |
498 |
AS_IF([test "x$ac_cv_libpcre" = "xno"], |
917.1.5
by Monty Taylor
Added more verbose failure messages. |
499 |
[AC_MSG_ERROR([libpcre is required for Drizzle. On Debian this can be found in libpcre3-dev. On RedHat this can be found in pcre-devel.])] |
914.1.1
by Monty Taylor
Quick OpenSolaris build fix. |
500 |
[AC_DEFINE(PCRE_HEADER,[<pcre/pcre.h>],[Location of pcre header])]) |
501 |
],[
|
|
502 |
AC_DEFINE(PCRE_HEADER,[<pcre.h>],[Location of pcre header]) |
|
503 |
])
|
|
779.2.9
by Monty Taylor
Put back in pkg-config check- pcre.h is in /usr/include for older versions and |
504 |
|
77.1.63
by Monty Taylor
Fail also if we can't find libevent or pthread.h. |
505 |
|
1
by brian
clean slate |
506 |
dnl Find paths to some shell programs |
507 |
AC_PATH_PROG(LN, ln, ln) |
|
508 |
# This must be able to take a -f flag like normal unix ln. |
|
509 |
AC_PATH_PROG(LN_CP_F, ln, ln) |
|
510 |
||
511 |
AC_PATH_PROG(MV, mv, mv) |
|
512 |
AC_PATH_PROG(RM, rm, rm) |
|
513 |
AC_PATH_PROG(CP, cp, cp) |
|
514 |
AC_PATH_PROG(SED, sed, sed) |
|
515 |
AC_PATH_PROG(CMP, cmp, cmp) |
|
516 |
AC_PATH_PROG(CHMOD, chmod, chmod) |
|
517 |
AC_PATH_PROG(HOSTNAME, hostname, hostname) |
|
518 |
# Check for a GNU tar named 'gtar', or 'gnutar' (MacOS X) and |
|
519 |
# fall back to 'tar' otherwise and hope that it's a GNU tar as well |
|
520 |
AC_CHECK_PROGS(TAR, gnutar gtar tar)
|
|
521 |
||
522 |
dnl We use a path for perl so the script startup works
|
|
523 |
dnl We make sure to use perl, not perl5, in hopes that the RPMs will
|
|
524 |
dnl not depend on the perl5 binary being installed (probably a bug in RPM)
|
|
525 |
AC_PATH_PROG(PERL, perl, no)
|
|
526 |
if test "$PERL" != "no" && $PERL -e 'require 5' > /dev/null 2>&1 |
|
527 |
then
|
|
528 |
PERL5=$PERL
|
|
529 |
else
|
|
530 |
AC_PATH_PROG(PERL5, perl5, no)
|
|
531 |
if test "$PERL5" != no
|
|
532 |
then
|
|
533 |
PERL=$PERL5
|
|
534 |
ac_cv_path_PERL=$ac_cv_path_PERL5
|
|
535 |
fi
|
|
536 |
fi
|
|
537 |
||
538 |
AC_SUBST(HOSTNAME)
|
|
539 |
AC_SUBST(PERL)
|
|
540 |
AC_SUBST(PERL5)
|
|
541 |
||
542 |
# icheck, used for ABI check
|
|
543 |
AC_PATH_PROG(ICHECK, icheck, no)
|
|
544 |
# "icheck" is also the name of a file system check program on Tru64.
|
|
545 |
# Verify the program found is really the interface checker.
|
|
546 |
if test "x$ICHECK" != "xno"
|
|
547 |
then
|
|
548 |
AC_MSG_CHECKING(if $ICHECK works as expected)
|
|
549 |
echo "int foo;" > conftest.h
|
|
550 |
$ICHECK --canonify -o conftest.ic conftest.h 2>/dev/null
|
|
551 |
if test -f "conftest.ic"
|
|
552 |
then
|
|
553 |
AC_MSG_RESULT(yes)
|
|
554 |
else
|
|
555 |
AC_MSG_RESULT(no)
|
|
556 |
ICHECK=no
|
|
557 |
fi
|
|
558 |
rm -f conftest.ic conftest.h
|
|
559 |
fi
|
|
560 |
AC_SUBST(ICHECK)
|
|
561 |
||
562 |
# Lock for PS
|
|
563 |
AC_PATH_PROG(PS, ps, ps)
|
|
564 |
AC_MSG_CHECKING("how to check if pid exists")
|
|
565 |
PS=$ac_cv_path_PS
|
|
566 |
# Linux style
|
|
632.1.7
by Monty
Reworked grep change to work with old crappy autoconfs. |
567 |
if $PS p $$ 2> /dev/null | grep `echo $0 | sed s/\-//` > /dev/null
|
1
by brian
clean slate |
568 |
then
|
632.1.7
by Monty
Reworked grep change to work with old crappy autoconfs. |
569 |
FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
|
1
by brian
clean slate |
570 |
# Solaris
|
632.1.7
by Monty
Reworked grep change to work with old crappy autoconfs. |
571 |
elif $PS -fp $$ 2> /dev/null | grep $0 > /dev/null
|
1
by brian
clean slate |
572 |
then
|
632.1.7
by Monty
Reworked grep change to work with old crappy autoconfs. |
573 |
FIND_PROC="$PS -p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
|
1
by brian
clean slate |
574 |
# BSD style
|
632.1.7
by Monty
Reworked grep change to work with old crappy autoconfs. |
575 |
elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null
|
1
by brian
clean slate |
576 |
then
|
632.1.7
by Monty
Reworked grep change to work with old crappy autoconfs. |
577 |
FIND_PROC="$PS -uaxww | grep -v grep | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"
|
1
by brian
clean slate |
578 |
# SysV style
|
632.1.7
by Monty
Reworked grep change to work with old crappy autoconfs. |
579 |
elif $PS -ef 2> /dev/null | grep $0 > /dev/null
|
1
by brian
clean slate |
580 |
then
|
632.1.7
by Monty
Reworked grep change to work with old crappy autoconfs. |
581 |
FIND_PROC="$PS -ef | grep -v grep | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"
|
1
by brian
clean slate |
582 |
# Do anybody use this?
|
632.1.7
by Monty
Reworked grep change to work with old crappy autoconfs. |
583 |
elif $PS $$ 2> /dev/null | grep $0 > /dev/null
|
1
by brian
clean slate |
584 |
then
|
632.1.7
by Monty
Reworked grep change to work with old crappy autoconfs. |
585 |
FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
|
1
by brian
clean slate |
586 |
else
|
587 |
case $SYSTEM_TYPE in
|
|
394
by Monty Taylor
Fix configure problem on cygwin. Thanks awfief. |
588 |
*freebsd*|*dragonfly*|*cygwin*)
|
632.1.7
by Monty
Reworked grep change to work with old crappy autoconfs. |
589 |
FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
|
1
by brian
clean slate |
590 |
;;
|
591 |
*darwin*)
|
|
632.1.7
by Monty
Reworked grep change to work with old crappy autoconfs. |
592 |
FIND_PROC="$PS -uaxww | grep -v grep | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"
|
1
by brian
clean slate |
593 |
;;
|
594 |
*)
|
|
595 |
AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
|
|
236.1.39
by Monty Taylor
autoconf warning cleanups. |
596 |
;;
|
1
by brian
clean slate |
597 |
esac
|
598 |
fi
|
|
599 |
AC_SUBST(FIND_PROC)
|
|
600 |
AC_MSG_RESULT("$FIND_PROC")
|
|
601 |
||
602 |
# Check if a pid is valid
|
|
603 |
AC_PATH_PROG(KILL, kill, kill)
|
|
604 |
AC_MSG_CHECKING("for kill switches")
|
|
605 |
if $ac_cv_path_KILL -0 $$
|
|
606 |
then
|
|
607 |
CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null"
|
|
608 |
elif kill -s 0 $$
|
|
609 |
then
|
|
610 |
CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
|
|
611 |
else
|
|
612 |
AC_MSG_WARN([kill -0 to check for pid seems to fail])
|
|
613 |
CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
|
|
614 |
fi
|
|
615 |
AC_SUBST(CHECK_PID)
|
|
616 |
AC_MSG_RESULT("$CHECK_PID")
|
|
617 |
||
618 |
||
619 |
# Check if we need noexec stack for assembler
|
|
620 |
AC_CHECK_NOEXECSTACK
|
|
621 |
||
28.1.39
by Monty Taylor
Made everything use AS_HELP_STRING (except for charsets, which are dying anyway) |
622 |
AC_ARG_WITH([server-suffix],
|
623 |
[AS_HELP_STRING([--with-server-suffix],
|
|
624 |
[Append value to the version string.])],
|
|
319.1.1
by Grant Limberg
renamed all instances of MYSQL_ to DRIZZLE_ |
625 |
[ DRIZZLE_SERVER_SUFFIX=`echo "$withval" | sed -e 's/^\(...................................\)..*$/\1/'` ], |
626 |
[ DRIZZLE_SERVER_SUFFIX= ]
|
|
1
by brian
clean slate |
627 |
)
|
546
by Monty Taylor
Cleaned up version.h. (And by cleaned, I mean removed) |
628 |
AC_DEFINE_UNQUOTED([DRIZZLE_SERVER_SUFFIX],[$DRIZZLE_SERVER_SUFFIX],
|
629 |
[Append value to the version string])
|
|
1
by brian
clean slate |
630 |
|
631 |
# Force use of a curses libs
|
|
28.1.39
by Monty Taylor
Made everything use AS_HELP_STRING (except for charsets, which are dying anyway) |
632 |
AC_ARG_WITH([named-curses-libs],
|
633 |
[AS_HELP_STRING([--with-named-curses-libs=ARG],
|
|
634 |
[Use specified curses libraries instead of those
|
|
635 |
automatically found by configure.])],
|
|
1
by brian
clean slate |
636 |
[ with_named_curses=$withval ],
|
637 |
[ with_named_curses=no ]
|
|
638 |
)
|
|
639 |
||
28.1.39
by Monty Taylor
Made everything use AS_HELP_STRING (except for charsets, which are dying anyway) |
640 |
AC_ARG_WITH([tcp-port],
|
641 |
[AS_HELP_STRING([--with-tcp-port=port-number],
|
|
165.1.1
by Elliot Murphy
new port number from IANA |
642 |
[Which port to use for Drizzle services @<:@default=4427@:>@])],
|
301
by Brian Aker
Clean up port startup |
643 |
[ DRIZZLE_TCP_PORT=$withval ],
|
644 |
[ DRIZZLE_TCP_PORT=$DRIZZLE_TCP_PORT_DEFAULT
|
|
1
by brian
clean slate |
645 |
# if we actually defaulted (as opposed to the pathological case of
|
301
by Brian Aker
Clean up port startup |
646 |
# --with-tcp-port=<DRIZZLE_TCP_PORT_DEFAULT> which might in theory
|
1
by brian
clean slate |
647 |
# happen if whole batch of servers was built from a script), set
|
648 |
# the default to zero to indicate that; we don't lose information |
|
649 |
# that way, because 0 obviously indicates that we can get the |
|
301
by Brian Aker
Clean up port startup |
650 |
# default value from DRIZZLE_TCP_PORT. this seems really evil, but |
651 |
# testing for DRIZZLE_TCP_PORT==DRIZZLE_TCP_PORT_DEFAULT would make a |
|
652 |
# a port of DRIZZLE_TCP_PORT_DEFAULT magic even if the builder did not |
|
1
by brian
clean slate |
653 |
# intend it to mean "use the default, in fact, look up a good default |
165.1.1
by Elliot Murphy
new port number from IANA |
654 |
# from /etc/services if you can", but really, really meant 4427 when |
655 |
# they passed in 4427. When they pass in a specific value, let them |
|
1
by brian
clean slate |
656 |
# have it; don't second guess user and think we know better, this will |
657 |
# just make people cross. this makes the the logic work like this
|
|
658 |
# (which is complicated enough):
|
|
659 |
#
|
|
660 |
# - if a port was set during build, use that as a default.
|
|
661 |
#
|
|
662 |
# - otherwise, try to look up a port in /etc/services; if that fails,
|
|
301
by Brian Aker
Clean up port startup |
663 |
# use DRIZZLE_TCP_PORT_DEFAULT (at the time of this writing 4427)
|
1
by brian
clean slate |
664 |
#
|
301
by Brian Aker
Clean up port startup |
665 |
# - allow the DRIZZLE_TCP_PORT environment variable to override that.
|
1
by brian
clean slate |
666 |
#
|
667 |
# - allow command-line parameters to override all of the above.
|
|
668 |
#
|
|
301
by Brian Aker
Clean up port startup |
669 |
# the top-most DRIZZLE_TCP_PORT_DEFAULT is read from win/configure.js,
|
1
by brian
clean slate |
670 |
# so don't mess with that. |
301
by Brian Aker
Clean up port startup |
671 |
DRIZZLE_TCP_PORT_DEFAULT=0 ] |
1
by brian
clean slate |
672 |
)
|
301
by Brian Aker
Clean up port startup |
673 |
AC_SUBST(DRIZZLE_TCP_PORT) |
1
by brian
clean slate |
674 |
# We might want to document the assigned port in the manual. |
301
by Brian Aker
Clean up port startup |
675 |
AC_SUBST(DRIZZLE_TCP_PORT_DEFAULT) |
546
by Monty Taylor
Cleaned up version.h. (And by cleaned, I mean removed) |
676 |
AC_DEFINE_UNQUOTED([DRIZZLE_PORT],[$DRIZZLE_TCP_PORT], |
677 |
[Drizzle port to use]) |
|
678 |
AC_DEFINE_UNQUOTED([DRIZZLE_PORT_DEFAULT],[$DRIZZLE_TCP_PORT_DEFAULT], |
|
679 |
[If we defaulted to DRIZZLE_PORT, then this will be zero]) |
|
1
by brian
clean slate |
680 |
|
681 |
# Use this to set the place used for unix socket used to local communication. |
|
572.2.1
by ysano
Replace --with-mysqld-user configure option with --with-drizzled-user. |
682 |
AC_ARG_WITH([drizzled-user], |
683 |
[AS_HELP_STRING([--with-drizzled-user=username], |
|
684 |
[What user the drizzled daemon shall be run as. |
|
685 |
@<:@default=drizzle@:>@])], |
|
686 |
[ DRIZZLED_USER=$withval ], |
|
687 |
[ DRIZZLED_USER=drizzle ] |
|
1
by brian
clean slate |
688 |
)
|
572.2.1
by ysano
Replace --with-mysqld-user configure option with --with-drizzled-user. |
689 |
AC_SUBST(DRIZZLED_USER) |
1
by brian
clean slate |
690 |
|
691 |
# If we should allow LOAD DATA LOCAL |
|
692 |
AC_MSG_CHECKING(If we should should enable LOAD DATA LOCAL by default) |
|
693 |
AC_ARG_ENABLE(local-infile, |
|
694 |
[ --enable-local-infile Enable LOAD DATA LOCAL INFILE (default: disabled)], |
|
695 |
[ ENABLED_LOCAL_INFILE=$enableval ], |
|
696 |
[ ENABLED_LOCAL_INFILE=no ] |
|
697 |
)
|
|
698 |
if test "$ENABLED_LOCAL_INFILE" = "yes" |
|
699 |
then
|
|
700 |
AC_MSG_RESULT([yes]) |
|
701 |
AC_DEFINE([ENABLED_LOCAL_INFILE], [1], |
|
702 |
[If LOAD DATA LOCAL INFILE should be enabled by default]) |
|
703 |
else
|
|
704 |
AC_MSG_RESULT([no]) |
|
705 |
fi
|
|
706 |
||
707 |
# Types that must be checked AFTER large file support is checked |
|
708 |
AC_TYPE_SIZE_T
|
|
709 |
||
710 |
#-------------------------------------------------------------------- |
|
711 |
# Check for system header files |
|
712 |
#-------------------------------------------------------------------- |
|
713 |
||
714 |
AC_HEADER_DIRENT
|
|
715 |
AC_HEADER_STDC
|
|
716 |
AC_HEADER_SYS_WAIT
|
|
53.2.2
by Monty Taylor
Updated everything that needs updating to compile with -std=gnu99 -pedantic |
717 |
AC_HEADER_STDBOOL
|
77.1.22
by Monty Taylor
Removed refs to floatingpoint.h (which we only used for fconvert) and fconvert |
718 |
AC_CHECK_HEADERS(fcntl.h float.h fpu_control.h ieeefp.h) |
53.2.29
by Monty Taylor
Cleaned up headers a little more. |
719 |
AC_CHECK_HEADERS(limits.h pwd.h select.h linux/config.h) |
720 |
AC_CHECK_HEADERS(sys/fpu.h utime.h sys/utime.h ) |
|
572.1.4
by Monty Taylor
Removed a bunch of unusued tests and defines from autoconf. |
721 |
AC_CHECK_HEADERS(synch.h sys/mman.h sys/socket.h) |
520.4.41
by mordred
Fixed configure.ac to work cleanly on Solaris - and define some good compile flags. |
722 |
AC_CHECK_HEADERS([curses.h term.h],[],[], |
723 |
[[#ifdef HAVE_CURSES_H |
|
724 |
# include <curses.h> |
|
725 |
#endif |
|
726 |
]])
|
|
202.1.4
by Monty Taylor
Removed openssl refs. |
727 |
AC_CHECK_HEADERS(termio.h termios.h sched.h alloca.h) |
572.1.4
by Monty Taylor
Removed a bunch of unusued tests and defines from autoconf. |
728 |
AC_CHECK_HEADERS(sys/prctl.h ieeefp.h) |
53.2.29
by Monty Taylor
Cleaned up headers a little more. |
729 |
AC_CHECK_HEADERS(execinfo.h) |
1
by brian
clean slate |
730 |
|
77.1.31
by Monty Taylor
Replaced regex lib with pcre. Reworked mysqltest to use it. |
731 |
#-------------------------------------------------------------------- |
1
by brian
clean slate |
732 |
# Check for system libraries. Adds the library to $LIBS |
733 |
# and defines HAVE_LIBM etc |
|
734 |
#-------------------------------------------------------------------- |
|
735 |
||
736 |
AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity)) |
|
737 |
||
236.1.39
by Monty Taylor
autoconf warning cleanups. |
738 |
AC_CHECK_FUNC(setsockopt, [], [AC_CHECK_LIB(socket, setsockopt)]) |
739 |
AC_CHECK_FUNC(yp_get_default_domain, [], |
|
740 |
[AC_CHECK_LIB(nsl, yp_get_default_domain)]) |
|
741 |
AC_CHECK_FUNC(p2open, [], [AC_CHECK_LIB(gen, p2open)]) |
|
1
by brian
clean slate |
742 |
# This may get things to compile even if bind-8 is installed |
236.1.39
by Monty Taylor
autoconf warning cleanups. |
743 |
AC_CHECK_FUNC(bind, [], [AC_CHECK_LIB(bind, bind)]) |
1
by brian
clean slate |
744 |
# Check if crypt() exists in libc or libcrypt, sets LIBS if needed |
745 |
AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) |
|
746 |
||
747 |
# Check rt for aio_read |
|
748 |
AC_CHECK_LIB(rt, aio_read) |
|
749 |
||
750 |
# For the sched_yield() function on Solaris |
|
236.1.39
by Monty Taylor
autoconf warning cleanups. |
751 |
AC_CHECK_FUNC(sched_yield, [], |
752 |
[AC_CHECK_LIB(posix4, [sched_yield], |
|
997.2.8
by Monty Taylor
Fixed a few loose ends. |
753 |
[AC_DEFINE(HAVE_SCHED_YIELD, 1, [Have sched_yield function]) LIBS="$LIBS -lposix4"])]) |
1
by brian
clean slate |
754 |
|
755 |
if test "$ac_cv_header_termio_h" = "no" -a "$ac_cv_header_termios_h" = "no" |
|
756 |
then
|
|
236.1.39
by Monty Taylor
autoconf warning cleanups. |
757 |
AC_CHECK_FUNC(gtty, [], [AC_CHECK_LIB(compat, gtty)]) |
1
by brian
clean slate |
758 |
fi
|
759 |
||
760 |
AC_CHECK_TYPES([fp_except], [], [], [ |
|
761 |
#include <sys/types.h> |
|
762 |
#include <ieeefp.h> |
|
763 |
])
|
|
764 |
||
25
by Brian Aker
Clean up of configure.in |
765 |
my_save_LIBS="$LIBS" |
766 |
LIBS="" |
|
767 |
AC_CHECK_LIB(dl,dlopen) |
|
572.1.4
by Monty Taylor
Removed a bunch of unusued tests and defines from autoconf. |
768 |
AC_CHECK_FUNCS(dlopen) |
177.3.1
by mark
remove ifdef HAVE_DLOPEN, make configure require dlopen() |
769 |
if test "$ac_cv_func_dlopen" != "yes" |
770 |
then
|
|
771 |
AC_MSG_ERROR([Drizzle requires dlopen]) |
|
772 |
fi
|
|
201.2.3
by Monty Taylor
Cleaned up some LIBS bits in the build. |
773 |
LIBDL_LIBS="$LIBS" |
25
by Brian Aker
Clean up of configure.in |
774 |
LIBS="$my_save_LIBS" |
201.2.3
by Monty Taylor
Cleaned up some LIBS bits in the build. |
775 |
AC_SUBST(LIBDL_LIBS) |
25
by Brian Aker
Clean up of configure.in |
776 |
|
201.2.4
by Monty Taylor
Re-enabled optimizations for the normal build, and added back the --with-debug option to turn them off. |
777 |
|
840.1.6
by Monty Taylor
Added back atomic builtins check. |
778 |
AC_ARG_WITH([atomic-ops], |
840.1.12
by Monty Taylor
Updated AC_HELP_STRING to AS_HELP_STRING |
779 |
[AS_HELP_STRING([--with-atomic-ops=rwlocks|smp|up], |
780 |
[Implement atomic operations using pthread rwlocks or atomic CPU |
|
781 |
instructions for multi-processor or uniprocessor |
|
782 |
configuration. By default gcc built-in sync functions are used, |
|
783 |
if available and 'smp' configuration otherwise.])], |
|
784 |
[with_atomic_ops="$withval"], |
|
785 |
[with_atomic_ops=smp]) |
|
840.1.6
by Monty Taylor
Added back atomic builtins check. |
786 |
|
787 |
case "$with_atomic_ops" in |
|
788 |
"up") AC_DEFINE([MY_ATOMIC_MODE_DUMMY], [1], |
|
789 |
[Assume single-CPU mode, no concurrency]) ;; |
|
790 |
"rwlocks") AC_DEFINE([MY_ATOMIC_MODE_RWLOCKS], [1], |
|
791 |
[Use pthread rwlocks for atomic ops]) ;; |
|
910.5.2
by Monty Taylor
Applied atomic patch to current tree. |
792 |
"smp") |
840.1.6
by Monty Taylor
Added back atomic builtins check. |
793 |
AC_CACHE_CHECK( |
794 |
[whether the compiler provides atomic builtins], |
|
795 |
[ac_cv_gcc_atomic_builtins], |
|
942.1.5
by Monty Taylor
Replace AC_TRY_* with AC_*_IFELSE |
796 |
[AC_RUN_IFELSE( |
797 |
[AC_LANG_PROGRAM([],[[ |
|
840.1.6
by Monty Taylor
Added back atomic builtins check. |
798 |
int foo= -10; int bar= 10; |
799 |
if (!__sync_fetch_and_add(&foo, bar) || foo) |
|
800 |
return -1; |
|
801 |
bar= __sync_lock_test_and_set(&foo, bar); |
|
802 |
if (bar || foo != 10) |
|
803 |
return -1; |
|
804 |
bar= __sync_val_compare_and_swap(&bar, foo, 15); |
|
805 |
if (bar) |
|
806 |
return -1; |
|
807 |
return 0; |
|
942.1.5
by Monty Taylor
Replace AC_TRY_* with AC_*_IFELSE |
808 |
]])],
|
840.1.6
by Monty Taylor
Added back atomic builtins check. |
809 |
[ac_cv_gcc_atomic_builtins=yes], |
810 |
[ac_cv_gcc_atomic_builtins=no])]) |
|
811 |
||
812 |
if test "x$ac_cv_gcc_atomic_builtins" = "xyes"; then |
|
813 |
AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS, 1, |
|
814 |
[Define to 1 if compiler provides atomic builtins.]) |
|
815 |
fi
|
|
816 |
;;
|
|
817 |
*) AC_MSG_ERROR(["$with_atomic_ops" is not a valid value for --with-atomic-ops]) ;; |
|
818 |
esac
|
|
819 |
||
820 |
||
28.1.39
by Monty Taylor
Made everything use AS_HELP_STRING (except for charsets, which are dying anyway) |
821 |
AC_ARG_WITH([comment], |
822 |
[AS_HELP_STRING([--with-comment], |
|
823 |
[Comment about compilation environment. @<:@default=off@:>@])], |
|
1
by brian
clean slate |
824 |
[with_comment=$withval], |
825 |
[with_comment=no]) |
|
826 |
if test "$with_comment" != "no" |
|
827 |
then
|
|
828 |
COMPILATION_COMMENT=$with_comment |
|
829 |
else
|
|
830 |
COMPILATION_COMMENT="Source distribution" |
|
831 |
fi
|
|
546
by Monty Taylor
Cleaned up version.h. (And by cleaned, I mean removed) |
832 |
AC_DEFINE_UNQUOTED([COMPILATION_COMMENT],["$COMPILATION_COMMENT"], |
833 |
[Comment about compilation environment]) |
|
1
by brian
clean slate |
834 |
|
835 |
dnl Checks for typedefs, structures, and compiler characteristics. |
|
836 |
AC_C_CONST
|
|
837 |
AC_C_INLINE
|
|
590.2.2
by Monty Taylor
Configure cleanups. Added generic search_for_lib m4 macro. |
838 |
AC_C_VOLATILE
|
1
by brian
clean slate |
839 |
AC_TYPE_OFF_T
|
840 |
AC_HEADER_TIME
|
|
841 |
AC_STRUCT_TM
|
|
842 |
# off_t is not a builtin type |
|
843 |
AC_CHECK_SIZEOF(off_t, 4) |
|
844 |
if test "$ac_cv_sizeof_off_t" -eq 0 |
|
845 |
then
|
|
91
by Brian Aker
Main binary now named drizzled |
846 |
AC_MSG_ERROR("Drizzle needs a off_t type.") |
1
by brian
clean slate |
847 |
fi
|
968.2.1
by Monty Taylor
Build fix making 64-bit atomic<> work on 32-bit systems. |
848 |
AC_CHECK_SIZEOF(size_t) |
849 |
AC_DEFINE_UNQUOTED([SIZEOF_SIZE_T],[$ac_cv_sizeof_size_t],[Size of size_t as computed by sizeof()]) |
|
850 |
AC_CHECK_SIZEOF(long long) |
|
851 |
AC_DEFINE_UNQUOTED(SIZEOF_LONG_LONG,[$ac_cv_sizeof_long_long],[Size of long long as computed by sizeof()]) |
|
1
by brian
clean slate |
852 |
|
853 |
dnl
|
|
854 |
dnl check if time_t is unsigned |
|
855 |
dnl
|
|
856 |
||
319.1.1
by Grant Limberg
renamed all instances of MYSQL_ to DRIZZLE_ |
857 |
DRIZZLE_CHECK_TIME_T
|
1
by brian
clean slate |
858 |
|
859 |
||
860 |
# This always gives a warning. Ignore it unless you are cross compiling |
|
861 |
AC_C_BIGENDIAN
|
|
942.1.7
by Monty Taylor
Removed check for rlimit64... we set FILE_OFFSET_BITS properly, so it's not necessary on modern unixes (post 1998-ish) |
862 |
|
1
by brian
clean slate |
863 |
# Find where the stack goes |
319.1.1
by Grant Limberg
renamed all instances of MYSQL_ to DRIZZLE_ |
864 |
DRIZZLE_STACK_DIRECTION
|
1
by brian
clean slate |
865 |
# We want to skip alloca on irix unconditionally. It may work on some version.. |
319.1.1
by Grant Limberg
renamed all instances of MYSQL_ to DRIZZLE_ |
866 |
DRIZZLE_FUNC_ALLOCA
|
942.1.8
by Monty Taylor
Removed more unused macros/things we don't need to check because they are posix. |
867 |
|
1
by brian
clean slate |
868 |
AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>]) |
520.4.43
by mordred
A set of Solaris fixes. |
869 |
AC_CHECK_TYPES([uint, ulong]) |
1
by brian
clean slate |
870 |
|
319.1.1
by Grant Limberg
renamed all instances of MYSQL_ to DRIZZLE_ |
871 |
DRIZZLE_PTHREAD_YIELD
|
1
by brian
clean slate |
872 |
|
134.2.1
by Antony Curtis
Changes for proper detection of libraries |
873 |
|
1
by brian
clean slate |
874 |
dnl Checks for header files. |
572.1.4
by Monty Taylor
Removed a bunch of unusued tests and defines from autoconf. |
875 |
AC_CHECK_HEADERS(malloc.h) |
1
by brian
clean slate |
876 |
|
877 |
dnl Checks for library functions. |
|
878 |
AC_FUNC_ALLOCA
|
|
879 |
AC_PROG_GCC_TRADITIONAL
|
|
880 |
AC_TYPE_SIGNAL
|
|
572.1.4
by Monty Taylor
Removed a bunch of unusued tests and defines from autoconf. |
881 |
|
1
by brian
clean slate |
882 |
AC_CHECK_FUNCS(issetugid) |
883 |
||
884 |
# from old readline settting: |
|
885 |
||
886 |
MAKE_SHELL=/bin/sh |
|
887 |
AC_SUBST(MAKE_SHELL) |
|
888 |
||
889 |
# Already-done: stdlib.h string.h unistd.h termios.h |
|
398.1.9
by Monty Taylor
Cleaned up stuff out of global.h. |
890 |
AC_CHECK_HEADERS(stdarg.h dirent.h locale.h ndir.h sys/dir.h \ |
572.1.4
by Monty Taylor
Removed a bunch of unusued tests and defines from autoconf. |
891 |
sys/ndir.h sys/select.h \ |
892 |
sys/mman.h termcap.h termio.h asm/termbits.h grp.h \ |
|
893 |
paths.h) |
|
1
by brian
clean slate |
894 |
|
895 |
# Already-done: strcasecmp |
|
572.1.4
by Monty Taylor
Removed a bunch of unusued tests and defines from autoconf. |
896 |
AC_CHECK_FUNCS(lstat select) |
1
by brian
clean slate |
897 |
|
28.1.33
by Monty Taylor
Added -Wall |
898 |
AC_HEADER_STAT
|
319.1.1
by Grant Limberg
renamed all instances of MYSQL_ to DRIZZLE_ |
899 |
DRIZZLE_SIGNAL_CHECK
|
900 |
DRIZZLE_CHECK_GETPW_FUNCS
|
|
901 |
DRIZZLE_HAVE_TIOCGWINSZ
|
|
902 |
DRIZZLE_HAVE_TIOCSTAT
|
|
1
by brian
clean slate |
903 |
|
904 |
#########################################################################
|
|
905 |
||
906 |
dnl Checks for library functions. |
|
907 |
||
908 |
AC_FUNC_UTIME_NULL
|
|
909 |
AC_FUNC_VPRINTF
|
|
910 |
||
77.1.24
by Monty Taylor
Removed non-fcntl code and made it a fatal configure error if it's not there. |
911 |
AC_CHECK_FUNCS(fcntl) |
912 |
if test "x$ac_cv_func_fcntl" != "xyes" |
|
913 |
then
|
|
914 |
AC_MSG_ERROR("Drizzle requires fcntl.") |
|
915 |
fi
|
|
916 |
||
815.1.6
by Monty Taylor
Some tweaks to get timegm working on Solaris. |
917 |
AC_CONFIG_LIBOBJ_DIR([gnulib]) |
236.1.50
by Monty Taylor
Added automake conditional compilation of distributed system replacement functions. |
918 |
|
572.1.4
by Monty Taylor
Removed a bunch of unusued tests and defines from autoconf. |
919 |
AC_CHECK_FUNCS( \ |
77.1.24
by Monty Taylor
Removed non-fcntl code and made it a fatal configure error if it's not there. |
920 |
cuserid fchmod \ |
572.1.4
by Monty Taylor
Removed a bunch of unusued tests and defines from autoconf. |
921 |
fdatasync fpresetsticky fpsetmask fsync \ |
575.4.6
by Monty Taylor
Removed my_getwd. |
922 |
getpassphrase getpwnam \ |
923 |
getpwuid getrlimit getrusage index initgroups isnan \ |
|
1
by brian
clean slate |
924 |
localtime_r gethrtime gmtime_r \ |
572.1.4
by Monty Taylor
Removed a bunch of unusued tests and defines from autoconf. |
925 |
madvise \ |
926 |
mkstemp mlockall poll pread pthread_attr_create mmap mmap64 \ |
|
1
by brian
clean slate |
927 |
pthread_attr_getstacksize pthread_attr_setprio pthread_attr_setschedparam \ |
928 |
pthread_attr_setstacksize pthread_condattr_create pthread_getsequence_np \ |
|
929 |
pthread_key_delete pthread_rwlock_rdlock pthread_setprio \ |
|
930 |
pthread_setprio_np pthread_setschedparam pthread_sigmask readlink \ |
|
449
by Monty Taylor
Removed rint check - rint is part of C99. |
931 |
realpath rename rwlock_init setupterm \ |
572.1.4
by Monty Taylor
Removed a bunch of unusued tests and defines from autoconf. |
932 |
sigaction \ |
933 |
sigthreadmask \ |
|
934 |
snprintf strpbrk \ |
|
935 |
tell tempnam \ |
|
936 |
backtrace backtrace_symbols backtrace_symbols_fd) |
|
1
by brian
clean slate |
937 |
|
287.3.18
by Monty Taylor
Put -fno-exceptions flag in selectively. Add back HAVE_DECL_MADVISE check so |
938 |
AC_LANG_PUSH(C++) |
939 |
# Test whether madvise() is declared in C++ code -- it is not on some |
|
940 |
# systems, such as Solaris |
|
373.1.3
by Monty Taylor
Fixed test for HAVE_DECL_MADVISE to actually work. |
941 |
AC_CHECK_DECLS([madvise], [], [], [AC_INCLUDES_DEFAULT[ |
942 |
#if HAVE_SYS_MMAN_H |
|
287.3.18
by Monty Taylor
Put -fno-exceptions flag in selectively. Add back HAVE_DECL_MADVISE check so |
943 |
#include <sys/types.h> |
944 |
#include <sys/mman.h> |
|
373.1.3
by Monty Taylor
Fixed test for HAVE_DECL_MADVISE to actually work. |
945 |
#endif |
946 |
]])
|
|
287.3.18
by Monty Taylor
Put -fno-exceptions flag in selectively. Add back HAVE_DECL_MADVISE check so |
947 |
AC_LANG_POP() |
948 |
||
949 |
||
236.1.59
by Monty Taylor
Turn thr_rwlock.c into a conditionally built source file. |
950 |
AM_CONDITIONAL(BUILD_THR_RWLOCK,[test "$ac_cv_func_rwlock_init" -a "$ac_cv_funn_pthread_rwlock_rdlock"]) |
951 |
||
28.1.33
by Monty Taylor
Added -Wall |
952 |
|
1
by brian
clean slate |
953 |
# Sanity check: We chould not have any fseeko symbol unless |
954 |
# large_file_support=yes |
|
955 |
AC_CHECK_FUNC(fseeko, |
|
520.4.41
by mordred
Fixed configure.ac to work cleanly on Solaris - and define some good compile flags. |
956 |
[if test "$large_file_support" = no -a "x$TARGET_LINUX" = "xtrue"; |
1
by brian
clean slate |
957 |
then
|
958 |
AC_MSG_ERROR("Found fseeko symbol but large_file_support is not enabled!") |
|
959 |
fi] |
|
960 |
)
|
|
961 |
||
962 |
# Check definition of pthread_getspecific |
|
236.1.39
by Monty Taylor
autoconf warning cleanups. |
963 |
AC_CACHE_CHECK([args to pthread_getspecific], [mysql_cv_getspecific_args], |
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
964 |
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
965 |
#if !defined(_REENTRANT) |
|
1
by brian
clean slate |
966 |
#define _REENTRANT |
967 |
#endif |
|
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
968 |
#ifndef _POSIX_PTHREAD_SEMANTICS |
1
by brian
clean slate |
969 |
#define _POSIX_PTHREAD_SEMANTICS |
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
970 |
#endif |
942.1.5
by Monty Taylor
Replace AC_TRY_* with AC_*_IFELSE |
971 |
#include <pthread.h> |
972 |
]], [[ |
|
973 |
void *pthread_getspecific(pthread_key_t key); |
|
974 |
pthread_getspecific((pthread_key_t) NULL); |
|
975 |
]])],
|
|
236.1.39
by Monty Taylor
autoconf warning cleanups. |
976 |
[mysql_cv_getspecific_args=POSIX], |
977 |
[mysql_cv_getspecific_args=other])]) |
|
1
by brian
clean slate |
978 |
if test "$mysql_cv_getspecific_args" = "other" |
979 |
then
|
|
980 |
AC_DEFINE([HAVE_NONPOSIX_PTHREAD_GETSPECIFIC], [1], |
|
981 |
[For some non posix threads]) |
|
982 |
fi
|
|
983 |
||
984 |
# Check definition of pthread_mutex_init |
|
236.1.39
by Monty Taylor
autoconf warning cleanups. |
985 |
AC_CACHE_CHECK([args to pthread_mutex_init], [mysql_cv_mutex_init_args], |
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
986 |
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
987 |
#ifndef _REENTRANT |
|
988 |
#define _REENTRANT |
|
989 |
#endif |
|
990 |
#ifndef _POSIX_PTHREAD_SEMANTICS |
|
1
by brian
clean slate |
991 |
#define _POSIX_PTHREAD_SEMANTICS |
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
992 |
#endif |
28.1.33
by Monty Taylor
Added -Wall |
993 |
#include <pthread.h> ]], [[ |
1
by brian
clean slate |
994 |
pthread_mutexattr_t attr; |
995 |
pthread_mutex_t mp; |
|
236.1.39
by Monty Taylor
autoconf warning cleanups. |
996 |
pthread_mutex_init(&mp,&attr); ]])], |
997 |
[mysql_cv_mutex_init_args=POSIX], |
|
998 |
[mysql_cv_mutex_init_args=other])]) |
|
1
by brian
clean slate |
999 |
if test "$mysql_cv_mutex_init_args" = "other" |
1000 |
then
|
|
1001 |
AC_DEFINE([HAVE_NONPOSIX_PTHREAD_MUTEX_INIT], [1], |
|
1002 |
[For some non posix threads]) |
|
1003 |
fi
|
|
1004 |
#---END: |
|
1005 |
||
1006 |
#---START: Used in for client configure |
|
1007 |
# Check definition of readdir_r |
|
236.1.39
by Monty Taylor
autoconf warning cleanups. |
1008 |
AC_CACHE_CHECK([args to readdir_r], [mysql_cv_readdir_r], |
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
1009 |
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
1010 |
#ifndef _REENTRANT |
|
1011 |
#define _REENTRANT |
|
1012 |
#endif |
|
1013 |
#ifndef _POSIX_PTHREAD_SEMANTICS |
|
1
by brian
clean slate |
1014 |
#define _POSIX_PTHREAD_SEMANTICS |
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
1015 |
#endif |
1
by brian
clean slate |
1016 |
#include <pthread.h> |
28.1.33
by Monty Taylor
Added -Wall |
1017 |
#include <dirent.h>]], [[ int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result); |
236.1.39
by Monty Taylor
autoconf warning cleanups. |
1018 |
readdir_r((DIR *) NULL, (struct dirent *) NULL, (struct dirent **) NULL); ]])], |
1019 |
[mysql_cv_readdir_r=POSIX], |
|
1020 |
[mysql_cv_readdir_r=other])]) |
|
1
by brian
clean slate |
1021 |
if test "$mysql_cv_readdir_r" = "POSIX" |
1022 |
then
|
|
1023 |
AC_DEFINE([HAVE_READDIR_R], [1], [POSIX readdir_r]) |
|
1024 |
fi
|
|
1025 |
||
1026 |
# Check definition of posix sigwait() |
|
236.1.39
by Monty Taylor
autoconf warning cleanups. |
1027 |
AC_CACHE_CHECK([style of sigwait], [mysql_cv_sigwait], |
1028 |
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
|
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
1029 |
#ifndef _REENTRANT |
236.1.39
by Monty Taylor
autoconf warning cleanups. |
1030 |
#define _REENTRANT |
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
1031 |
#endif |
1032 |
#ifndef _POSIX_PTHREAD_SEMANTICS |
|
1
by brian
clean slate |
1033 |
#define _POSIX_PTHREAD_SEMANTICS |
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
1034 |
#endif |
1
by brian
clean slate |
1035 |
#include <pthread.h> |
236.1.39
by Monty Taylor
autoconf warning cleanups. |
1036 |
#include <signal.h> |
1037 |
]], [[ |
|
1038 |
#ifndef _AIX |
|
1
by brian
clean slate |
1039 |
sigset_t set; |
1040 |
int sig; |
|
1041 |
sigwait(&set,&sig); |
|
236.1.39
by Monty Taylor
autoconf warning cleanups. |
1042 |
#endif |
1043 |
]])],
|
|
1044 |
[mysql_cv_sigwait=POSIX], |
|
1045 |
[mysql_cv_sigwait=other])]) |
|
1
by brian
clean slate |
1046 |
if test "$mysql_cv_sigwait" = "POSIX" |
1047 |
then
|
|
1048 |
AC_DEFINE([HAVE_SIGWAIT], [1], [POSIX sigwait]) |
|
1049 |
fi
|
|
1050 |
||
1051 |
if test "$mysql_cv_sigwait" != "POSIX" |
|
1052 |
then
|
|
1053 |
unset mysql_cv_sigwait |
|
1054 |
# Check definition of posix sigwait() |
|
236.1.39
by Monty Taylor
autoconf warning cleanups. |
1055 |
AC_CACHE_CHECK([style of sigwait], [mysql_cv_sigwait], |
1056 |
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
|
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
1057 |
#ifndef _REENTRANT |
236.1.39
by Monty Taylor
autoconf warning cleanups. |
1058 |
#define _REENTRANT |
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
1059 |
#endif |
1060 |
#ifndef _POSIX_PTHREAD_SEMANTICS |
|
1
by brian
clean slate |
1061 |
#define _POSIX_PTHREAD_SEMANTICS |
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
1062 |
#endif |
1
by brian
clean slate |
1063 |
#include <pthread.h> |
236.1.39
by Monty Taylor
autoconf warning cleanups. |
1064 |
#include <signal.h> |
1065 |
]], [[ |
|
1066 |
sigset_t set; |
|
1
by brian
clean slate |
1067 |
int sig; |
236.1.39
by Monty Taylor
autoconf warning cleanups. |
1068 |
sigwait(&set); |
1069 |
]])],
|
|
1070 |
[mysql_cv_sigwait=NONPOSIX], |
|
1071 |
[mysql_cv_sigwait=other])]) |
|
1
by brian
clean slate |
1072 |
if test "$mysql_cv_sigwait" = "NONPOSIX" |
1073 |
then
|
|
1074 |
AC_DEFINE([HAVE_NONPOSIX_SIGWAIT], [1], [sigwait with one argument]) |
|
1075 |
fi
|
|
1076 |
fi
|
|
1077 |
#---END: |
|
1078 |
||
1079 |
# Check if pthread_attr_setscope() exists |
|
236.1.39
by Monty Taylor
autoconf warning cleanups. |
1080 |
AC_CACHE_CHECK([for pthread_attr_setscope], [mysql_cv_pthread_attr_setscope], |
1081 |
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
|
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
1082 |
#ifndef _REENTRANT |
236.1.39
by Monty Taylor
autoconf warning cleanups. |
1083 |
#define _REENTRANT |
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
1084 |
#endif |
1085 |
#ifndef _POSIX_PTHREAD_SEMANTICS |
|
1
by brian
clean slate |
1086 |
#define _POSIX_PTHREAD_SEMANTICS |
632.1.11
by Monty Taylor
Fixed Sun Studio warnings in mysys. |
1087 |
#endif |
236.1.39
by Monty Taylor
autoconf warning cleanups. |
1088 |
#include <pthread.h> |
1089 |
]], [[ |
|
1090 |
pthread_attr_t thr_attr; |
|
1091 |
pthread_attr_setscope(&thr_attr,0); |
|
1092 |
]])],
|
|
1093 |
[mysql_cv_pthread_attr_setscope=yes], |
|
1094 |
[mysql_cv_pthread_attr_setscope=no])]) |
|
1
by brian
clean slate |
1095 |
if test "$mysql_cv_pthread_attr_setscope" = "yes" |
1096 |
then
|
|
1097 |
AC_DEFINE([HAVE_PTHREAD_ATTR_SETSCOPE], [1], [pthread_attr_setscope]) |
|
1098 |
fi
|
|
1099 |
||
28.1.33
by Monty Taylor
Added -Wall |
1100 |
AC_LANG_PUSH([C++]) |
1
by brian
clean slate |
1101 |
AC_CHECK_HEADERS(cxxabi.h) |
1102 |
AC_CACHE_CHECK([checking for abi::__cxa_demangle], mysql_cv_cxa_demangle, |
|
28.1.33
by Monty Taylor
Added -Wall |
1103 |
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <cxxabi.h>]], [[ |
1
by brian
clean slate |
1104 |
char *foo= 0; int bar= 0; |
1105 |
foo= abi::__cxa_demangle(foo, foo, 0, &bar); |
|
28.1.33
by Monty Taylor
Added -Wall |
1106 |
]])],[mysql_cv_cxa_demangle=yes],[mysql_cv_cxa_demangle=no])]) |
1107 |
AC_LANG_POP([]) |
|
1
by brian
clean slate |
1108 |
|
1109 |
if test "x$mysql_cv_cxa_demangle" = xyes; then |
|
1110 |
AC_DEFINE(HAVE_ABI_CXA_DEMANGLE, 1, |
|
1111 |
[Define to 1 if you have the `abi::__cxa_demangle' function.]) |
|
1112 |
fi
|
|
1113 |
||
1114 |
#--------------------------------------------------------------------
|
|
1115 |
# Check for requested features
|
|
1116 |
#--------------------------------------------------------------------
|
|
1117 |
||
319.1.1
by Grant Limberg
renamed all instances of MYSQL_ to DRIZZLE_ |
1118 |
DRIZZLE_CHECK_MAX_INDEXES
|
1
by brian
clean slate |
1119 |
|
1120 |
#--------------------------------------------------------------------
|
|
1121 |
# Declare our plugin modules
|
|
1122 |
# Has to be done late, as the plugin may need to check for existence of
|
|
1123 |
# functions tested above
|
|
1124 |
#--------------------------------------------------------------------
|
|
1125 |
||
992.1.21
by Monty Taylor
First pass at replacing plugin.m4. |
1126 |
m4_include(config/plugin.ac)
|
1127 |
dnl Add code here to read set plugin lists and set drizzled_default_plugin_list
|
|
1128 |
AC_DEFINE_UNQUOTED([DRIZZLED_PLUGIN_LIST],[$drizzled_default_plugin_list],
|
|
1129 |
[List of plugins that should be loaded on startup if no
|
|
1130 |
value is given for --plugin-load])
|
|
1
by brian
clean slate |
1131 |
|
992.1.22
by Monty Taylor
Moved towards having register_plugins.py make builtin plugins, so we can have a first step. |
1132 |
drizzled_builtin_list=`echo $drizzled_builtin_list | sed 's/, *$//'` |
1133 |
AC_DEFINE_UNQUOTED([DRIZZLED_BUILTIN_LIST],[$drizzled_builtin_list],
|
|
1134 |
[List of plugins to be loaded in sql_builtin.cc])
|
|
997.2.19
by Monty Taylor
Reverted back to building drizzled in drizzled. |
1135 |
AC_SUBST(drizzled_plugin_libs)
|
1136 |
||
1137 |
AC_SUBST(mysql_plugin_dirs)
|
|
1138 |
AC_SUBST(mysql_plugin_libs)
|
|
1139 |
drizzled_plugin_defs=`echo $drizzled_plugin_defs | sed 's/, *$//'` |
|
1140 |
AC_SUBST(drizzled_plugin_defs)
|
|
1141 |
AC_SUBST(DRIZZLED_PLUGIN_DEP_LIBS)
|
|
992.1.22
by Monty Taylor
Moved towards having register_plugins.py make builtin plugins, so we can have a first step. |
1142 |
|
435.1.1
by Monty Taylor
Fixed -O3 optimization for gcc. |
1143 |
|
189
by Brian Aker
Refactor of configure.ac. Added profile. One note... I believe this should |
1144 |
AC_ARG_ENABLE([profiling],
|
1145 |
[AS_HELP_STRING([--enable-profiling],
|
|
1146 |
[Toggle profiling @<:@default=off@:>@])],
|
|
1147 |
[ac_profiling="$enableval"],
|
|
1148 |
[ac_profiling="no"])
|
|
1149 |
||
1150 |
AC_ARG_ENABLE([coverage],
|
|
1151 |
[AS_HELP_STRING([--enable-coverage],
|
|
1152 |
[Toggle coverage @<:@default=off@:>@])],
|
|
1153 |
[ac_coverage="$enableval"],
|
|
1154 |
[ac_coverage="no"])
|
|
1155 |
||
53.2.1
by Monty Taylor
Added --disable-pedantic-warnings and --enable-fail. |
1156 |
AC_ARG_ENABLE([pedantic-warnings],
|
1157 |
[AS_HELP_STRING([--disable-pedantic-warnings],
|
|
1158 |
[Toggle pedanticness @<:@default=on@:>@])],
|
|
1159 |
[ac_warn_pedantic="$enableval"],
|
|
1160 |
[ac_warn_pedantic="yes"])
|
|
1161 |
||
1162 |
AC_ARG_ENABLE([fail],
|
|
77.1.112
by Monty Taylor
Fixed comment on --enable-fail -> --disable-fail. |
1163 |
[AS_HELP_STRING([--disable-fail],
|
1164 |
[Turn warnings into failures @<:@default=on@:>@])],
|
|
53.2.1
by Monty Taylor
Added --disable-pedantic-warnings and --enable-fail. |
1165 |
[ac_warn_fail="$enableval"],
|
77.1.108
by Monty Taylor
Turn on -Werror again by default. |
1166 |
[ac_warn_fail="yes"])
|
53.2.1
by Monty Taylor
Added --disable-pedantic-warnings and --enable-fail. |
1167 |
|
53.2.6
by Monty Taylor
Turned unreachable code warnings into a configure option. |
1168 |
AC_ARG_ENABLE([unreachable],
|
1169 |
[AS_HELP_STRING([--enable-unreachable],
|
|
1170 |
[Enable warnings about unreachable code @<:@default=off@:>@])],
|
|
1171 |
[ac_warn_unreachable="$enableval"],
|
|
1172 |
[ac_warn_unreachable="no"])
|
|
1173 |
||
77.1.109
by Monty Taylor
Made --disable-pedantic-warnings only disable the pedantic warnings, rather than also removing the -std=gnu99 part. |
1174 |
AC_ARG_ENABLE([longlong-warnings],
|
1175 |
[AS_HELP_STRING([--enable-longlong-warnings],
|
|
1176 |
[Enable warnings about longlong in C++ @<:@default=off@:>@])],
|
|
1177 |
[ac_warn_longlong="$enableval"],
|
|
421
by Monty
Made including stdint.h work. |
1178 |
[ac_warn_longlong="no"])
|
77.1.109
by Monty Taylor
Made --disable-pedantic-warnings only disable the pedantic warnings, rather than also removing the -std=gnu99 part. |
1179 |
|
1180 |
AC_ARG_ENABLE([strict-aliasing],
|
|
934.3.5
by Monty Taylor
Addd -Wshadow to PROTOSKIP warnings and turned -Wstrict-aliasing off. Jumped the gun... |
1181 |
[AS_HELP_STRING([--enable-strict-aliasing],
|
1182 |
[Enable warnings about stict-aliasing @<:@default=off@:>@])],
|
|
77.1.109
by Monty Taylor
Made --disable-pedantic-warnings only disable the pedantic warnings, rather than also removing the -std=gnu99 part. |
1183 |
[ac_warn_strict_aliasing="$enableval"],
|
934.3.5
by Monty Taylor
Addd -Wshadow to PROTOSKIP warnings and turned -Wstrict-aliasing off. Jumped the gun... |
1184 |
[ac_warn_strict_aliasing="no"])
|
77.1.109
by Monty Taylor
Made --disable-pedantic-warnings only disable the pedantic warnings, rather than also removing the -std=gnu99 part. |
1185 |
|
509.2.1
by Monty Taylor
Added some more warning options to configure. |
1186 |
AC_ARG_ENABLE([cast-warnings],
|
1187 |
[AS_HELP_STRING([--enable-cast-warnings],
|
|
1188 |
[Enable warnings about use of old C-style casts @<:@default=off@:>@])],
|
|
1189 |
[ac_warn_cast="$enableval"],
|
|
1190 |
[ac_warn_cast="no"])
|
|
1191 |
||
1192 |
AC_ARG_ENABLE([effective-style],
|
|
1193 |
[AS_HELP_STRING([--enable-effective-style],
|
|
1194 |
[Enable warnings violating Effective C++ Style Guidelines @<:@default=off@:>@])],
|
|
1195 |
[ac_warn_effc="$enableval"],
|
|
1196 |
[ac_warn_effc="no"])
|
|
1197 |
||
779.3.10
by Monty Taylor
Turned on -Wshadow. |
1198 |
AC_ARG_ENABLE([shadow],
|
1199 |
[AS_HELP_STRING([--disable-shadow],
|
|
1200 |
[Disables warnings about scope shadowing @<:@default=on@:>@])],
|
|
1201 |
[ac_warn_shadow="$enableval"],
|
|
1202 |
[ac_warn_shadow="yes"])
|
|
1203 |
||
892.1.7
by Monty Taylor
Added two more C++ warnings. We pass them now. Oh, look. We had an empty class. |
1204 |
AC_ARG_ENABLE([conversion],
|
1205 |
[AS_HELP_STRING([--enable-conversion],
|
|
1206 |
[Enables conversion warnings @<:@default=off@:>@])],
|
|
1207 |
[ac_warn_conversion="$enableval"],
|
|
1208 |
[ac_warn_conversion="no"])
|
|
509.2.2
by Monty Taylor
Added one more set of possible warnings. |
1209 |
|
713.1.8
by Monty Taylor
Moved a little code... |
1210 |
AC_ARG_ENABLE([datarace],
|
1211 |
[AS_HELP_STRING([--enable-datarace],
|
|
1212 |
[Enables Sun Studio data race detection @<:@default=off@:>@])],
|
|
1213 |
[ac_datarace="$enableval"],
|
|
1214 |
[ac_datarace="no"])
|
|
53.2.2
by Monty Taylor
Updated everything that needs updating to compile with -std=gnu99 -pedantic |
1215 |
|
779.1.16
by Monty Taylor
Turned on exceptions, but made it configurable. |
1216 |
AC_ARG_ENABLE([exceptions],
|
1217 |
[AS_HELP_STRING([--disable-exceptions],
|
|
1218 |
[Disables use of Exceptions in the build @<:@default=on@:>@])],
|
|
1219 |
[ac_exceptions="$enableval"],
|
|
873.2.42
by Monty Taylor
Ooops. This was a bad idea. |
1220 |
[ac_exceptions="yes"])
|
713.1.7
by Monty Taylor
Added support for thread data tracing to the build for Sun Studio. |
1221 |
|
937.2.5
by Stewart Smith
add ./configure option to enable -Wcast-align (if specified) that may be useful in trapping potential alignment problems for SPARC. |
1222 |
AC_ARG_ENABLE([cast-align-warnings],
|
1223 |
[AS_HELP_STRING([--enable-cast-align-warnings],
|
|
1224 |
[Toggle cast alignment warnings @<:@default=off@:>@])],
|
|
1225 |
[ac_warn_cast_align="$enableval"],
|
|
1226 |
[ac_warn_cast_align="no"])
|
|
1227 |
||
53.2.1
by Monty Taylor
Added --disable-pedantic-warnings and --enable-fail. |
1228 |
if test "$GCC" = "yes"
|
1229 |
then
|
|
937.2.5
by Stewart Smith
add ./configure option to enable -Wcast-align (if specified) that may be useful in trapping potential alignment problems for SPARC. |
1230 |
if test "$ac_warn_cast_align" = "yes"
|
1231 |
then
|
|
1232 |
W_CAST_ALIGN="-Wcast-align"
|
|
1233 |
else
|
|
1234 |
W_CAST_ALIGN="-Wno-cast-align"
|
|
1235 |
fi
|
|
53.2.2
by Monty Taylor
Updated everything that needs updating to compile with -std=gnu99 -pedantic |
1236 |
|
558
by Monty Taylor
Added autoconf test to turn off -Wredundant-decls if it doesn't work right. |
1237 |
if test "$ac_warn_fail" = "yes"
|
1238 |
then
|
|
1239 |
W_FAIL="-Werror"
|
|
1240 |
fi
|
|
937.2.5
by Stewart Smith
add ./configure option to enable -Wcast-align (if specified) that may be useful in trapping potential alignment problems for SPARC. |
1241 |
BASE_WARNINGS="-Wall -Wextra ${W_FAIL} ${W_CAST_ALIGN}"
|
558
by Monty Taylor
Added autoconf test to turn off -Wredundant-decls if it doesn't work right. |
1242 |
|
77.1.109
by Monty Taylor
Made --disable-pedantic-warnings only disable the pedantic warnings, rather than also removing the -std=gnu99 part. |
1243 |
if test "$ac_warn_longlong" = "yes"
|
1244 |
then
|
|
1245 |
W_LONGLONG="-Wlong-long"
|
|
1246 |
else
|
|
1247 |
W_LONGLONG="-Wno-long-long"
|
|
1248 |
fi
|
|
53.2.1
by Monty Taylor
Added --disable-pedantic-warnings and --enable-fail. |
1249 |
|
77.1.109
by Monty Taylor
Made --disable-pedantic-warnings only disable the pedantic warnings, rather than also removing the -std=gnu99 part. |
1250 |
if test "$ac_warn_strict_aliasing" = "yes"
|
1251 |
then
|
|
1252 |
W_STRICT_ALIASING="-Wstrict-aliasing"
|
|
1253 |
else
|
|
509.2.3
by Monty Taylor
Re-worked strict-aliasing again. |
1254 |
W_STRICT_ALIASING="-Wno-strict-aliasing"
|
77.1.109
by Monty Taylor
Made --disable-pedantic-warnings only disable the pedantic warnings, rather than also removing the -std=gnu99 part. |
1255 |
fi
|
53.2.1
by Monty Taylor
Added --disable-pedantic-warnings and --enable-fail. |
1256 |
|
779.3.10
by Monty Taylor
Turned on -Wshadow. |
1257 |
if test "$ac_warn_shadow" = "yes"
|
1258 |
then
|
|
1259 |
W_SHADOW="-Wshadow"
|
|
1260 |
NO_SHADOW="-Wno-shadow"
|
|
1261 |
else
|
|
1262 |
W_SHADOW="-Wno-shadow"
|
|
1263 |
NO_SHADOW=""
|
|
1264 |
fi
|
|
1265 |
||
189
by Brian Aker
Refactor of configure.ac. Added profile. One note... I believe this should |
1266 |
if test "$ac_profiling" = "yes"
|
1267 |
then
|
|
1268 |
GPROF_PROFILING="-pg"
|
|
873.2.37
by Monty Taylor
Added support for profiling version of libc. |
1269 |
save_LIBS="${LIBS}"
|
1270 |
LIBS=""
|
|
1271 |
AC_CHECK_LIB(c_p, read)
|
|
1272 |
LIBC_P="${LIBS}"
|
|
1273 |
LIBS="${save_LIBS}"
|
|
189
by Brian Aker
Refactor of configure.ac. Added profile. One note... I believe this should |
1274 |
else
|
1275 |
GPROF_PROFILING=" "
|
|
1276 |
fi
|
|
1277 |
||
1278 |
if test "$ac_coverage" = "yes"
|
|
1279 |
then
|
|
1280 |
GPROF_COVERAGE="-fprofile-arcs -ftest-coverage"
|
|
1281 |
else
|
|
1282 |
GPROF_COVERAGE=" "
|
|
1283 |
fi
|
|
1284 |
||
53.2.1
by Monty Taylor
Added --disable-pedantic-warnings and --enable-fail. |
1285 |
if test "$ac_warn_pedantic" = "yes"
|
1286 |
then
|
|
520.4.36
by Monty Taylor
Added autoconf check for usability of __attribute__((visibility("hidden"))). |
1287 |
AC_CACHE_CHECK([whether it is safe to use -Wredundant-decls],
|
1288 |
[ac_cv_safe_to_use_Wredundant_decls_],
|
|
1289 |
[AC_LANG_PUSH(C++)
|
|
919.2.18
by Monty Taylor
Restructured CFLAGS processing to always keep user-supplied options last on the command line, so they take precedence. |
1290 |
save_CXXFLAGS="${CXXFLAGS}"
|
1291 |
CXXFLAGS="${CXXFLAGS} ${W_FAIL} -Wredundant-decls"
|
|
520.4.36
by Monty Taylor
Added autoconf check for usability of __attribute__((visibility("hidden"))). |
1292 |
AC_COMPILE_IFELSE(
|
1293 |
[AC_LANG_PROGRAM([
|
|
558
by Monty Taylor
Added autoconf test to turn off -Wredundant-decls if it doesn't work right. |
1294 |
template <typename E> struct C { void foo(); };
|
1295 |
template <typename E> void C<E>::foo() { }
|
|
1296 |
template <> void C<int>::foo();
|
|
520.4.36
by Monty Taylor
Added autoconf check for usability of __attribute__((visibility("hidden"))). |
1297 |
AC_INCLUDES_DEFAULT])],
|
1298 |
[ac_cv_safe_to_use_Wredundant_decls_=yes],
|
|
1299 |
[ac_cv_safe_to_use_Wredundant_decls_=no])
|
|
919.2.18
by Monty Taylor
Restructured CFLAGS processing to always keep user-supplied options last on the command line, so they take precedence. |
1300 |
CXXFLAGS="${save_CXXFLAGS}"
|
520.4.36
by Monty Taylor
Added autoconf check for usability of __attribute__((visibility("hidden"))). |
1301 |
AC_LANG_POP()])
|
559.1.1
by Kristian Nielsen
Fix a few problems with the -Wredundant-decls configure check. |
1302 |
if test $ac_cv_safe_to_use_Wredundant_decls_ = yes
|
558
by Monty Taylor
Added autoconf test to turn off -Wredundant-decls if it doesn't work right. |
1303 |
then
|
559.1.1
by Kristian Nielsen
Fix a few problems with the -Wredundant-decls configure check. |
1304 |
GXX_W_REDUNDANT_DECLS="-Wredundant-decls"
|
558
by Monty Taylor
Added autoconf test to turn off -Wredundant-decls if it doesn't work right. |
1305 |
else
|
559.1.1
by Kristian Nielsen
Fix a few problems with the -Wredundant-decls configure check. |
1306 |
GXX_W_REDUNDANT_DECLS="-Wno-redundant-decls"
|
558
by Monty Taylor
Added autoconf test to turn off -Wredundant-decls if it doesn't work right. |
1307 |
fi
|
520.4.36
by Monty Taylor
Added autoconf check for usability of __attribute__((visibility("hidden"))). |
1308 |
|
559.1.1
by Kristian Nielsen
Fix a few problems with the -Wredundant-decls configure check. |
1309 |
GCC_PEDANTIC="-pedantic -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls ${W_STRICT_ALIASING}"
|
892.1.7
by Monty Taylor
Added two more C++ warnings. We pass them now. Oh, look. We had an empty class. |
1310 |
GXX_PEDANTIC="-pedantic -Wundef -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy ${GXX_W_REDUNDANT_DECLS} ${W_LONGLONG} ${W_STRICT_ALIASING}"
|
53.2.1
by Monty Taylor
Added --disable-pedantic-warnings and --enable-fail. |
1311 |
fi
|
1312 |
||
53.2.6
by Monty Taylor
Turned unreachable code warnings into a configure option. |
1313 |
if test "$ac_warn_unreachable" = "yes"
|
1314 |
then
|
|
77.1.109
by Monty Taylor
Made --disable-pedantic-warnings only disable the pedantic warnings, rather than also removing the -std=gnu99 part. |
1315 |
W_UNREACHABLE="-Wunreachable-code"
|
53.2.6
by Monty Taylor
Turned unreachable code warnings into a configure option. |
1316 |
fi
|
892.1.6
by Monty Taylor
Added overloaded-virtual to the list of standard warnings. We are now clean with |
1317 |
|
509.2.1
by Monty Taylor
Added some more warning options to configure. |
1318 |
if test "$ac_warn_cast" = "yes"
|
1319 |
then
|
|
1320 |
W_CAST="-Wold-style-cast"
|
|
1321 |
fi
|
|
1322 |
||
1323 |
if test "$ac_warn_effc" = "yes"
|
|
1324 |
then
|
|
1325 |
W_EFFC="-Weffc++"
|
|
1326 |
fi
|
|
1327 |
||
892.1.7
by Monty Taylor
Added two more C++ warnings. We pass them now. Oh, look. We had an empty class. |
1328 |
if test "$ac_warn_conversion" = "yes"
|
509.2.2
by Monty Taylor
Added one more set of possible warnings. |
1329 |
then
|
892.1.7
by Monty Taylor
Added two more C++ warnings. We pass them now. Oh, look. We had an empty class. |
1330 |
W_CONVERSION="-Wconversion"
|
509.2.2
by Monty Taylor
Added one more set of possible warnings. |
1331 |
fi
|
1332 |
||
919.2.18
by Monty Taylor
Restructured CFLAGS processing to always keep user-supplied options last on the command line, so they take precedence. |
1333 |
CC_WARNINGS="${BASE_WARNINGS} ${GCC_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_SHADOW} ${W_CONVERSION}"
|
892.1.7
by Monty Taylor
Added two more C++ warnings. We pass them now. Oh, look. We had an empty class. |
1334 |
CXX_WARNINGS="${BASE_WARNINGS} ${GXX_PEDANTIC} ${W_UNREACHABLE} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${W_CAST} ${W_SHADOW} ${W_EFFC} ${W_CONVERSION}"
|
77.1.109
by Monty Taylor
Made --disable-pedantic-warnings only disable the pedantic warnings, rather than also removing the -std=gnu99 part. |
1335 |
|
779.1.16
by Monty Taylor
Turned on exceptions, but made it configurable. |
1336 |
if test "$ac_exceptions" = "no"
|
1337 |
then
|
|
1338 |
NO_EXCEPTIONS="-fno-exceptions"
|
|
1339 |
W_EXCEPTIONS="-fexceptions"
|
|
1340 |
fi
|
|
520.4.44
by mordred
A whole bunch of solaris/sun studio compile fixes. |
1341 |
NO_REDUNDANT_DECLS="-Wno-redundant-decls"
|
960.2.19
by Monty Taylor
Fixed PROTOSKIP_WARNINGS. (thanks eday) |
1342 |
PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow"
|
53.2.1
by Monty Taylor
Added --disable-pedantic-warnings and --enable-fail. |
1343 |
fi
|
520.4.37
by Monty Taylor
Added some Sun compile flags. |
1344 |
if test "$SUNCC" = "yes"
|
1345 |
then
|
|
713.1.7
by Monty Taylor
Added support for thread data tracing to the build for Sun Studio. |
1346 |
if test "$ac_datarace" = "yes"
|
1347 |
then
|
|
919.2.18
by Monty Taylor
Restructured CFLAGS processing to always keep user-supplied options last on the command line, so they take precedence. |
1348 |
CFLAGS="-xinstrument=datarace ${CFLAGS}"
|
1349 |
CXXFLAGS="-xinstrument=datarace ${CXXFLAGS}"
|
|
713.1.7
by Monty Taylor
Added support for thread data tracing to the build for Sun Studio. |
1350 |
fi
|
898.1.1
by Monty Taylor
Fix to make --disable-fail function on Solaris. |
1351 |
|
1352 |
if test "$ac_warn_fail" = "yes"
|
|
1353 |
then
|
|
1354 |
W_FAIL="-errwarn=%all"
|
|
1355 |
fi
|
|
1356 |
||
907.3.2
by Monty Taylor
Added tests for 64-bit solaris. Look in /usr/lib/amd64 and /usr/local/lib/amd64 if we are 64-bit. |
1357 |
CC_WARNINGS="-v -errtags=yes -erroff=E_ATTRIBUTE_NOT_VAR ${W_FAIL}"
|
971.1.33
by Monty Taylor
Added a needed warning skip for Solaris. |
1358 |
CXX_WARNINGS="+w +w2 -xport64 -errtags=yes -erroff=attrskipunsup,doubunder,reftotemp,inllargeuse,truncwarn1,signextwarn,inllargeint ${W_FAIL}"
|
919.2.7
by Monty Taylor
Added back PROTOSKIP_WARNINGS - we still need it on Solaris. But it's empty now for GCC. |
1359 |
PROTOSKIP_WARNINGS="-erroff=attrskipunsup,doubunder,reftotemp,wbadinitl,identexpected,inllargeuse,truncwarn1,signextwarn"
|
779.3.18
by Monty Taylor
Cleaned up warnings up through innodb. |
1360 |
NO_UNREACHED="-erroff=E_STATEMENT_NOT_REACHED"
|
779.1.16
by Monty Taylor
Turned on exceptions, but made it configurable. |
1361 |
if test "$ac_exceptions" = "no"
|
1362 |
then
|
|
1363 |
NO_EXCEPTIONS="-features=no%except"
|
|
1364 |
W_EXCEPTIONS="-features=except"
|
|
1365 |
fi
|
|
520.4.37
by Monty Taylor
Added some Sun compile flags. |
1366 |
fi
|
520.4.44
by mordred
A whole bunch of solaris/sun studio compile fixes. |
1367 |
AC_SUBST(NO_EXCEPTIONS)
|
1368 |
AC_SUBST(W_EXCEPTIONS)
|
|
779.3.10
by Monty Taylor
Turned on -Wshadow. |
1369 |
AC_SUBST(NO_SHADOW)
|
1370 |
AC_SUBST(W_SHADOW)
|
|
520.4.44
by mordred
A whole bunch of solaris/sun studio compile fixes. |
1371 |
AC_SUBST(NO_REDUNDANT_DECLS)
|
919.2.7
by Monty Taylor
Added back PROTOSKIP_WARNINGS - we still need it on Solaris. But it's empty now for GCC. |
1372 |
AC_SUBST(PROTOSKIP_WARNINGS)
|
779.3.18
by Monty Taylor
Cleaned up warnings up through innodb. |
1373 |
AC_SUBST(NO_UNREACHED)
|
53.2.1
by Monty Taylor
Added --disable-pedantic-warnings and --enable-fail. |
1374 |
|
994.2.7
by Monty Taylor
Fix for osx distcheck problem. |
1375 |
if test "x${gl_LIBOBJS}" != "x"
|
815.1.2
by Monty Taylor
Added -Ignulib to the includes if it's needed. |
1376 |
then
|
971.4.1
by Monty Taylor
GCC on Solaris build fixes. |
1377 |
if test "$GCC" = "yes"
|
1378 |
then
|
|
1379 |
CPPFLAGS="-isystem \$(top_srcdir)/gnulib -isystem \$(top_builddir)/gnulib ${CPPFLAGS}"
|
|
1380 |
else
|
|
1381 |
CPPFLAGS="-I\$(top_srcdir)/gnulib -I\$(top_builddir)/gnulib ${CPPFLAGS}"
|
|
1382 |
fi
|
|
815.1.2
by Monty Taylor
Added -Ignulib to the includes if it's needed. |
1383 |
fi
|
992.1.7
by Monty Taylor
Sometimes it helps to actually set -Werror before the check you've marked as needing to happen after -Werror. |
1384 |
|
908.1.12
by Monty Taylor
mmm. |
1385 |
CPPFLAGS="-I\$(top_srcdir) -I\$(top_builddir) ${CPPFLAGS}"
|
992.1.7
by Monty Taylor
Sometimes it helps to actually set -Werror before the check you've marked as needing to happen after -Werror. |
1386 |
CFLAGS="${CC_WARNINGS} ${CFLAGS}"
|
1387 |
CXXFLAGS="${CXX_WARNINGS} ${W_EXCEPTIONS} ${CXXFLAGS}"
|
|
907.3.3
by Monty Taylor
A whole crapload of build fixes. OpenSolaris AMD64 builds with -m64 now by default... still isn't warning clean yet though. Also cleaned up the AM_*FLAGS situation. |
1388 |
|
992.1.4
by Monty Taylor
Fixed quick configure bug. /* isn't a valid comment in shell script, thanks. |
1389 |
dnl Must be done once we turn on warnings and such
|
971.4.1
by Monty Taylor
GCC on Solaris build fixes. |
1390 |
AC_CACHE_CHECK(
|
1391 |
[whether __attribute__ visibility "hidden" is supported],
|
|
992.1.4
by Monty Taylor
Fixed quick configure bug. /* isn't a valid comment in shell script, thanks. |
1392 |
[ac_cv_can_use_hidden_],[
|
1393 |
AC_LANG_PUSH(C++)
|
|
992.1.7
by Monty Taylor
Sometimes it helps to actually set -Werror before the check you've marked as needing to happen after -Werror. |
1394 |
AC_LINK_IFELSE([
|
992.1.4
by Monty Taylor
Fixed quick configure bug. /* isn't a valid comment in shell script, thanks. |
1395 |
AC_LANG_PROGRAM(
|
1396 |
[[
|
|
971.4.1
by Monty Taylor
GCC on Solaris build fixes. |
1397 |
__attribute__((visibility ("hidden")))
|
992.1.21
by Monty Taylor
First pass at replacing plugin.m4. |
1398 |
void testme() { }
|
992.1.18
by Monty Taylor
Moved client build into root Makefile. |
1399 |
]],[[testme()]]
|
992.1.4
by Monty Taylor
Fixed quick configure bug. /* isn't a valid comment in shell script, thanks. |
1400 |
)],
|
1401 |
[ac_cv_can_use_hidden_=yes],
|
|
1402 |
[ac_cv_can_use_hidden_=no])
|
|
1403 |
AC_LANG_POP()])
|
|
971.4.1
by Monty Taylor
GCC on Solaris build fixes. |
1404 |
if test "$ac_cv_can_use_hidden_" = "yes"
|
1405 |
then
|
|
1406 |
AC_DEFINE(HAVE_ATTR_HIDDEN, 1,
|
|
1407 |
[Define to 1 if you have support for __attribute__((visibility("hidden")))])
|
|
1408 |
fi
|
|
1409 |
||
907.3.3
by Monty Taylor
A whole crapload of build fixes. OpenSolaris AMD64 builds with -m64 now by default... still isn't warning clean yet though. Also cleaned up the AM_*FLAGS situation. |
1410 |
AM_CPPFLAGS="${CPPFLAGS}"
|
992.1.7
by Monty Taylor
Sometimes it helps to actually set -Werror before the check you've marked as needing to happen after -Werror. |
1411 |
AM_CFLAGS="${CFLAGS}"
|
1412 |
AM_CXXFLAGS="${CXXFLAGS}"
|
|
907.3.3
by Monty Taylor
A whole crapload of build fixes. OpenSolaris AMD64 builds with -m64 now by default... still isn't warning clean yet though. Also cleaned up the AM_*FLAGS situation. |
1413 |
|
1414 |
AC_SUBST([AM_CPPFLAGS])
|
|
287.3.26
by Monty Taylor
Put warnings into AM_C*FLAGS so they can be overridden per lib. |
1415 |
AC_SUBST([AM_CFLAGS])
|
1416 |
AC_SUBST([AM_CXXFLAGS])
|
|
202.1.23
by Monty Taylor
Moved the includes we use everywhere to to GLOBAL_CPPFLAGS and added AM_CPPFLAGS to an AC_SUBST, so that we could take out the redundant declaration from most fof the Makefiles. |
1417 |
|
907.3.3
by Monty Taylor
A whole crapload of build fixes. OpenSolaris AMD64 builds with -m64 now by default... still isn't warning clean yet though. Also cleaned up the AM_*FLAGS situation. |
1418 |
dnl We've collected the flags in AM_*FLAGS now, so blank these. |
1419 |
CFLAGS="" |
|
1420 |
CXXFLAGS="" |
|
1421 |
CPPFLAGS="" |
|
1
by brian
clean slate |
1422 |
|
722.1.4
by Monty Taylor
Removed all the setting of DEFS everywhere. Use configmake.h to get the values |
1423 |
AC_SUBST(pkgplugindir,"\$(pkglibdir)/plugin") |
1424 |
||
492.1.7
by Monty Taylor
Moved test() to its own file. |
1425 |
dnl GCC Precompiled Header Support |
584.4.3
by Monty Taylor
Disabled pre-compiled headers for now. |
1426 |
dnl re-enable later |
632.1.25
by Monty Taylor
Removed AM_CONDITIONAL from SEARCH_FOR_LIB. Aligned naming of AM_CONDITIONALS. |
1427 |
dnl AM_CONDITIONAL([BUILD_GCC_PCH],[test "$GCC" = "yes"]) |
1428 |
AM_CONDITIONAL([BUILD_GCC_PCH],[test "no" = "yes"]) |
|
492.1.7
by Monty Taylor
Moved test() to its own file. |
1429 |
|
992.1.17
by Monty Taylor
Moved extra/ into root Makefile.am |
1430 |
AC_CONFIG_FILES(Makefile dnl |
815.1.1
by Monty Taylor
Add timegm which is missing on Solaris. |
1431 |
gnulib/Makefile dnl |
575.2.2
by Monty Taylor
Moved vio stuff into libdrizzle. |
1432 |
po/Makefile.in dnl |
988.1.1
by Jay Pipes
Changes libserialize to libdrizzledmessage per ML discussion. All GPB messages are now in the drizzled::message namespace. |
1433 |
drizzled/message/Makefile dnl |
997.2.19
by Monty Taylor
Reverted back to building drizzled in drizzled. |
1434 |
drizzled/Makefile dnl |
28.1.31
by Monty Taylor
Deleted tons of pointless garbage from scripts. |
1435 |
support-files/Makefile dnl |
77.1.47
by Monty Taylor
Moved test to tests... |
1436 |
tests/Makefile tests/install_test_db dnl |
971.3.14
by Eric Day
Created Protocol plugin interface and changed libdrizzleclient to be a plugin. |
1437 |
drizzled/drizzled_safe dnl |
77.1.38
by Monty Taylor
Renamed more stuff to drizzle. |
1438 |
support-files/drizzle.server support-files/drizzle-log-rotate) |
1
by brian
clean slate |
1439 |
|
512.2.2
by C.J. Adams-Collier
added checks to determine which threading plugins have been enabled on |
1440 |
scheduling_plugins_available=" |
1441 |
pool_of_threads
|
|
1442 |
single_thread
|
|
1443 |
"
|
|
1444 |
||
1445 |
for sched_plugin in $scheduling_plugins_available |
|
1446 |
do
|
|
1447 |
varname="\${with_plugin_${sched_plugin}}" |
|
1448 |
result=`eval "echo $varname"` |
|
1449 |
if test "x$result" = "xyes" |
|
1450 |
then
|
|
1451 |
scheduling_plugins="$sched_plugin $scheduling_plugins" |
|
1452 |
fi
|
|
1453 |
done
|
|
1454 |
||
824.1.1
by Monty Taylor
Added code to automatically build a new list of POTFILES.in, then updated the translations. |
1455 |
AC_CONFIG_COMMANDS([timestamp-h], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) |
1456 |
||
917.1.4
by Monty Taylor
Fixed POTFILES.in generation. |
1457 |
AC_CONFIG_COMMANDS_PRE([ |
971.1.7
by Monty Taylor
Added test for the po dir before trying to update POTFILES. |
1458 |
if test "x$EGREP" != "x" -a -d po |
824.1.1
by Monty Taylor
Added code to automatically build a new list of POTFILES.in, then updated the translations. |
1459 |
then
|
1460 |
echo "# This file is auto-generated from configure. Do not edit directly" > po/POTFILES.in.in |
|
779.3.51
by Monty Taylor
Some cleanup. Don't add things from distcheck leftovers to POTFILES |
1461 |
# The grep -v 'drizzle-' is to exclude any distcheck leftovers |
1462 |
for f in `find . | grep -v 'drizzle-' | ${EGREP} '\.(cc|c|h|yy)$' | cut -c3- | sort` |
|
824.1.1
by Monty Taylor
Added code to automatically build a new list of POTFILES.in, then updated the translations. |
1463 |
do
|
1464 |
if grep gettext.h "$f" | grep include >/dev/null 2>&1 |
|
1465 |
then
|
|
1466 |
echo "$f" >> po/POTFILES.in.in |
|
1467 |
fi
|
|
1468 |
done
|
|
1469 |
if ! diff po/POTFILES.in.in po/POTFILES.in >/dev/null 2>&1 |
|
1470 |
then
|
|
1471 |
mv po/POTFILES.in.in po/POTFILES.in |
|
1472 |
else
|
|
1473 |
rm po/POTFILES.in.in |
|
1474 |
fi
|
|
917.1.4
by Monty Taylor
Fixed POTFILES.in generation. |
1475 |
else
|
1476 |
touch po/POTFILES.in |
|
824.1.1
by Monty Taylor
Added code to automatically build a new list of POTFILES.in, then updated the translations. |
1477 |
fi
|
1478 |
])
|
|
1
by brian
clean slate |
1479 |
|
1480 |
# Ensure that table handlers gets all modifications to CFLAGS/CXXFLAGS |
|
287.3.28
by Monty Taylor
Expanded the move to AM_CFLAGS and AM_CXXFLAGS. Now we should be more correct. |
1481 |
AC_CONFIG_COMMANDS_POST(ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS' AM_CFLAGS='$AM_CFLAGS' AM_CXXFLAGS='$AM_CXXFLAGS'") |
1
by brian
clean slate |
1482 |
|
1483 |
AC_OUTPUT
|
|
489.2.1
by C.J. Adams-Collier
2008-10-07T1437 C.J. Adams-Collier <cjac@colliertech.org> |
1484 |
|
1485 |
echo "---" |
|
1486 |
echo "Configuration summary for $PACKAGE_NAME version $VERSION" |
|
1487 |
echo "" |
|
1488 |
echo " * Installation prefix: $prefix" |
|
1489 |
echo " * System type: $SYSTEM_TYPE" |
|
492.2.1
by C.J. Adams-Collier
* fixed --disable-assert code (thanks Monty) |
1490 |
echo " * Host CPU: $host_cpu" |
489.2.1
by C.J. Adams-Collier
2008-10-07T1437 C.J. Adams-Collier <cjac@colliertech.org> |
1491 |
echo " * C Compiler: $CC_VERSION" |
632.1.21
by Monty Taylor
Cleaned up compiler version checking. |
1492 |
echo " * C++ Compiler: $CXX_VERSION" |
492.2.1
by C.J. Adams-Collier
* fixed --disable-assert code (thanks Monty) |
1493 |
echo " * Build auth_pam: $ac_cv_header_security_pam_appl_h" |
1494 |
echo " * Assertions enabled: $ac_cv_assert" |
|
489.2.1
by C.J. Adams-Collier
2008-10-07T1437 C.J. Adams-Collier <cjac@colliertech.org> |
1495 |
echo " * Debug enabled: $with_debug" |
1496 |
echo " * Profiling enabled: $ac_profiling" |
|
1497 |
echo " * Coverage enabled: $ac_coverage" |
|
1498 |
echo " * Warnings as failure: $ac_warn_fail" |
|
512.2.2
by C.J. Adams-Collier
added checks to determine which threading plugins have been enabled on |
1499 |
echo " * Scheduling Plugins: $scheduling_plugins" |
492.2.1
by C.J. Adams-Collier
* fixed --disable-assert code (thanks Monty) |
1500 |
echo " * C++ cstdint location: $ac_cv_cxx_cstdint" |
1501 |
echo " * C++ hash_map location: $ac_cv_cxx_hash_map" |
|
1502 |
echo " * C++ hash namespace: $ac_cv_cxx_hash_namespace" |
|
919.2.19
by Monty Taylor
Added check for shared_ptr in advance of actually thinking about using it. I think this should cover all platforms we care about... but let's doublecheck. |
1503 |
echo " * C++ shared_ptr namespace: $ac_cv_shared_ptr_namespace" |
489.2.1
by C.J. Adams-Collier
2008-10-07T1437 C.J. Adams-Collier <cjac@colliertech.org> |
1504 |
echo "" |
1505 |
echo "---" |
|
908.1.4
by Monty Taylor
Fix to fake-out libtoolize, since AC_INIT is in bzr_version.m4 now. |
1506 |
|
1507 |
dnl libtoolize scans configure.ac and needs to see some text |
|
1508 |
m4_define([LIBTOOLIZE_AC_INIT], []) |