← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to m4/pandora_canonical.m4

  • Committer: Diego Medina
  • Date: 2009-10-05 04:05:29 UTC
  • mfrom: (1161 staging)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: diego.medina@sun.com-20091005040529-5g1qe9gxzslpgefd
resolved small merge issue

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.47])
 
7
AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.62])
8
8
 
9
9
AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
10
10
  dnl Force dependency tracking on for Sun Studio builds
23
23
  m4_define([PCT_REQUIRE_CXX],[no])
24
24
  m4_define([PCT_IGNORE_SHARED_PTR],[no])
25
25
  m4_define([PCT_FORCE_GCC42],[no])
 
26
  m4_define([PCT_SRC_IN_SRC],[no])
26
27
  m4_foreach([pct_arg],[$*],[
27
28
    m4_case(pct_arg,
28
29
      [use-gnulib], [
40
41
      [force-gcc42], [
41
42
        m4_undefine([PCT_FORCE_GCC42])
42
43
        m4_define([PCT_FORCE_GCC42],[yes])
 
44
      ],
 
45
      [src-in-src], [
 
46
        m4_undefine([PCT_SRC_IN_SRC])
 
47
        m4_define([PCT_SRC_IN_SRC],[yes])
43
48
    ])
44
49
  ])
45
50
 
54
59
  AC_CANONICAL_TARGET
55
60
  
56
61
  AM_INIT_AUTOMAKE(-Wall -Werror nostdinc subdir-objects)
 
62
  m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
57
63
 
58
64
  m4_if(PCT_USE_GNULIB,yes,[ gl_EARLY ])
59
65
  
64
70
  dnl Once we can use a modern autoconf, we can use this
65
71
  dnl AC_PROG_CC_C99
66
72
  AC_REQUIRE([AC_PROG_CXX])
67
 
  gl_USE_SYSTEM_EXTENSIONS
68
 
  AC_PROG_CPP
 
73
  PANDORA_EXTENSIONS
69
74
  AM_PROG_CC_C_O
70
75
 
71
76
 
94
99
    ])
95
100
  ])
96
101
  
97
 
  m4_if(PCT_USE_GNULIB, [yes], [gl_INIT])
 
102
  m4_if(PCT_USE_GNULIB, [yes], [
 
103
    gl_INIT
 
104
    AC_CONFIG_LIBOBJ_DIR([gnulib])
 
105
  ])
98
106
 
99
107
  AC_C_BIGENDIAN
100
108
  AC_C_CONST
137
145
    AM_CPPFLAGS="-I\$(top_srcdir)/gnulib -I\$(top_builddir)/gnulib ${AM_CPPFLAGS}"
138
146
    ])
139
147
  ])
 
148
  AS_IF([test "PCT_SRC_IN_SRC" = "yes"],[
 
149
    AM_CPPFLAGS="-I\$(top_srcdir)/src -I\$(top_builddir)/src ${AM_CPPFLAGS}"
 
150
  ])
140
151
 
141
152
  PANDORA_USE_PIPE
142
153