← Back to branch summary

~ubuntu-branches/ubuntu/maverick/pango1.0/maverick-proposed

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2009-11-18 07:40:39 UTC
  • mfrom: (1.5.8 upstream) (64.2.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091118074039-7d88ewja7jajppz6
Tags: 1.26.1-1
New upstream bugfix release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
22
22
dnl The triplet 
23
23
m4_define([pango_version_major], [1])
24
24
m4_define([pango_version_minor], [26])
25
 
m4_define([pango_version_micro], [0])
 
25
m4_define([pango_version_micro], [1])
26
26
 
27
27
m4_define([pango_version],
28
28
          [pango_version_major.pango_version_minor.pango_version_micro])
228
228
 
229
229
AM_CONDITIONAL(CROSS_COMPILING, [test $cross_compiling = yes])
230
230
 
231
 
# define a MAINT-like variable REBUILD which is set if Perl
232
 
# is found, so autogenerated sources can be rebuilt
233
 
 
234
 
AC_CHECK_PROGS(PERL, perl5 perl)
235
 
 
236
 
REBUILD=\#
237
 
if test "x$enable_rebuilds" = "xyes" && \
238
 
     test -n "$PERL" && \
239
 
     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
240
 
  REBUILD=
241
 
fi
242
 
AC_SUBST(REBUILD)
243
 
 
244
231
have_x=false
245
232
if test "x$pango_os_win32" != xyes; then
246
233
  AC_PATH_XTRA
368
355
PKG_CHECK_MODULES(CAIRO, cairo >= $cairo_required, have_cairo=true, AC_MSG_RESULT([no]))
369
356
   
370
357
if $have_cairo ; then
371
 
  m4_pattern_allow([PKG_CONFIG_DISABLE_UNINSTALLED])
372
 
  INSTALLED_CAIRO_LIBS=`PKG_CONFIG_DISABLE_UNINSTALLED=yes $PKG_CONFIG --libs cairo`
373
358
  pango_save_libs=$LIBS
374
 
  LIBS="$LIBS $INSTALLED_CAIRO_LIBS"
 
359
  LIBS="$LIBS $CAIRO_LIBS"
375
360
  pango_save_ldflags=$LDFLAGS
376
 
  LDFLAGS="$LDFLAGS $INSTALLED_CAIRO_LIBS"
 
361
  LDFLAGS="$LDFLAGS $CAIRO_LIBS"
377
362
 
378
363
  have_cairo=false
379
364
  cairo_font_backends=""
472
457
*** Glib $GLIB_REQUIRED_VERSION or better is required. The latest version of 
473
458
*** Glib is always available from ftp://ftp.gtk.org/.]))
474
459
 
 
460
# Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled.
 
461
GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
 
462
AC_SUBST(GLIB_MKENUMS)
 
463
 
 
464
 
475
465
# Add in gthread-2.0 to CFLAGS but not to LIBS so we get any
476
466
# necesary defines for thread-safety.
477
467
GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0`