← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to m4/pandora_canonical.m4

  • Committer: Andrew Hutchings
  • Date: 2011-01-23 21:32:31 UTC
  • mto: (2108.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 2109.
  • Revision ID: andrew@linuxjedi.co.uk-20110123213231-dp2r4enepa9k4g36
https://launchpad.net/bugs/667162
Convert all unit tests to boost::test
Add pandora support for boost::test
Remove pandora support for gtest

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/pandora_canonical.m4
1
 
dnl  Copyright (C) 2009 Sun Microsystems
2
 
dnl This file is free software; Sun Microsystems
 
1
dnl  Copyright (C) 2009 Sun Microsystems, Inc.
 
2
dnl This file is free software; Sun Microsystems, Inc.
3
3
dnl gives unlimited permission to copy and/or distribute it,
4
4
dnl with or without modifications, as long as this notice is preserved.
5
5
 
6
6
dnl Which version of the canonical setup we're using
7
 
AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.161])
 
7
AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.171])
8
8
 
9
9
AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
10
10
  AC_ARG_ENABLE([fat-binaries],
38
38
  m4_define([PCT_REQUIRE_CXX],[no])
39
39
  m4_define([PCT_FORCE_GCC42],[no])
40
40
  m4_define([PCT_DONT_SUPPRESS_INCLUDE],[no])
 
41
  m4_define([PCT_NO_VC_CHANGELOG],[no])
41
42
  m4_define([PCT_VERSION_FROM_VC],[no])
42
43
  m4_define([PCT_USE_VISIBILITY],[yes])
43
44
  m4_foreach([pct_arg],[$*],[
58
59
        m4_undefine([PCT_DONT_SUPPRESS_INCLUDE])
59
60
        m4_define([PCT_DONT_SUPPRESS_INCLUDE],[yes])
60
61
      ],
 
62
      [no-vc-changelog], [
 
63
        m4_undefine([PCT_NO_VC_CHANGELOG])
 
64
        m4_define([PCT_NO_VC_CHANGELOG],[yes])
 
65
      ],
61
66
      [version-from-vc], [
62
67
        m4_undefine([PCT_VERSION_FROM_VC])
63
68
        m4_define([PCT_VERSION_FROM_VC],[yes])
104
109
  ])
105
110
  AC_REQUIRE([PANDORA_64BIT])
106
111
 
 
112
  m4_if(PCT_NO_VC_CHANGELOG,yes,[
 
113
    vc_changelog=no
 
114
  ],[
 
115
    vc_changelog=yes
 
116
  ])
107
117
  m4_if(PCT_VERSION_FROM_VC,yes,[
108
118
    PANDORA_VC_VERSION
109
119
  ],[
201
211
    AC_DEFINE([TIME_T_UNSIGNED], 1, [Define to 1 if time_t is unsigned])
202
212
  ])
203
213
 
 
214
  AC_CACHE_CHECK([if system defines RUSAGE_THREAD], [ac_cv_rusage_thread],[
 
215
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 
216
      [[
 
217
#include <sys/time.h>
 
218
#include <sys/resource.h>
 
219
      ]],[[
 
220
      int x= RUSAGE_THREAD;
 
221
      ]])
 
222
    ],[
 
223
      ac_cv_rusage_thread=yes
 
224
    ],[
 
225
      ac_cv_rusage_thread=no
 
226
    ])
 
227
  ])
 
228
  AS_IF([test "$ac_cv_rusage_thread" = "no"],[
 
229
    AC_DEFINE([RUSAGE_THREAD], [RUSAGE_SELF],
 
230
      [Define if system doesn't define])
 
231
  ])
 
232
 
204
233
  AC_CHECK_LIBM
205
234
  dnl Bug on FreeBSD - LIBM check doesn't set the damn variable
206
235
  AC_SUBST([LIBM])
225
254
 
226
255
  PANDORA_HAVE_GCC_ATOMICS
227
256
 
228
 
  save_CFLAGS="${CFLAGS}"
229
 
  CFLAGS="${CFLAGS} -Werror"
230
 
  PANDORA_CHECK_VISIBILITY
231
 
  CFLAGS="${save_CFLAGS}"
232
257
  m4_if(PCT_USE_VISIBILITY,[yes],[
233
258
    PANDORA_ENABLE_VISIBILITY
 
259
    ],[
 
260
    PANDORA_CHECK_VISIBILITY
234
261
  ])
235
262
 
236
263
  PANDORA_HEADER_ASSERT
328
355
#endif
329
356
 
330
357
#if !defined(HAVE_ULONG) && !defined(__USE_MISC)
 
358
# define HAVE_ULONG 1
331
359
typedef unsigned long int ulong;
332
360
#endif
333
361