* Merge from Debian unstable. Remaining changes: - 02_use-decimal-si-by-default.patch: by default, display file sizes using decimal base and SI units instead of just bytes; complies with Ubuntu UnitsPolicy.
AC_MSG_ERROR([You need to use wxWidgets 2.8.x to compile this program.])
113
114
fi
114
115
116
AC_LANG_PUSH(C++)
117
CPPFLAGS_OLD="$CPPFLAGS"
118
CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
119
AC_MSG_CHECKING([positional printf argument support in wxWidgets])
120
AC_PREPROC_IFELSE(
121
AC_LANG_PROGRAM([[
122
#include <wx/wx.h>
123
#if !wxUSE_PRINTF_POS_PARAMS
124
#error wx compiled without wxUSE_PRINTF_POS_PARAMS
125
#endif
126
]]),
127
AC_MSG_RESULT([yes]),
128
[
129
AC_MSG_RESULT([no])
130
AC_MSG_FAILURE([Positional printf argument support in wxWidgets is required by FileZilla. Please rebuild wxWidgets and pass --enable-printfposparam to its configure script.])
131
]
132
)
133
CPPFLAGS="$CPPFLAGS_OLD"
134
AC_LANG_POP
135
115
136
AC_SUBST(WX_CONFIG_WITH_ARGS)
116
137
117
138
AC_CACHE_SAVE
279
300
AH_TEMPLATE(ENABLE_BINRELOC, [Define ENABLE_BINRELOC on systems where the executable
280
301
location can be obtained using /proc/self/maps])
281
302
AC_MSG_CHECKING([whether to use BinReloc])
282
if echo $host_os | grep -i "cygwin\|mingw\|mac" > /dev/null 2>&1 ; then
303
if echo $host_os | grep -i "cygwin\|mingw\|mac\|apple" > /dev/null 2>&1 ; then
283
304
use_binreloc=no
284
305
else
285
306
use_binreloc=yes
369
390
# TinyXML
370
391
# ------
371
392
372
AC_ARG_WITH(tinyxml, AC_HELP_STRING([--with-tinyxml=type], [Selects which version of tinyxml to use. Type has to be either system or builtin]),
373
[
374
if test "x$with_tinyxml" != "xbuiltin"; then
375
if test "x$with_tinyxml" != "xsystem"; then
376
AC_MSG_ERROR([--with-tinyxml has to be set to either builtin or system])
377
fi
378
fi
379
],
380
[
381
with_tinyxml=auto
382
])
383
384
if test "x$with_tinyxml" != "xbuiltin"; then
385
AC_HAVE_LIBRARY(tinyxml,
386
[
387
with_tinyxml=system
388
],
389
[
390
if test "x$with_tinyxml" = "xsystem"; then
391
AC_MSG_ERROR([tinyxml sytem library not found but requested])
392
else
393
with_tinyxml=builtin
394
fi
395
])
396
fi
397
398
if test "x$with_tinyxml" = "xsystem"; then
399
AC_MSG_NOTICE([Using system tinyxml])
400
AC_DEFINE(HAVE_LIBTINYXML, 1, [Define to 1 if your system has the `tinyxml' library (-ltinyxml).])
401
TINYXML_LIBS="-ltinyxml"
402
else
403
AC_MSG_NOTICE([Using builtin tinyxml])
404
TINYXML_LIBS="../tinyxml/libtinyxml.a"
405
fi
406
407
AC_SUBST(TINYXML_LIBS)
393
FZ_CHECK_TINYXML()
408
394
409
395
# Libdbus
410
396
# -------
417
403
])
418
404
419
405
if test "$with_dbus" = "auto"; then
420
if echo $WX_CPPFLAGS | grep __WXMAC__; then
406
if echo $WX_CPPFLAGS | grep __WXMAC__ > /dev/null 2>&1; then
421
407
with_dbus="no"
422
elif echo $WX_CPPFLAGS | grep __WXMSW__; then
408
elif echo $WX_CPPFLAGS | grep __WXMSW__ > /dev/null 2>&1; then
423
409
with_dbus="no"
424
410
else
425
411
with_dbus="yes"
449
435
AC_MSG_RESULT([$with_dbus])
450
436
451
437
# We want xdg-open on *nix
452
if echo "$WX_CPPFLAGS" | grep __WXGTK__; then
438
if echo "$WX_CPPFLAGS" | grep __WXGTK__ > /dev/null 2>&1; then