← Back to branch summary

~mordred/debian/sid/pandora-build/trunk

« back to all changes in this revision

Viewing changes to m4/pandora_canonical.m4

  • Committer: Monty Taylor
  • Date: 2010-12-16 16:00:16 UTC
  • mfrom: (68.1.184 pandora-build)
  • Revision ID: mordred@inaugust.com-20101216160016-4x9eddmat97dilgr
Merged trunk.

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.164])
 
7
AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.165])
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
  ],[
244
254
 
245
255
  PANDORA_HAVE_GCC_ATOMICS
246
256
 
247
 
  save_CFLAGS="${CFLAGS}"
248
 
  CFLAGS="${CFLAGS} -Werror"
249
 
  PANDORA_CHECK_VISIBILITY
250
 
  CFLAGS="${save_CFLAGS}"
251
257
  m4_if(PCT_USE_VISIBILITY,[yes],[
252
258
    PANDORA_ENABLE_VISIBILITY
 
259
    ],[
 
260
    PANDORA_CHECK_VISIBILITY
253
261
  ])
254
262
 
255
263
  PANDORA_HEADER_ASSERT