← Back to branch summary

~ubuntu-branches/debian/sid/filezilla/sid

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Adrien Cunin
  • Date: 2010-02-09 08:52:27 UTC
  • mfrom: (1.3.6 upstream) (4.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100209085227-19gbhws21ct6jjm9
https://launchpad.net/bugs/447224
https://launchpad.net/bugs/497836
* New upstream release (LP: #447224, #497836)
* Added dpatch
* Added 01_remove-xdg-check.dpatch: patch configure and configure.in so that
  it doesn't fail if xdg-open is not present at build time
* Recommend xdg-utils

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
1
 
AC_INIT(FileZilla, 3.3.0.1, tim.kosse@filezilla-project.org)
 
1
AC_INIT(FileZilla, 3.3.1, tim.kosse@filezilla-project.org)
2
2
AC_CONFIG_HEADERS([src/include/config.h])
3
3
AC_CONFIG_AUX_DIR(config)
4
4
AM_INIT_AUTOMAKE([dist-bzip2])
91
91
 
92
92
  AM_OPTIONS_WXCONFIG
93
93
 
94
 
  MIN_WX_VERSION="2.8.6"
95
 
  AM_PATH_WXCONFIG($MIN_WX_VERSION, wxWin=1, , [aui,xrc,adv,core,xml,net,base])
 
94
  MIN_WX_VERSION="2.8.9"
 
95
  AM_PATH_WXCONFIG($MIN_WX_VERSION, wxWin=1, , [aui,xrc,adv,core,xml,net,base], [--unicode=yes, --universal=no])
96
96
  if test "$wxWin" != 1; then
97
97
        AC_MSG_ERROR([
98
98
                wxWidgets must be installed on your system
99
 
                but wx-config script couldn't be found.
 
99
                but either the wx-config script couldn't be found or
 
100
                no compatible wxWidgets configuration has been insalled.
 
101
 
 
102
                Compatible wxWidgets configurations are the unicode builds
 
103
                of wxGTK, wxMac and wxMSW.
100
104
 
101
105
                Please check that wx-config is in path, the directory
102
106
                where wxWidgets libraries are installed (returned by
443
447
  AC_MSG_CHECKING([D-Bus support])
444
448
  AC_MSG_RESULT([$with_dbus])
445
449
 
 
450
  # We want xdg-open on *nix
 
451
  if echo "$WX_CPPFLAGS" | grep __WXGTK__; then
 
452
 
 
453
    AC_PATH_PROG(xdgopen, xdg-open)
 
454
    if test -z "$xdgopen"; then
 
455
      AC_MSG_ERROR([xdg-open not found. This program is the preferred way to launch the default browser. Please install the xdg-utils.])
 
456
    fi
 
457
  fi
446
458
 
447
459
  # Some more obscure platforms (e.g. HP-UX) don't have setenv which is required by POSIX
448
460
  AC_CHECK_FUNC(setenv, [AC_DEFINE([HAVE_SETENV], [1], [Define to 1 if setenv function is available.])], [])