← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to m4/pandora_canonical.m4

  • Committer: Monty Taylor
  • Date: 2010-07-30 06:58:29 UTC
  • mfrom: (1667.4.12 use-intltool)
  • mto: This revision was merged to the branch mainline in revision 1676.
  • Revision ID: mordred@inaugust.com-20100730065829-xu5n0qk2zzpwy73m
Merged in solaris fixes (oh yeah, and intltool)

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.136])
 
7
AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.138])
8
8
 
9
9
AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
10
10
  AC_ARG_ENABLE([fat-binaries],
223
223
 
224
224
  AM_CONDITIONAL(HAVE_DPKG_GENSYMBOLS,[test "x${DPKG_GENSYMBOLS}" != "x:"])
225
225
 
226
 
  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
    dnl AS_IF([test "x{TARGET_SOLARIS}" = "xyes"], [USE_NLS="no"])
 
231
    GETTEXT_PACKAGE=$PACKAGE
 
232
    AC_SUBST([GETTEXT_PACKAGE])
 
233
    AS_IF([test "x${USE_NLS}" = "xyes"],
 
234
          [AC_DEFINE([ENABLE_NLS],[1],[Turn on language support])])
 
235
  ])
227
236
 
228
237
  AS_IF([test "x${gl_LIBOBJS}" != "x"],[
229
238
    AS_IF([test "$GCC" = "yes"],[