Merge lp:~mordred/gearmand/pandora-build into lp:gearmand/1.0

Proposed by Monty Taylor on 2010-02-18
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mordred/gearmand/pandora-build
Merge into: lp:gearmand/1.0
Diff against target: 964 lines (+475/-149)
20 files modified
libgearman-server/queue_libmemcached.c (+2/-2)
m4/pandora_canonical.m4 (+23/-10)
m4/pandora_clock_gettime.m4 (+15/-0)
m4/pandora_drizzle_build.m4 (+3/-2)
m4/pandora_fdatasync.m4 (+2/-2)
m4/pandora_have_boost.m4 (+73/-0)
m4/pandora_have_gcc_atomics.m4 (+2/-2)
m4/pandora_have_libcassandra.m4 (+44/-0)
m4/pandora_have_libdrizzle.m4 (+16/-10)
m4/pandora_have_libgtest.m4 (+44/-0)
m4/pandora_have_libinnodb.m4 (+64/-0)
m4/pandora_have_libmemcached.m4 (+44/-6)
m4/pandora_have_libtokyocabinet.m4 (+3/-1)
m4/pandora_have_thrift.m4 (+45/-0)
m4/pandora_plugins.m4 (+1/-1)
m4/pandora_stl_hash.m4 (+87/-108)
m4/pandora_use_pipe.m4 (+1/-1)
m4/pandora_vc_build.m4 (+3/-3)
m4/pandora_warnings.m4 (+2/-0)
m4/pandora_with_gettext.m4 (+1/-1)
To merge this branch: bzr merge lp:~mordred/gearmand/pandora-build
Reviewer Review Type Date Requested Status
Gearman-developers 2010-02-18 Pending
Review via email: mp+19652@code.launchpad.net
To post a comment you must log in.
Monty Taylor (mordred) wrote :

If we're gonna do a release, we might as well have the latest m4 code...

lp:~mordred/gearmand/pandora-build updated on 2010-04-06
330. By Brian Aker <brian@gaz> on 2010-02-18

Remove dead configure bit.

331. By Brian Aker <brian@gaz> on 2010-03-10

Merge Eric

332. By Brian Aker <brian@gaz> on 2010-03-15

Small bunch of refactor bits.

333. By Brian Aker <brian@gaz> on 2010-03-16

Remove Macro around locks.

334. By Brian Aker <brian@gaz> on 2010-03-17

Merge BrianM

335. By Brian Aker <brian@gaz> on 2010-03-30

Merge Eric

336. By Brian Aker <brian@gaz> on 2010-04-02

Death of macro around error logging.

337. By Brian Aker <brian@gaz> on 2010-04-04

Updated version information.

338. By Brian Aker <brian@gaz> on 2010-04-05

Merge eric.

339. By Monty Taylor on 2010-04-06

Merged in latest pandora-build.

340. By Monty Taylor on 2010-04-06

Fixed the libmemcached cast issue.

341. By Monty Taylor on 2010-04-06

Bumped pandora number.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libgearman-server/queue_libmemcached.c'
2--- libgearman-server/queue_libmemcached.c 2010-04-02 02:04:04 +0000
3+++ libgearman-server/queue_libmemcached.c 2010-04-06 00:52:28 +0000
4@@ -306,7 +306,7 @@
5 memcached_execute_function callbacks[1];
6 char *passable[1];
7
8- callbacks[0]= &callback_loader;
9+ callbacks[0]= (memcached_execute_fn)&callback_loader;
10
11 passable[0]= (char *)key;
12 rc= memcached_mget(&container->clone, (void *)passable, &key_length, 1);
13@@ -329,7 +329,7 @@
14 memcached_st *check_for_failure;
15 memcached_dump_func callbacks[1];
16
17- callbacks[0]= &callback_for_key;
18+ callbacks[0]= (memcached_dump_fn)&callback_for_key;
19
20 gearman_log_info(server->gearman, "libmemcached replay start");
21
22
23=== modified file 'm4/pandora_canonical.m4'
24--- m4/pandora_canonical.m4 2010-01-28 21:58:37 +0000
25+++ m4/pandora_canonical.m4 2010-04-06 00:52:28 +0000
26@@ -4,7 +4,7 @@
27 dnl with or without modifications, as long as this notice is preserved.
28
29 dnl Which version of the canonical setup we're using
30-AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.100])
31+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.120])
32
33 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
34 AC_ARG_ENABLE([fat-binaries],
35@@ -31,6 +31,7 @@
36 m4_define([PCT_ALL_ARGS],[$*])
37 m4_define([PCT_REQUIRE_CXX],[no])
38 m4_define([PCT_FORCE_GCC42],[no])
39+ m4_define([PCT_DONT_SUPPRESS_INCLUDE],[no])
40 m4_define([PCT_VERSION_FROM_VC],[no])
41 m4_define([PCT_USE_VISIBILITY],[yes])
42 m4_foreach([pct_arg],[$*],[
43@@ -47,6 +48,10 @@
44 m4_undefine([PCT_USE_VISIBILITY])
45 m4_define([PCT_USE_VISIBILITY],[no])
46 ],
47+ [dont-suppress-include], [
48+ m4_undefine([PCT_DONT_SUPPRESS_INCLUDE])
49+ m4_define([PCT_DONT_SUPPRESS_INCLUDE],[yes])
50+ ],
51 [version-from-vc], [
52 m4_undefine([PCT_VERSION_FROM_VC])
53 m4_define([PCT_VERSION_FROM_VC],[yes])
54@@ -55,7 +60,7 @@
55
56 AC_CONFIG_MACRO_DIR([m4])
57
58- m4_if(m4_esyscmd(test -d src && echo -n 0),0,[
59+ m4_if(m4_substr(m4_esyscmd(test -d src && echo 0),0,1),0,[
60 AC_CONFIG_HEADERS([src/config.h])
61 ],[
62 AC_CONFIG_HEADERS([config.h])
63@@ -71,10 +76,15 @@
64
65 AC_CANONICAL_TARGET
66
67- AM_INIT_AUTOMAKE(-Wall -Werror nostdinc subdir-objects foreign)
68+ m4_if(PCT_DONT_SUPRESS_INCLUDE,yes,[
69+ AM_INIT_AUTOMAKE(-Wall -Werror subdir-objects foreign)
70+ ],[
71+ AM_INIT_AUTOMAKE(-Wall -Werror nostdinc subdir-objects foreign)
72+ ])
73+
74 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
75
76- m4_if(m4_esyscmd(test -d gnulib && echo -n 0),0,[
77+ m4_if(m4_substr(m4_esyscmd(test -d gnulib && echo 0),0,1),0,[
78 gl_EARLY
79 ])
80
81@@ -84,6 +94,8 @@
82
83 m4_if(PCT_VERSION_FROM_VC,yes,[
84 PANDORA_VC_VERSION
85+ ],[
86+ PANDORA_TEST_VC_DIR
87 ])
88 PANDORA_VERSION
89
90@@ -113,7 +125,7 @@
91
92 ])
93
94- m4_if(m4_esyscmd(test -d gnulib && echo -n 0),0,[
95+ m4_if(m4_substr(m4_esyscmd(test -d gnulib && echo 0),0,1),0,[
96 gl_INIT
97 AC_CONFIG_LIBOBJ_DIR([gnulib])
98 ])
99@@ -128,8 +140,10 @@
100 AC_C_RESTRICT
101
102 AC_HEADER_TIME
103+ AC_STRUCT_TM
104 AC_TYPE_SIZE_T
105 AC_SYS_LARGEFILE
106+ PANDORA_CLOCK_GETTIME
107
108 # off_t is not a builtin type
109 AC_CHECK_SIZEOF(off_t, 4)
110@@ -163,10 +177,6 @@
111 AC_DEFINE([TIME_T_UNSIGNED], 1, [Define to 1 if time_t is unsigned])
112 ])
113
114- dnl AC_FUNC_ALLOCA would test for stack direction if we didn't have a working
115- dnl alloca - but we need to know it anyway for check_stack_overrun.
116- PANDORA_STACK_DIRECTION
117-
118 AC_CHECK_LIBM
119
120 AC_CHECK_FUNC(setsockopt, [], [AC_CHECK_LIB(socket, setsockopt)])
121@@ -208,6 +218,9 @@
122
123 AC_CHECK_PROGS([DOXYGEN], [doxygen])
124 AC_CHECK_PROGS([PERL], [perl])
125+ AC_CHECK_PROGS([DPKG_GENSYMBOLS], [dpkg-gensymbols], [:])
126+
127+ AM_CONDITIONAL(HAVE_DPKG_GENSYMBOLS,[test "x${DPKG_GENSYMBOLS}" != "x:"])
128
129 PANDORA_WITH_GETTEXT
130
131@@ -218,7 +231,7 @@
132 AM_CPPFLAGS="-I\${top_srcdir}/gnulib -I\${top_builddir}/gnulib ${AM_CPPFLAGS}"
133 ])
134 ])
135- m4_if(m4_esyscmd(test -d src && echo -n 0),0,[
136+ m4_if(m4_substr(m4_esyscmd(test -d src && echo 0),0,1),0,[
137 AM_CPPFLAGS="-I\$(top_srcdir)/src -I\$(top_builddir)/src ${AM_CPPFLAGS}"
138 ],[
139 AM_CPPFLAGS="-I\$(top_srcdir) -I\$(top_builddir) ${AM_CPPFLAGS}"
140
141=== added file 'm4/pandora_clock_gettime.m4'
142--- m4/pandora_clock_gettime.m4 1970-01-01 00:00:00 +0000
143+++ m4/pandora_clock_gettime.m4 2010-04-06 00:52:28 +0000
144@@ -0,0 +1,15 @@
145+dnl Copyright (C) 2010 Monty Taylor
146+dnl This file is free software; Monty Taylor
147+dnl gives unlimited permission to copy and/or distribute it,
148+dnl with or without modifications, as long as this notice is preserved.
149+
150+#--------------------------------------------------------------------
151+# Check for clock_gettime
152+#--------------------------------------------------------------------
153+
154+AC_DEFUN([PANDORA_CLOCK_GETTIME],[
155+ AC_SEARCH_LIBS([clock_gettime],[rt])
156+ AS_IF([test "x${ac_cv_search_clock_gettime}" != "xno"],[
157+ AC_DEFINE([HAVE_CLOCK_GETTIME],[1],[Have a working clock_gettime function])
158+ ])
159+])
160
161=== modified file 'm4/pandora_drizzle_build.m4'
162--- m4/pandora_drizzle_build.m4 2009-12-30 17:21:49 +0000
163+++ m4/pandora_drizzle_build.m4 2010-04-06 00:52:28 +0000
164@@ -9,8 +9,7 @@
165
166 AC_DEFUN([PANDORA_DRIZZLE_BUILD],[
167
168- dnl We need to turn on our CXXFLAGS to make sure it shows up correctly
169- PANDORA_CXX_STL_HASH
170+ PANDORA_HAVE_CXX_UNORDERED
171
172 PANDORA_CXX_CSTDINT
173 PANDORA_CXX_CINTTYPES
174@@ -70,6 +69,8 @@
175 AC_CHECK_TYPES([uint, ulong])
176
177 PANDORA_CXX_DEMANGLE
178+ PANDORA_REQUIRE_BOOST([1.32])
179+
180
181 AH_TOP([
182 #ifndef __CONFIG_H__
183
184=== modified file 'm4/pandora_fdatasync.m4'
185--- m4/pandora_fdatasync.m4 2009-12-18 18:02:39 +0000
186+++ m4/pandora_fdatasync.m4 2010-04-06 00:52:28 +0000
187@@ -11,7 +11,7 @@
188 AC_DEFUN([PANDORA_WORKING_FDATASYNC],[
189 AC_CACHE_CHECK([working fdatasync],[ac_cv_func_fdatasync],[
190 AC_LANG_PUSH(C++)
191- AC_RUN_IFELSE([AC_LANG_PROGRAM([[
192+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
193 #include <unistd.h>
194 ]],[[
195 fdatasync(4);
196@@ -22,4 +22,4 @@
197 ])
198 AS_IF([test "x${ac_cv_func_fdatasync}" = "xyes"],
199 [AC_DEFINE([HAVE_FDATASYNC],[1],[If the system has a working fdatasync])])
200-])
201\ No newline at end of file
202+])
203
204=== added file 'm4/pandora_have_boost.m4'
205--- m4/pandora_have_boost.m4 1970-01-01 00:00:00 +0000
206+++ m4/pandora_have_boost.m4 2010-04-06 00:52:28 +0000
207@@ -0,0 +1,73 @@
208+dnl Copyright (C) 2010 Monty Taylor
209+dnl This file is free software; Monty Taylor
210+dnl gives unlimited permission to copy and/or distribute it,
211+dnl with or without modifications, as long as this notice is preserved.
212+
213+AC_DEFUN([_PANDORA_SEARCH_BOOST],[
214+ AC_REQUIRE([AC_LIB_PREFIX])
215+
216+ dnl --------------------------------------------------------------------
217+ dnl Check for boost
218+ dnl --------------------------------------------------------------------
219+
220+ AC_ARG_ENABLE([boost],
221+ [AS_HELP_STRING([--disable-boost],
222+ [Build with boost support @<:@default=on@:>@])],
223+ [ac_enable_boost="$enableval"],
224+ [ac_enable_boost="yes"])
225+
226+ AS_IF([test "x$ac_enable_boost" = "xyes"],[
227+ dnl link against libc because we're just looking for headers here
228+ AC_LANG_PUSH(C++)
229+ AC_LIB_HAVE_LINKFLAGS(c,,[
230+ #include <boost/pool/pool.hpp>
231+ ],[
232+ boost::pool<> test_pool(1);
233+ ])
234+ AC_LANG_POP()
235+ ],[
236+ ac_cv_boost="no"
237+ ])
238+
239+
240+ AS_IF([test "x$1" != "x"],[
241+ AC_CACHE_CHECK([if boost is recent enough],
242+ [pandora_cv_recent_boost],[
243+ pandora_need_boost_version=`echo "$1" | perl -nle '/(\d+)\.(\d+)/; printf "%d%0.3d00", $[]1, $[]2 ;'`
244+ AS_IF([test "x${pandora_need_boost_version}" = "x000000"],[
245+ pandora_cv_recent_boost=yes
246+ ],[
247+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
248+#include <boost/version.hpp>
249+
250+#if BOOST_VERSION < ${pandora_need_boost_version}
251+# error boost too old!
252+#endif
253+ ]],[[]])
254+ ],[
255+ pandora_cv_recent_boost=yes
256+ ],[
257+ pandora_cv_recent_boost=no
258+ ])
259+ ])
260+ ])
261+ AS_IF([test "x${pandora_cv_recent_boost}" = "xno"],[
262+ ac_cv_boost=no
263+ ])
264+ ])
265+
266+
267+ AM_CONDITIONAL(HAVE_BOOST, [test "x${ac_cv_boost}" = "xyes"])
268+
269+])
270+
271+AC_DEFUN([PANDORA_HAVE_BOOST],[
272+ _PANDORA_SEARCH_BOOST($1)
273+])
274+
275+AC_DEFUN([PANDORA_REQUIRE_BOOST],[
276+ PANDORA_HAVE_BOOST($1)
277+ AS_IF([test x$ac_cv_boost = xno],
278+ AC_MSG_ERROR([boost is required for ${PACKAGE}]))
279+])
280+
281
282=== modified file 'm4/pandora_have_gcc_atomics.m4'
283--- m4/pandora_have_gcc_atomics.m4 2009-12-18 18:02:39 +0000
284+++ m4/pandora_have_gcc_atomics.m4 2010-04-06 00:52:28 +0000
285@@ -13,7 +13,7 @@
286 AC_CACHE_CHECK(
287 [whether the compiler provides atomic builtins],
288 [ac_cv_gcc_atomic_builtins],
289- [AC_RUN_IFELSE(
290+ [AC_LINK_IFELSE(
291 [AC_LANG_PROGRAM([],[[
292 int foo= -10; int bar= 10;
293 if (!__sync_fetch_and_add(&foo, bar) || foo)
294@@ -34,4 +34,4 @@
295 [Define to 1 if compiler provides atomic builtins.])
296 ])
297
298-])
299\ No newline at end of file
300+])
301
302=== added file 'm4/pandora_have_libcassandra.m4'
303--- m4/pandora_have_libcassandra.m4 1970-01-01 00:00:00 +0000
304+++ m4/pandora_have_libcassandra.m4 2010-04-06 00:52:28 +0000
305@@ -0,0 +1,44 @@
306+dnl Copyright (C) 2010 Padraig O'Sullivan
307+dnl This file is free software;
308+dnl gives unlimited permission to copy and/or distribute it,
309+dnl with or without modifications, as long as this notice is preserved.
310+
311+AC_DEFUN([_PANDORA_SEARCH_LIBCASSANDRA],[
312+ AC_REQUIRE([AC_LIB_PREFIX])
313+
314+ dnl --------------------------------------------------------------------
315+ dnl Check for libcassandra
316+ dnl --------------------------------------------------------------------
317+
318+ AC_ARG_ENABLE([libcassandra],
319+ [AS_HELP_STRING([--disable-libcassandra],
320+ [Build with libcassandra support @<:@default=on@:>@])],
321+ [ac_enable_libcassandra="$enableval"],
322+ [ac_enable_libcassandra="yes"])
323+
324+ AS_IF([test "x$ac_enable_libcassandra" = "xyes"],[
325+ AC_LANG_PUSH([C++])
326+ AC_LIB_HAVE_LINKFLAGS(cassandra,[thrift],[
327+ #include <libcassandra/cassandra_factory.h>
328+ ],[
329+ libcassandra::CassandraFactory fact("localhost", 9306);
330+ ])
331+ AC_LANG_POP()
332+ ],[
333+ ac_cv_libcassandra="no"
334+ ])
335+
336+ AM_CONDITIONAL(HAVE_LIBCASSANDRA, [test "x${ac_cv_libcassandra}" = "xyes"])
337+
338+])
339+
340+AC_DEFUN([PANDORA_HAVE_LIBCASSANDRA],[
341+ AC_REQUIRE([_PANDORA_SEARCH_LIBCASSANDRA])
342+])
343+
344+AC_DEFUN([PANDORA_REQUIRE_LIBCASSANDRA],[
345+ AC_REQUIRE([PANDORA_HAVE_LIBCASSANDRA])
346+ AS_IF([test "x$ac_cv_libcassandra" = "xno"],[
347+ AC_MSG_ERROR([libcassandra is required for ${PACKAGE}])
348+ ])
349+])
350
351=== modified file 'm4/pandora_have_libdrizzle.m4'
352--- m4/pandora_have_libdrizzle.m4 2009-07-29 18:13:26 +0000
353+++ m4/pandora_have_libdrizzle.m4 2010-04-06 00:52:28 +0000
354@@ -36,20 +36,26 @@
355
356 AC_DEFUN([PANDORA_REQUIRE_LIBDRIZZLE],[
357 AC_REQUIRE([PANDORA_HAVE_LIBDRIZZLE])
358- AS_IF([test "x${ac_cv_libdrizzle}" = "xno"],
359- AC_MSG_ERROR([libdrizzle is required for ${PACKAGE}]))
360+ AS_IF([test "x${ac_cv_libdrizzle}" = "xno"],[
361+ AC_MSG_ERROR([libdrizzle is required for ${PACKAGE}])
362+ ],[
363+ dnl We need at least 0.8 on Solaris non-sparc
364+ AS_IF([test "$target_cpu" != "sparc" -a "x${TARGET_SOLARIS}" = "xtrue"],[
365+ PANDORA_LIBDRIZZLE_RECENT
366+ ])
367+ ])
368 ])
369
370-AC_DEFUN([PANDORA_LIBDRIZZLE_NOVCOL],[
371- AC_CACHE_CHECK([if libdrizzle still has virtual columns],
372- [pandora_cv_libdrizzle_vcol],
373+AC_DEFUN([PANDORA_LIBDRIZZLE_RECENT],[
374+ AC_CACHE_CHECK([if libdrizzle is recent enough],
375+ [pandora_cv_libdrizzle_recent],
376 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
377 #include <libdrizzle/drizzle.h>
378-int foo= DRIZZLE_COLUMN_TYPE_DRIZZLE_VIRTUAL;
379+drizzle_con_options_t foo= DRIZZLE_CON_EXPERIMENTAL;
380 ]])],
381- [pandora_cv_libdrizzle_vcol=yes],
382- [pandora_cv_libdrizzle_vcol=no])])
383- AS_IF([test "$pandora_cv_libdrizzle_vcol" = "yes"],[
384- AC_MSG_ERROR([Your version of libdrizzle is too old. ${PACKAGE} requires at least version 0.4])
385+ [pandora_cv_libdrizzle_recent=yes],
386+ [pandora_cv_libdrizzle_recent=no])])
387+ AS_IF([test "$pandora_cv_libdrizzle_recent" = "no"],[
388+ AC_MSG_ERROR([Your version of libdrizzle is too old. ${PACKAGE} requires at least version 0.8])
389 ])
390 ])
391
392=== added file 'm4/pandora_have_libgtest.m4'
393--- m4/pandora_have_libgtest.m4 1970-01-01 00:00:00 +0000
394+++ m4/pandora_have_libgtest.m4 2010-04-06 00:52:28 +0000
395@@ -0,0 +1,44 @@
396+dnl Copyright (C) 2010 Monty Taylor
397+dnl This file is free software; Monty Taylor
398+dnl gives unlimited permission to copy and/or distribute it,
399+dnl with or without modifications, as long as this notice is preserved.
400+
401+AC_DEFUN([_PANDORA_SEARCH_LIBGTEST],[
402+ AC_REQUIRE([AC_LIB_PREFIX])
403+
404+ dnl --------------------------------------------------------------------
405+ dnl Check for libgtest
406+ dnl --------------------------------------------------------------------
407+
408+ AC_ARG_ENABLE([libgtest],
409+ [AS_HELP_STRING([--disable-libgtest],
410+ [Build with libgtest support @<:@default=on@:>@])],
411+ [ac_enable_libgtest="$enableval"],
412+ [ac_enable_libgtest="yes"])
413+
414+ AS_IF([test "x$ac_enable_libgtest" = "xyes"],[
415+ AC_LANG_PUSH(C++)
416+ AC_LIB_HAVE_LINKFLAGS(gtest,,[
417+ #include <gtest/gtest.h>
418+TEST(pandora_test_libgtest, PandoraTest)
419+{
420+ ASSERT_EQ(1, 1);
421+}
422+ ],[])
423+ AC_LANG_POP()
424+ ],[
425+ ac_cv_libgtest="no"
426+ ])
427+
428+ AM_CONDITIONAL(HAVE_LIBGTEST, [test "x${ac_cv_libgtest}" = "xyes"])
429+])
430+
431+AC_DEFUN([PANDORA_HAVE_LIBGTEST],[
432+ AC_REQUIRE([_PANDORA_SEARCH_LIBGTEST])
433+])
434+
435+AC_DEFUN([PANDORA_REQUIRE_LIBGTEST],[
436+ AC_REQUIRE([_PANDORA_SEARCH_LIBGTEST])
437+ AS_IF([test "x${ac_cv_libgtest}" = "xno"],
438+ AC_MSG_ERROR([libgtest is required for ${PACKAGE}]))
439+])
440
441=== added file 'm4/pandora_have_libinnodb.m4'
442--- m4/pandora_have_libinnodb.m4 1970-01-01 00:00:00 +0000
443+++ m4/pandora_have_libinnodb.m4 2010-04-06 00:52:28 +0000
444@@ -0,0 +1,64 @@
445+dnl Copyright (C) 2009 Sun Microsystems
446+dnl This file is free software; Sun Microsystems
447+dnl gives unlimited permission to copy and/or distribute it,
448+dnl with or without modifications, as long as this notice is preserved.
449+
450+AC_DEFUN([_PANDORA_SEARCH_LIBINNODB],[
451+ AC_REQUIRE([AC_LIB_PREFIX])
452+
453+ dnl --------------------------------------------------------------------
454+ dnl Check for libinnodb
455+ dnl --------------------------------------------------------------------
456+
457+ AC_ARG_ENABLE([libinnodb],
458+ [AS_HELP_STRING([--disable-libinnodb],
459+ [Build with libinnodb support @<:@default=on@:>@])],
460+ [ac_enable_libinnodb="$enableval"],
461+ [ac_enable_libinnodb="yes"])
462+
463+ AS_IF([test "x$ac_enable_libinnodb" = "xyes"],[
464+ AC_LIB_HAVE_LINKFLAGS(innodb,,[
465+ #include <embedded_innodb-1.0/innodb.h>
466+ ],[
467+ ib_u64_t
468+ ib_api_version(void);
469+ ])
470+ ],[
471+ ac_cv_libinnodb="no"
472+ ])
473+
474+
475+ AC_CACHE_CHECK([if libinnodb is recent enough],
476+ [ac_cv_recent_innodb_h],[
477+ save_LIBS=${LIBS}
478+ LIBS="${LIBS} ${LTLIBINNODB}"
479+ AC_LINK_IFELSE(
480+ [AC_LANG_PROGRAM([[
481+ #include <embedded_innodb-1.0/innodb.h>
482+ ]],[[
483+ /* Make sure we have the two-arg version */
484+ ib_table_drop(NULL, "nothing");
485+ ]])],[
486+ ac_cv_recent_innodb_h=yes
487+ ],[
488+ ac_cv_recent_innodb_h=no
489+ ])
490+ LIBS="${save_LIBS}"
491+ ])
492+ AS_IF([test "x${ac_cv_recent_innodb_h}" = "xno"],[
493+ AC_MSG_WARN([${PACKAGE} requires at least version 1.0.6 of Embedded InnoDB])
494+ ac_cv_libinnodb=no
495+ ])
496+
497+ AM_CONDITIONAL(HAVE_LIBINNODB, [test "x${ac_cv_libinnodb}" = "xyes"])
498+])
499+
500+AC_DEFUN([PANDORA_HAVE_LIBINNODB],[
501+ AC_REQUIRE([_PANDORA_SEARCH_LIBINNODB])
502+])
503+
504+AC_DEFUN([PANDORA_REQUIRE_LIBINNODB],[
505+ AC_REQUIRE([PANDORA_HAVE_LIBINNODB])
506+ AS_IF([test "x${ac_cv_libinnodb}" = "xno"],
507+ AC_MSG_ERROR([libinnodb is required for ${PACKAGE}]))
508+])
509
510=== modified file 'm4/pandora_have_libmemcached.m4'
511--- m4/pandora_have_libmemcached.m4 2010-01-28 21:58:37 +0000
512+++ m4/pandora_have_libmemcached.m4 2010-04-06 00:52:28 +0000
513@@ -24,6 +24,11 @@
514 memcached_dump_func *df;
515 memcached_lib_version();
516 ])
517+ ],[
518+ ac_cv_libmemcached="no"
519+ ])
520+
521+ AS_IF([test "x$ac_enable_libmemcached" = "xyes"],[
522 AC_LIB_HAVE_LINKFLAGS(memcachedprotocol,,[
523 #include <libmemcached/protocol_handler.h>
524 ],[
525@@ -31,7 +36,6 @@
526 protocol_handle= memcached_protocol_create_instance();
527 ])
528 ],[
529- ac_cv_libmemcached="no"
530 ac_cv_libmemcachedprotocol="no"
531 ])
532
533@@ -43,26 +47,60 @@
534 ]])],
535 [pandora_cv_libmemcached_server_fn=yes],
536 [pandora_cv_libmemcached_server_fn=no])])
537+
538 AS_IF([test "x$pandora_cv_libmemcached_server_fn" = "xyes"],[
539 AC_DEFINE([HAVE_MEMCACHED_SERVER_FN],[1],[If we have the new memcached_server_fn typedef])
540 ])
541-
542- AM_CONDITIONAL(HAVE_LIBMEMCACHED, [test "x${ac_cv_libmemcached}" = "xyes"])
543+])
544+
545+AC_DEFUN([_PANDORA_RECENT_LIBMEMCACHED],[
546+
547+ AC_CACHE_CHECK([if libmemcached is recent enough],
548+ [pandora_cv_recent_libmemcached],[
549+ AS_IF([test "x${ac_cv_libmemcached}" = "xno"],[
550+ pandora_cv_recent_libmemcached=no
551+ ],[
552+ AS_IF([test "x$1" != "x"],[
553+ pandora_need_libmemcached_version=`echo "$1" | perl -nle '/(\d+)\.(\d+)/; printf "%d%0.3d000", $[]1, $[]2 ;'`
554+ AS_IF([test "x${pandora_need_libmemcached_version}" = "x0000000"],[
555+ pandora_cv_recent_libmemcached=yes
556+ ],[
557+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
558+#include <libmemcached/configure.h>
559+
560+#if !defined(LIBMEMCACHED_VERSION_HEX) || LIBMEMCACHED_VERSION_HEX < 0x]]${pandora_need_libmemcached_version}[[
561+# error libmemcached too old!
562+#endif
563+ ]],[[]])
564+ ],[
565+ pandora_cv_recent_libmemcached=yes
566+ ],[
567+ pandora_cv_recent_libmemcached=no
568+ ])
569+ ])
570+ ],[
571+ pandora_cv_recent_libmemcached=yes
572+ ])
573+ ])
574+ ])
575+
576+ AM_CONDITIONAL(HAVE_LIBMEMCACHED,[test "x${ac_cv_libmemcached}" = "xyes" -a "x${pandora_cv_recent_libmemcached}" = "xyes"])
577
578 ])
579
580 AC_DEFUN([PANDORA_HAVE_LIBMEMCACHED],[
581 AC_REQUIRE([_PANDORA_SEARCH_LIBMEMCACHED])
582+ _PANDORA_RECENT_LIBMEMCACHED($1)
583 ])
584
585 AC_DEFUN([PANDORA_REQUIRE_LIBMEMCACHED],[
586- AC_REQUIRE([PANDORA_HAVE_LIBMEMCACHED])
587- AS_IF([test x$ac_cv_libmemcached = xno],
588+ PANDORA_HAVE_LIBMEMCACHED($1)
589+ AS_IF([test "x{$pandora_cv_recent_libmemcached}" = "xno"],
590 AC_MSG_ERROR([libmemcached is required for ${PACKAGE}]))
591 ])
592
593 AC_DEFUN([PANDORA_REQUIRE_LIBMEMCACHEDPROTOCOL],[
594- AC_REQUIRE([PANDORA_HAVE_LIBMEMCACHED])
595+ PANDORA_HAVE_LIBMEMCACHED($1)
596 AS_IF([test x$ac_cv_libmemcachedprotocol = xno],
597 AC_MSG_ERROR([libmemcachedprotocol is required for ${PACKAGE}]))
598 ])
599
600=== modified file 'm4/pandora_have_libtokyocabinet.m4'
601--- m4/pandora_have_libtokyocabinet.m4 2010-01-28 22:11:22 +0000
602+++ m4/pandora_have_libtokyocabinet.m4 2010-04-06 00:52:28 +0000
603@@ -22,8 +22,10 @@
604 AS_IF([test "x$ac_enable_libtokyocabinet" = "xyes"],[
605 AC_LIB_HAVE_LINKFLAGS(tokyocabinet,,[
606 #include <tcutil.h>
607+#include <tcadb.h>
608 ],[
609 const char *test= tcversion;
610+bool ret= tcadboptimize(NULL, "params");
611 ])
612 ],[
613 ac_cv_libtokyocabinet="no"
614@@ -31,7 +33,7 @@
615
616 AS_IF([test "${ac_cv_libtokyocabinet}" = "no" -a "${ac_enable_libtokyocabinet}" = "yes"],[
617
618- PKG_CHECK_MODULES([LIBTOKYOCABINET], [libtokyocabinet], [
619+ PKG_CHECK_MODULES([LIBTOKYOCABINET], [libtokyocabinet >= 1.4.15], [
620 ac_cv_libtokyocabinet=yes
621 LTLIBTOKYOCABINET=${LIBTOKYOCABINET_LIBS}
622 LIBTOKYOCABINET=${LIBTOKYOCABINET_LIBS}
623
624=== added file 'm4/pandora_have_thrift.m4'
625--- m4/pandora_have_thrift.m4 1970-01-01 00:00:00 +0000
626+++ m4/pandora_have_thrift.m4 2010-04-06 00:52:28 +0000
627@@ -0,0 +1,45 @@
628+dnl Copyright (C) 2010 Padraig O'Sullivan
629+dnl This file is free software; Padraig O'Sullivan
630+dnl gives unlimited permission to copy and/or distribute it,
631+dnl with or without modifications, as long as this notice is preserved.
632+
633+AC_DEFUN([_PANDORA_SEARCH_THRIFT],[
634+ AC_REQUIRE([AC_LIB_PREFIX])
635+
636+ dnl --------------------------------------------------------------------
637+ dnl Check for thrift
638+ dnl --------------------------------------------------------------------
639+
640+ AC_ARG_ENABLE([thrift],
641+ [AS_HELP_STRING([--disable-thrift],
642+ [Build with thrift support @<:@default=on@:>@])],
643+ [ac_enable_thrift="$enableval"],
644+ [ac_enable_thrift="yes"])
645+
646+ AS_IF([test "x$ac_enable_thrift" = "xyes"],[
647+ AC_LANG_PUSH(C++)
648+ AC_LIB_HAVE_LINKFLAGS(thrift,,[
649+ #include <thrift/Thrift.h>
650+ ],[
651+ apache::thrift::TOutput test_output;
652+ ])
653+ AC_LANG_POP()
654+ ],[
655+ ac_cv_thrift="no"
656+ ])
657+
658+ AM_CONDITIONAL(HAVE_THRIFT, [test "x${ac_cv_thrift}" = "xyes"])
659+
660+])
661+
662+AC_DEFUN([PANDORA_HAVE_THRIFT],[
663+ AC_REQUIRE([_PANDORA_SEARCH_THRIFT])
664+])
665+
666+AC_DEFUN([PANDORA_REQUIRE_THRIFT],[
667+ AC_REQUIRE([PANDORA_HAVE_THRIFT])
668+ AS_IF([test x$ac_cv_thrift= xno],[
669+ AC_MSG_ERROR([thrift required for ${PACKAGE}])
670+ ])
671+])
672+
673
674=== modified file 'm4/pandora_plugins.m4'
675--- m4/pandora_plugins.m4 2009-12-18 19:25:00 +0000
676+++ m4/pandora_plugins.m4 2010-04-06 00:52:28 +0000
677@@ -45,7 +45,7 @@
678 AC_SUBST(pandora_plugin_defs)
679
680 AC_SUBST(PANDORA_PLUGIN_DEP_LIBS)
681- AC_SUBST(pkgplugindir,"\$(pkglibdir)/plugin")
682+ AC_SUBST(pkgplugindir,"\$(pkglibdir)")
683 ])
684
685 AC_DEFUN([PANDORA_ADD_PLUGIN_DEP_LIB],[
686
687=== modified file 'm4/pandora_stl_hash.m4'
688--- m4/pandora_stl_hash.m4 2009-12-18 18:02:39 +0000
689+++ m4/pandora_stl_hash.m4 2010-04-06 00:52:28 +0000
690@@ -1,110 +1,89 @@
691-# We check two things: where the include file is for hash_map, and
692-# what namespace hash_map lives in within that include file. We
693+# We check two things: where the include file is for unordered_map, and
694+# what namespace unordered_map lives in within that include file. We
695 # include AC_COMPILE_IFELSE for all the combinations we've seen in the
696-# wild. We define one of HAVE_HASH_MAP or HAVE_EXT_HASH_MAP depending
697-# on location, and HASH_NAMESPACE to be the namespace hash_map is
698-# defined in.
699-#
700-# Ideally we'd use AC_CACHE_CHECK, but that only lets us store one value
701-# at a time, and we need to store two (filename and namespace).
702-# prints messages itself, so we have to do the message-printing ourselves
703-# via AC_MSG_CHECKING + AC_MSG_RESULT. (TODO(csilvers): can we cache?)
704-
705-AC_DEFUN([PANDORA_CXX_STL_HASH],
706- [AC_MSG_CHECKING(the location of hash_map)
707- save_CXXFLAGS="${CXXFLAGS}"
708- CXXFLAGS="${AM_CXXFLAGS} ${CXXFLAGS}"
709- AC_LANG_PUSH(C++)
710- ac_cv_cxx_hash_map=""
711- for location in "" "ext/" "tr1/" ; do
712- for namespace in __gnu_cxx "" std stdext; do
713- for classprefix in unordered hash; do
714- if test -z "$ac_cv_cxx_hash_map"; then
715- AC_COMPILE_IFELSE(
716- [AC_LANG_PROGRAM([[#include <${location}${classprefix}_map>]],
717- [[${namespace}::${classprefix}_map<int, int> t]])],
718- [ac_cv_cxx_hash_map="<${location}${classprefix}_map>";
719- ac_cv_cxx_hash_set="<${location}${classprefix}_set>";
720- ac_cv_cxx_hash_namespace="$namespace";
721- ac_cv_cxx_hash_map_class="${classprefix}_map";
722- ac_cv_cxx_hash_set_class="${classprefix}_set"])
723-
724- fi
725- done
726- done
727- done
728-
729- if test -n "$ac_cv_cxx_hash_map"; then
730- AC_DEFINE(HAVE_HASH_MAP, 1, [define if the compiler has hash_map])
731- AC_DEFINE(HAVE_HASH_SET, 1, [define if the compiler has hash_set])
732- AC_DEFINE_UNQUOTED(HASH_MAP_H,$ac_cv_cxx_hash_map,
733- [the location of <hash_map>])
734- AC_DEFINE_UNQUOTED(HASH_SET_H,$ac_cv_cxx_hash_set,
735- [the location of <hash_set>])
736- AC_DEFINE_UNQUOTED(HASH_NAMESPACE,$ac_cv_cxx_hash_namespace,
737- [the namespace of hash_map/hash_set])
738- AC_DEFINE_UNQUOTED(HASH_MAP_CLASS,$ac_cv_cxx_hash_map_class,
739- [the classname of hash_map])
740- AC_DEFINE_UNQUOTED(HASH_SET_CLASS,$ac_cv_cxx_hash_set_class,
741- [the classname of hash_set])
742- AC_MSG_RESULT([$ac_cv_cxx_hash_map])
743- else
744- AC_MSG_RESULT()
745- AC_MSG_WARN([could not find an STL hash_map])
746- fi
747- AC_CACHE_CHECK(
748- [whether hash_map has rehash method],
749- [ac_cv_hash_map_has_rehash],
750- [AC_COMPILE_IFELSE(
751- [AC_LANG_PROGRAM([[
752-#include HASH_MAP_H
753-using namespace HASH_NAMESPACE;
754- ]],[[
755-HASH_MAP_CLASS<int, int> test_hash;
756-test_hash.rehash(100);
757- ]])],
758- [ac_cv_hash_map_has_rehash=yes],
759- [ac_cv_hash_map_has_rehash=no])])
760- AS_IF([test $ac_cv_hash_map_has_rehash = yes],[
761- AC_DEFINE(HASH_MAP_HAS_REHASH, 1, [if hash_map<> hash rehash method])
762- ])
763- AC_CACHE_CHECK(
764- [whether hash_map has resize method],
765- [ac_cv_hash_map_has_resize],
766- [AC_COMPILE_IFELSE(
767- [AC_LANG_PROGRAM([[
768-#include HASH_MAP_H
769-using namespace HASH_NAMESPACE;
770- ]],[[
771-HASH_MAP_CLASS<int, int> test_hash;
772-test_hash.resize(100);
773- ]])],
774- [ac_cv_hash_map_has_resize=yes],
775- [ac_cv_hash_map_has_resize=no])])
776- AS_IF([test $ac_cv_hash_map_has_resize = yes],[
777- AC_DEFINE(HASH_MAP_HAS_RESIZE, 1, [if hash_map<> hash resize method])
778- ])
779- AC_CACHE_CHECK(
780- [whether to redefine hash<string>],
781- [ac_cv_redefine_hash_string],
782- [AC_COMPILE_IFELSE(
783- [AC_LANG_PROGRAM([[
784-#include HASH_SET_H
785-#include <string>
786-using namespace HASH_NAMESPACE;
787-using namespace std;
788- ]],[[
789-string teststr("test");
790-HASH_SET_CLASS<string> test_hash;
791-HASH_SET_CLASS<string>::iterator iter= test_hash.find(teststr);
792-if (iter != test_hash.end())
793- return 1;
794- ]])],
795- [ac_cv_redefine_hash_string=no],
796- [ac_cv_redefine_hash_string=yes])])
797- AS_IF([test $ac_cv_redefine_hash_string = yes],[
798- AC_DEFINE(REDEFINE_HASH_STRING, 1, [if hash<string> needs to be defined])
799- ])
800- CXXFLAGS="${save_CXXFLAGS}"
801- AC_LANG_POP()
802+# wild. We define HAVE_UNORDERED_MAP and HAVE_UNORDERED_SET if we have
803+# them, UNORDERED_MAP_H and UNORDERED_SET_H to their location and
804+# UNORDERED_NAMESPACE to be the namespace unordered_map is defined in.
805+
806+AC_DEFUN([PANDORA_CXX_STL_UNORDERED],[
807+ save_CXXFLAGS="${CXXFLAGS}"
808+ CXXFLAGS="${AM_CXXFLAGS} ${CXXFLAGS}"
809+ AC_LANG_PUSH(C++)
810+ AC_CACHE_CHECK([for STL unordered_map],
811+ [pandora_cv_stl_unordered],[
812+ AC_COMPILE_IFELSE(
813+ [AC_LANG_PROGRAM([[#include <unordered_map>]],
814+ [[std::unordered_map<int, int> t]])],
815+ [pandora_cv_stl_unordered="yes"],
816+ [pandora_cv_stl_unordered="no"])])
817+
818+ AS_IF([test "x${pandora_cv_stl_unordered}" != "xyes"],[
819+ AC_CACHE_CHECK([for tr1 unordered_map],
820+ [pandora_cv_tr1_unordered],[
821+ AC_COMPILE_IFELSE(
822+ [AC_LANG_PROGRAM([[
823+/* We put in this define because of a YACC symbol clash in Drizzle.
824+ Seriously... I cannot believe the GCC guys defined a piece of the internals
825+ of this named IF - and I can't believe that YACC generates a token define
826+ called IF. Really?
827+*/
828+#define IF 21;
829+#include <tr1/unordered_map>
830+ ]],[[
831+std::tr1::unordered_map<int, int> t
832+ ]])],
833+ [pandora_cv_tr1_unordered="yes"],
834+ [pandora_cv_tr1_unordered="no"])])
835+ ])
836+
837+ AS_IF([test "x${pandora_cv_stl_unordered}" != "xyes" -a "x${pandora_cv_tr1_unordered}" != "xyes"],[
838+ AC_CACHE_CHECK([for boost unordered_map],
839+ [pandora_cv_boost_unordered],[
840+ AC_COMPILE_IFELSE(
841+ [AC_LANG_PROGRAM([[#include <boost/unordered_map.hpp>]],
842+ [[boost::unordered_map<int, int> t]])],
843+ [pandora_cv_boost_unordered="yes"],
844+ [pandora_cv_boost_unordered="no"])])
845+ ])
846+
847+ CXXFLAGS="${save_CXXFLAGS}"
848+ AC_LANG_POP()
849+
850+ AS_IF([test "x${pandora_cv_stl_unordered}" = "xyes"],[
851+ AC_DEFINE(HAVE_STD_UNORDERED_MAP, 1,
852+ [if the compiler has std::unordered_map])
853+ AC_DEFINE(HAVE_STD_UNORDERED_SET, 1,
854+ [if the compiler has std::unordered_set])
855+ pandora_has_unordered=yes
856+ ])
857+ AS_IF([test "x${pandora_cv_tr1_unordered}" = "xyes"],[
858+ AC_DEFINE(HAVE_TR1_UNORDERED_MAP, 1,
859+ [if the compiler has std::tr1::unordered_map])
860+ AC_DEFINE(HAVE_TR1_UNORDERED_SET, 1,
861+ [if the compiler has std::tr1::unordered_set])
862+ pandora_has_unordered=yes
863+ ])
864+ AS_IF([test "x${pandora_cv_boost_unordered}" = "xyes"],[
865+ AC_DEFINE(HAVE_BOOST_UNORDERED_MAP, 1,
866+ [if the compiler has boost::unordered_map])
867+ AC_DEFINE(HAVE_BOOST_UNORDERED_SET, 1,
868+ [if the compiler has boost::unordered_set])
869+ pandora_has_unordered=yes
870+ ])
871+
872+ AS_IF([test "x${pandora_has_unordered}" != "xyes"],[
873+ AC_MSG_WARN([could not find an STL unordered_map])
874+ ])
875+])
876+
877+AC_DEFUN([PANDORA_HAVE_CXX_UNORDERED],[
878+ AC_REQUIRE([PANDORA_CXX_STL_UNORDERED])
879+])
880+
881+AC_DEFUN([PANDORA_REQUIRE_CXX_UNORDERED],[
882+ AC_REQUIRE([PANDORA_HAVE_CXX_UNORDERED])
883+ AS_IF([test "x${pandora_has_unordered}" != "xyes"],[
884+ AC_MSG_ERROR([An STL compliant unordered_map is required for ${PACKAGE}.
885+ Implementations can be found in Recent versions of gcc and in boost])
886+ ])
887 ])
888
889=== modified file 'm4/pandora_use_pipe.m4'
890--- m4/pandora_use_pipe.m4 2009-09-29 04:30:01 +0000
891+++ m4/pandora_use_pipe.m4 2010-04-06 00:52:28 +0000
892@@ -16,7 +16,7 @@
893
894 AS_IF([test "$GCC" = "yes"],[
895 AC_CACHE_CHECK([for working -pipe], [pandora_cv_use_pipe], [
896- AC_RUN_IFELSE([AC_LANG_SOURCE([[
897+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
898 #include <stdio.h>
899
900 int main(int argc, char** argv)
901
902=== modified file 'm4/pandora_vc_build.m4'
903--- m4/pandora_vc_build.m4 2010-01-28 21:58:37 +0000
904+++ m4/pandora_vc_build.m4 2010-04-06 00:52:28 +0000
905@@ -3,7 +3,7 @@
906 dnl gives unlimited permission to copy and/or distribute it,
907 dnl with or without modifications, as long as this notice is preserved.
908
909-AC_DEFUN([_PANDORA_BUILDING_FROM_VC],[
910+AC_DEFUN([PANDORA_TEST_VC_DIR],[
911 pandora_building_from_vc=no
912
913 if test -d ".bzr" ; then
914@@ -36,7 +36,7 @@
915 ])
916
917 AC_DEFUN([PANDORA_BUILDING_FROM_VC],[
918- m4_syscmd(_PANDORA_BUILDING_FROM_VC [
919+ m4_syscmd(PANDORA_TEST_VC_DIR [
920
921 PANDORA_RELEASE_DATE=`date +%Y.%m`
922 PANDORA_RELEASE_NODOTS_DATE=`date +%Y%m`
923@@ -81,7 +81,7 @@
924 AC_DEFUN([PANDORA_VC_VERSION],[
925 AC_REQUIRE([PANDORA_BUILDING_FROM_VC])
926
927- _PANDORA_BUILDING_FROM_VC
928+ PANDORA_TEST_VC_DIR
929
930 AS_IF([test -f ${srcdir}/config/pandora_vc_revinfo],[
931 _PANDORA_READ_FROM_FILE([PANDORA_VC_REVNO],${srcdir}/config/pandora_vc_revinfo)
932
933=== modified file 'm4/pandora_warnings.m4'
934--- m4/pandora_warnings.m4 2010-01-28 21:58:37 +0000
935+++ m4/pandora_warnings.m4 2010-04-06 00:52:28 +0000
936@@ -146,6 +146,7 @@
937 BASE_WARNINGS_FULL="-Wformat=2 ${W_CONVERSION} -Wstrict-aliasing"
938 CC_WARNINGS_FULL="-Wswitch-default -Wswitch-enum -Wwrite-strings"
939 CXX_WARNINGS_FULL="-Weffc++ -Wold-style-cast"
940+ NO_OLD_STYLE_CAST="-Wno-old-style-cast"
941 ],[
942 BASE_WARNINGS_FULL="-Wformat ${NO_STRICT_ALIASING}"
943 ])
944@@ -342,6 +343,7 @@
945 AC_SUBST(NO_UNREACHED)
946 AC_SUBST(NO_SHADOW)
947 AC_SUBST(NO_STRICT_ALIASING)
948+ AC_SUBST(NO_OLD_STYLE_CAST)
949 AC_SUBST(PROTOSKIP_WARNINGS)
950 AC_SUBST(INNOBASE_SKIP_WARNINGS)
951 AC_SUBST(NO_WERROR)
952
953=== modified file 'm4/pandora_with_gettext.m4'
954--- m4/pandora_with_gettext.m4 2010-01-28 21:58:37 +0000
955+++ m4/pandora_with_gettext.m4 2010-04-06 00:52:28 +0000
956@@ -30,7 +30,7 @@
957 fi
958 fi])
959
960- m4_if(m4_esyscmd(test -d po && echo -n 0), 0, [
961+ m4_if(m4_substr(m4_esyscmd(test -d po && echo 0),0,1),0, [
962 AM_GNU_GETTEXT(external, need-formatstring-macros)
963 AM_GNU_GETTEXT_VERSION([0.17])
964 AS_IF([test "x$MSGMERGE" = "x" -o "x$MSGMERGE" = "x:"],[

Subscribers

People subscribed via source and target branches