← Back to branch summary

~ubuntu-branches/ubuntu/vivid/nip2/vivid-proposed

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Jay Berkenbilt
  • Date: 2010-10-18 20:33:55 UTC
  • mfrom: (2.2.4 experimental) (2.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20101018203355-z2zmf7klex8n74fl
http://bugs.debian.org/600550
Add abrowser as an additional choice to satisfy the browser
dependency.  This removes differences between the Debian and Ubuntu
versions of the package.  (Closes: #600550)

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
9
9
dnl
10
10
 
11
11
m4_define([nip_major_version], [7])
12
 
m4_define([nip_minor_version], [20])
13
 
m4_define([nip_micro_version], [7])
 
12
m4_define([nip_minor_version], [22])
 
13
m4_define([nip_micro_version], [3])
14
14
m4_define([nip_version],
15
15
          [nip_major_version.nip_minor_version.nip_micro_version])
16
16
 
126
126
AC_SUBST(GETTEXT_PACKAGE)
127
127
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
128
128
        [The prefix for our gettext translation domains.])
129
 
ALL_LINGUAS="en_GB malkovich"
 
129
# ALL_LINGUAS="en_GB malkovich"
 
130
ALL_LINGUAS="en_GB"
130
131
AM_GLIB_GNU_GETTEXT
131
132
 
132
133
# check for flex ... nip needs to adjust itself a bit
137
138
# get packages we need
138
139
# gtk before 2.4.9 crashes with the way we use combobox :-(
139
140
PKG_CHECK_MODULES(REQUIRED_PACKAGES, 
140
 
  gthread-2.0 gtk+-2.0 >= 2.4.9 libxml-2.0 vips-7.20)
 
141
  gthread-2.0 gtk+-2.0 >= 2.4.9 libxml-2.0 vips-7.22)
141
142
IP_CFLAGS="$REQUIRED_PACKAGES_CFLAGS $IP_CFLAGS"
142
143
IP_LIBS="$REQUIRED_PACKAGES_LIBS $IP_LIBS"
143
144
 
341
342
use libgoffice to show plots:           $with_libgoffice
342
343
use gtksheet to show matrices:          $nip_use_gtksheet
343
344
  (requires gtk+-2.0 >= 2.18)
344
 
use gtkinfobar to show messages:        $nip_use_infobar
 
345
use gtkinfobar to show messages:        $nip_use_infobar
345
346
  (requires gtk+-2.0 >= 2.18)
346
347
allow regex searches:                   $nip_use_gregex
347
348
  (requires glib-2.0 >= 2.14)
348
 
display help files with xdg:    $XDG_OPEN
 
349
display help files with xdg:            $XDG_OPEN
349
350
])