← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gimp/oneiric

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2009-08-31 10:24:10 UTC
  • mfrom: (1.1.21 upstream) (0.1.5 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090831102410-eqawgw6fhdyi91ee
Tags: 2.6.7-1ubuntu1
https://launchpad.net/bugs/419593
* Merge with Debian unstable (LP: #419593), remaining changes:
  - debian/patches/02_help-message.patch,
    debian/patches/03_gimp.desktop.in.in.patch:
    + updated some strings for ubuntu
  - debian/rules:
    + updated translation templates
  - debian/control:
    + Drop webkit build dependency. gimp is the only thing pulling in webkit
      for the desktop CDs, and makes them explode. Without the webkit help
      browser plugin, help will just be displayed in the default browser.
* debian/patches/01_debian-gimprc.patch:
  - Updated
* debian/control:
  - Added a BZR link

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
8
8
 
9
9
m4_define([gimp_major_version], [2])
10
10
m4_define([gimp_minor_version], [6])
11
 
m4_define([gimp_micro_version], [6])
 
11
m4_define([gimp_micro_version], [7])
12
12
m4_define([gimp_real_version],
13
13
          [gimp_major_version.gimp_minor_version.gimp_micro_version])
14
14
m4_define([gimp_version], [gimp_real_version])
15
 
m4_define([gimp_interface_age], [6])
 
15
m4_define([gimp_interface_age], [7])
16
16
m4_define([gimp_binary_age],
17
17
          [m4_eval(100 * gimp_minor_version + gimp_micro_version)])
18
18
 
49
49
m4_define([fontconfig_required_version], [2.2.0])
50
50
m4_define([cairo_required_version], [1.4.10])
51
51
m4_define([gtkdoc_required_version], [1.0])
52
 
m4_define([webkit_required_version], [0.1])
 
52
m4_define([webkit_required_version], [1.1.0])
53
53
m4_define([alsa_required_version], [1.0.0])
54
54
m4_define([rsvg_required_version], [2.14.0])
55
55
m4_define([wmf_required_version], [0.2.8])
389
389
AC_FUNC_ALLOCA
390
390
 
391
391
# check some more funcs
 
392
AC_CHECK_FUNCS(fsync)
392
393
AC_CHECK_FUNCS(difftime mmap)
393
394
 
 
395
 
394
396
AM_BINRELOC
395
397
 
396
398
 
1239
1241
  have_webkit="no (WebKit support disabled)"
1240
1242
fi
1241
1243
 
1242
 
if test "x$have_webkit" = xyes; then
1243
 
  gimp_save_LIBS=$LIBS
1244
 
  LIBS="$LIBS $WEBKIT_LIBS"
1245
 
  AC_CHECK_LIB(webkit-1.0, webkit_web_view_set_zoom_level,
1246
 
               [AC_DEFINE(HAVE_WEBKIT_ZOOM_API, 1,
1247
 
                          [Define to 1 if webkit has zoom API])])
1248
 
  LIBS=$gimp_save_LIBS
1249
 
fi
1250
 
 
1251
1244
AM_CONDITIONAL(BUILD_HELP_BROWSER, test "x$have_webkit" = xyes)
1252
1245
 
1253
1246