← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to m4/pandora_canonical.m4

  • Committer: Brian Aker
  • Date: 2009-12-09 01:09:43 UTC
  • mfrom: (1240.1.8 build)
  • Revision ID: brian@gaz-20091209010943-n5iq2b9ins7mx73j
Merge build

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/pandora_canonical.m4
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.73])
 
7
AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.83])
8
8
 
9
9
AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
10
10
  dnl Force dependency tracking on for Sun Studio builds
24
24
  m4_define([PCT_IGNORE_SHARED_PTR],[no])
25
25
  m4_define([PCT_FORCE_GCC42],[no])
26
26
  m4_define([PCT_SRC_IN_SRC],[no])
 
27
  m4_define([PCT_VERSION_FROM_VC],[no])
 
28
  m4_define([PCT_USE_VISIBILITY],[yes])
27
29
  m4_foreach([pct_arg],[$*],[
28
30
    m4_case(pct_arg,
29
31
      [use-gnulib], [
42
44
        m4_undefine([PCT_FORCE_GCC42])
43
45
        m4_define([PCT_FORCE_GCC42],[yes])
44
46
      ],
 
47
      [skip-visibility], [
 
48
        m4_undefine([PCT_USE_VISIBILITY])
 
49
        m4_define([PCT_USE_VISIBILITY],[no])
 
50
      ],
45
51
      [src-in-src], [
46
52
        m4_undefine([PCT_SRC_IN_SRC])
47
53
        m4_define([PCT_SRC_IN_SRC],[yes])
 
54
      ],
 
55
      [version-from-vc], [
 
56
        m4_undefine([PCT_VERSION_FROM_VC])
 
57
        m4_define([PCT_VERSION_FROM_VC],[yes])
48
58
    ])
49
59
  ])
50
60
 
67
77
  AC_REQUIRE([PANDORA_MAC_GCC42])
68
78
  AC_REQUIRE([PANDORA_64BIT])
69
79
 
 
80
  m4_if(PCT_VERSION_FROM_VC,yes,[
 
81
    PANDORA_VC_VERSION
 
82
  ])
 
83
  PANDORA_VERSION
 
84
 
70
85
  dnl Once we can use a modern autoconf, we can use this
71
86
  dnl AC_PROG_CC_C99
72
87
  AC_REQUIRE([AC_PROG_CXX])
154
169
  dnl alloca - but we need to know it anyway for check_stack_overrun.
155
170
  PANDORA_STACK_DIRECTION
156
171
 
 
172
  save_LIBS="${LIBS}"
 
173
  LIBS=""
 
174
  AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
 
175
  LIBM="${LIBS}"
 
176
  LIBS="${save_LIBS}"
 
177
  AC_SUBST([LIBM])
 
178
  
 
179
  AC_CHECK_FUNC(setsockopt, [], [AC_CHECK_LIB(socket, setsockopt)])
 
180
  AC_CHECK_FUNC(bind, [], [AC_CHECK_LIB(bind, bind)])
 
181
 
 
182
 
 
183
 
157
184
  PANDORA_OPTIMIZE
158
185
 
159
186
  AC_LANG_PUSH(C++)
169
196
 
170
197
  PANDORA_HAVE_GCC_ATOMICS
171
198
 
172
 
  dnl We need to inject error into the cflags to test if visibility works or not
173
 
  dnl save_CFLAGS="${CFLAGS}"
174
 
  dnl CFLAGS="${CFLAGS} -Werror"
175
 
  dnl gl_VISIBILITY
176
 
  dnl CFLAGS="${save_CFLAGS}"
 
199
  m4_if(PCT_USE_VISIBILITY,[yes],[
 
200
    dnl We need to inject error into the cflags to test if visibility works or not
 
201
    save_CFLAGS="${CFLAGS}"
 
202
    CFLAGS="${CFLAGS} -Werror"
 
203
    gl_VISIBILITY
 
204
    CFLAGS="${save_CFLAGS}"
 
205
  ])
177
206
 
178
207
  PANDORA_HEADER_ASSERT
179
208