← 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: 2010-01-04 00:33:03 UTC
  • mfrom: (1259.3.7 remove-mydir)
  • Revision ID: brian@gaz-20100104003303-wkp8mbm5991kxro8
Merge Monty

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.89])
 
7
AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.92])
8
8
 
9
9
AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
 
10
  AC_ARG_ENABLE([fat-binaries],
 
11
    [AS_HELP_STRING([--enable-fat-binaries],
 
12
      [Enable fat binary support on OSX @<:@default=off@:>@])],
 
13
    [ac_enable_fat_binaries="$enableval"],
 
14
    [ac_enable_fat_binaries="no"])
 
15
 
10
16
  dnl Force dependency tracking on for Sun Studio builds
11
17
  AS_IF([test "x${enable_dependency_tracking}" = "x"],[
12
18
    enable_dependency_tracking=yes
13
19
  ])
 
20
  dnl If we're building OSX Fat Binaries, we have to turn off -M options
 
21
  AS_IF([test "x${ac_enable_fat_binaries}" = "xyes"],[
 
22
    enable_dependency_tracking=no
 
23
  ])
14
24
])
15
25
 
16
26
dnl The standard setup for how we build Pandora projects
195
205
    dnl We need to inject error into the cflags to test if visibility works or not
196
206
    save_CFLAGS="${CFLAGS}"
197
207
    CFLAGS="${CFLAGS} -Werror"
198
 
    gl_VISIBILITY
 
208
    PANDORA_VISIBILITY
199
209
    CFLAGS="${save_CFLAGS}"
200
210
  ])
201
211
 
232
242
  AC_SUBST([AM_CFLAGS])
233
243
  AC_SUBST([AM_CXXFLAGS])
234
244
  AC_SUBST([AM_CPPFLAGS])
 
245
  AC_SUBST([AM_LDFLAGS])
235
246
 
236
247
])