← 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-08-18 16:12:58 UTC
  • mto: This revision was merged to the branch mainline in revision 1720.
  • Revision ID: brian@tangent.org-20100818161258-1vm71da888dfvwsx
Remove the code surrounding stack trace.

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.116])
 
7
AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.141])
8
8
 
9
9
AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
10
10
  AC_ARG_ENABLE([fat-binaries],
77
77
  AC_CANONICAL_TARGET
78
78
  
79
79
  m4_if(PCT_DONT_SUPRESS_INCLUDE,yes,[
80
 
    AM_INIT_AUTOMAKE(-Wall -Werror subdir-objects foreign)
 
80
    AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability subdir-objects foreign)
81
81
  ],[
82
 
    AM_INIT_AUTOMAKE(-Wall -Werror nostdinc subdir-objects foreign)
 
82
    AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability nostdinc subdir-objects foreign)
83
83
  ])
84
84
 
85
85
  m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
89
89
  ])
90
90
  
91
91
  AC_REQUIRE([AC_PROG_CC])
92
 
  AC_REQUIRE([PANDORA_MAC_GCC42])
 
92
  m4_if(PCT_FORCE_GCC42, [yes], [
 
93
    AC_REQUIRE([PANDORA_ENSURE_GCC_VERSION])
 
94
  ])
93
95
  AC_REQUIRE([PANDORA_64BIT])
94
96
 
95
97
  m4_if(PCT_VERSION_FROM_VC,yes,[
106
108
  AM_PROG_CC_C_O
107
109
 
108
110
 
109
 
  m4_if(PCT_FORCE_GCC42, [yes], [
110
 
    AS_IF([test "$GCC" = "yes"], PANDORA_ENSURE_GCC_VERSION)
111
 
  ])
112
111
 
113
112
  PANDORA_PLATFORM
114
113
 
178
177
  ])
179
178
 
180
179
  AC_CHECK_LIBM
 
180
  dnl Bug on FreeBSD - LIBM check doesn't set the damn variable
 
181
  AC_SUBST([LIBM])
181
182
  
182
183
  AC_CHECK_FUNC(setsockopt, [], [AC_CHECK_LIB(socket, setsockopt)])
183
184
  AC_CHECK_FUNC(bind, [], [AC_CHECK_LIB(bind, bind)])
222
223
 
223
224
  AM_CONDITIONAL(HAVE_DPKG_GENSYMBOLS,[test "x${DPKG_GENSYMBOLS}" != "x:"])
224
225
 
225
 
  PANDORA_WITH_GETTEXT
 
226
  m4_if(m4_substr(m4_esyscmd(test -d po && echo 0),0,1),0, [
 
227
    AM_PO_SUBDIRS
 
228
    IT_PROG_INTLTOOL([0.35],[no-xml])
 
229
    
 
230
    GETTEXT_PACKAGE=$PACKAGE
 
231
    AC_CHECK_LIB(intl, libintl_gettext)
 
232
    AC_SUBST([GETTEXT_PACKAGE])
 
233
    AS_IF([test "x${USE_NLS}" = "xyes"],
 
234
          [AC_DEFINE([ENABLE_NLS],[1],[Turn on language support])])
 
235
  ])
226
236
 
227
237
  AS_IF([test "x${gl_LIBOBJS}" != "x"],[
228
238
    AS_IF([test "$GCC" = "yes"],[