#! /bin/sh
-# From configure.in Id.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for wxWidgets 2.9.5.
+# Generated by GNU Autoconf 2.69 for wxWidgets 2.9.5.
#
# Report bugs to <wx-dev@lists.wxwidgets.org>.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
LIBWXMACRES
WX_RESOURCES_MACOSX_DATA
WX_RESOURCES_MACOSX_ASCII
-RESPROGRAMOBJ
-RESFLAGS
RESCOMP
WX_VERSION_TAG
DMALLOC_LIBS
TOOLCHAIN_NAME
TOOLKIT_DIR
TOOLKIT
-WIN32INSTALL
-AFMINSTALL
USE_GUI
WX_LIBRARY_BASENAME_GUI
WX_LIBRARY_BASENAME_NOGUI
COND_wxUSE_LIBPNG_builtin
COND_wxUSE_LIBJPEG_builtin
COND_wxUSE_EXPAT_builtin
-COND_WXUSE_ZLIB_BUILTIN
-COND_WXUSE_REGEX_BUILTIN
-COND_WXUSE_LIBTIFF_BUILTIN
-COND_WXUSE_LIBPNG_BUILTIN
-COND_WXUSE_LIBJPEG_BUILTIN
-COND_WXUSE_EXPAT_BUILTIN
COND_WXUNIV_1
COND_WXUNIV_0
COND_WITH_PLUGIN_SDL_1
COND_USE_GUI_1_wxUSE_LIBTIFF_builtin
COND_USE_GUI_1_wxUSE_LIBPNG_builtin
COND_USE_GUI_1_wxUSE_LIBJPEG_builtin
-COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
-COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
-COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
COND_USE_GUI_1_WXUNIV_1
COND_USE_GUI_1_WXUNIV_0
COND_USE_GUI_1_USE_OPENGL_1
COND_USE_EXCEPTIONS_0
COND_USE_CAIRO_1
COND_UNICODE_1
+COND_TOOLKIT_X11_WXUNIV_1
+COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1
COND_TOOLKIT_X11_USE_GUI_1
COND_TOOLKIT_X11
COND_TOOLKIT_WINCE_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2
COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
COND_SHARED_0
+COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
+COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3
+COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
+COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
COND_PLATFORM_WIN32_1_SHARED_0
COND_PLATFORM_WIN32_1
+COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3
COND_PLATFORM_WIN32_0
COND_PLATFORM_UNIX_1_USE_PLUGINS_0
COND_PLATFORM_UNIX_1_USE_GUI_1
COND_PLATFORM_MSDOS_0
COND_PLATFORM_MAC_1
COND_PLATFORM_MAC_0
-COND_PLATFORM_MACOS_1
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
COND_PLATFORM_MACOSX_1_USE_OPENGL_1
COND_PLATFORM_MACOSX_1_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1
+COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
+COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3
+COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
+COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0
COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0
COND_PLATFORM_MACOSX_1
COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1
COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1
COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1
+COND_MONOLITHIC_1_USE_STC_1
COND_MONOLITHIC_1_SHARED_1
COND_MONOLITHIC_1_SHARED_0
COND_MONOLITHIC_1
COND_DEPS_TRACKING_0
COND_DEBUG_INFO_1
COND_DEBUG_INFO_0
-COND_DEBUG_FLAG_1
COND_DEBUG_FLAG_0
-COND_BUILD_release_UNICODE_1
-COND_BUILD_release_UNICODE_0
COND_BUILD_release_DEBUG_INFO_default
COND_BUILD_release
-COND_BUILD_debug_UNICODE_1
-COND_BUILD_debug_UNICODE_0
COND_BUILD_debug_DEBUG_INFO_default
-COND_BUILD_debug_DEBUG_FLAG_default
COND_BUILD_debug
-COND_BUILD_RELEASE_UNICODE_1
-COND_BUILD_RELEASE_UNICODE_0
-COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT
-COND_BUILD_RELEASE
-COND_BUILD_DEBUG_UNICODE_1
-COND_BUILD_DEBUG_UNICODE_0
-COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT
-COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT
-COND_BUILD_DEBUG
BK_MAKE_PCH
ICC_PCH_USE_SWITCH
ICC_PCH_CREATE_SWITCH
DEBUG_FLAG
DEBUG_INFO
UNICODE
-EXTRALIBS_HILDON
-EXTRALIBS_GNOMEVFS
-EXTRALIBS_GNOMEPRINT
-EXTRALIBS_GTKPRINT
WITH_PLUGIN_SDL
EXTRALIBS_STC
EXTRALIBS_SDL
HILDON2_CFLAGS
HILDON_LIBS
HILDON_CFLAGS
+LIBNOTIFY_LIBS
+LIBNOTIFY_CFLAGS
GNOMEVFS_LIBS
GNOMEVFS_CFLAGS
LIBGNOMEPRINTUI_LIBS
with_libpng
with_libjpeg
with_libtiff
+with_libjbig
+with_liblzma
with_libxpm
with_libiconv
with_libmspack
with_gtkprint
with_gnomeprint
with_gnomevfs
+with_libnotify
with_hildon
with_opengl
with_dmalloc
enable_fs_archive
enable_fs_inet
enable_fs_zip
+enable_fsvolume
enable_fswatcher
enable_geometry
enable_log
enable_notifmsg
enable_odcombobox
enable_popupwin
+enable_prefseditor
enable_radiobox
enable_radiobtn
enable_richmsgdlg
LIBGNOMEPRINTUI_LIBS
GNOMEVFS_CFLAGS
GNOMEVFS_LIBS
+LIBNOTIFY_CFLAGS
+LIBNOTIFY_LIBS
HILDON_CFLAGS
HILDON_LIBS
HILDON2_CFLAGS
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
--enable-fs_archive use virtual archive filesystems
--enable-fs_inet use virtual HTTP/FTP filesystems
--enable-fs_zip now replaced by fs_archive
+ --enable-fsvolume use wxFSVolume class
--enable-fswatcher use wxFileSystemWatcher class
--enable-geometry use geometry class
--enable-log use logging system
--enable-notifmsg use wxNotificationMessage class
--enable-odcombobox use wxOwnerDrawnComboBox class
--enable-popupwin use wxPopUpWindow class
+ --enable-prefseditor use wxPreferencesEditor class
--enable-radiobox use wxRadioBox class
--enable-radiobtn use wxRadioButton class
--enable-richmsgdlg use wxRichMessageDialog class
--enable-accessibility enable accessibility support
--enable-uiactionsim use wxUIActionSimulator (experimental)
--enable-dctransform use wxDC::SetTransformMatrix and related
- --enable-webview-webkit use wxWebView WebKit backend
+ --enable-webviewwebkit use wxWebView WebKit backend
--enable-palette use wxPalette class
--enable-image use wxImage class
--enable-gif use gif images (GIF file format)
--enable-ownerdrawn use owner drawn controls (Win32 and OS/2 only)
--enable-uxtheme enable support for Windows XP themed look (Win32 only)
--enable-wxdib use wxDIB class (Win32 only)
- --enable-webview-ie use wxWebView IE backend (Win32 only)
+ --enable-webviewie use wxWebView IE backend (Win32 only)
--enable-autoidman use automatic ids management
--disable-largefile omit support for large files
--disable-gtktest do not try to compile and run a test GTK+ program
--with-libpng use libpng (PNG image format)
--with-libjpeg use libjpeg (JPEG file format)
--with-libtiff use libtiff (TIFF file format)
+ --without-libjbig don't use libjbig in libtiff even if available)
+ --without-liblzma don't use liblzma in libtiff even if available)
--with-libxpm use libxpm (XPM file format)
--with-libiconv use libiconv (character conversion)
--with-libmspack use libmspack (CHM help files loading)
--without-gtkprint don't use GTK printing support
--without-gnomeprint don't use GNOME printing libraries
--with-gnomevfs use GNOME VFS for associating MIME types
+ --with-libnotify use libnotify for notifications
--with-hildon use Hildon framework for Nokia 770/800/810
--with-opengl use OpenGL (or Mesa)
--with-dmalloc use dmalloc library (http://dmalloc.com/)
C compiler flags for GNOMEVFS, overriding pkg-config
GNOMEVFS_LIBS
linker flags for GNOMEVFS, overriding pkg-config
+ LIBNOTIFY_CFLAGS
+ C compiler flags for LIBNOTIFY, overriding pkg-config
+ LIBNOTIFY_LIBS
+ linker flags for LIBNOTIFY, overriding pkg-config
HILDON_CFLAGS
C compiler flags for HILDON, overriding pkg-config
HILDON_LIBS linker flags for HILDON, overriding pkg-config
if $ac_init_version; then
cat <<\_ACEOF
wxWidgets configure 2.9.5
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
} # ac_fn_c_check_header_compile
+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_cxx_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_cxx_check_header_compile
+
# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
# --------------------------------------------
# Tries to find the compile-time value of EXPR in a program that includes
main ()
{
static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
main ()
{
static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
main ()
{
static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
main ()
{
static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
main ()
{
static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
} # ac_fn_c_compute_int
-# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
-# ---------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_cxx_check_header_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_cxx_check_header_compile
-
# ac_fn_cxx_check_type LINENO TYPE VAR INCLUDES
# ---------------------------------------------
# Tests whether TYPE exists after having included INCLUDES, setting cache
running configure, to aid debugging if configure makes a mistake.
It was created by wxWidgets $as_me 2.9.5, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
$as_echo "#define TARGET_CARBON 1" >>confdefs.h
- DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
+ DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1
;;
*-*-beos* )
fi
+ withstring=without
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$withstring" = xwithout; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-libjbig" >&5
+$as_echo_n "checking for --${withstring:-with}-libjbig... " >&6; }
+
+# Check whether --with-libjbig was given.
+if test "${with_libjbig+set}" = set; then :
+ withval=$with_libjbig;
+ if test "$withval" = yes; then
+ wx_cv_use_libjbig='wxUSE_LIBJBIG=yes'
+ else
+ wx_cv_use_libjbig='wxUSE_LIBJBIG=no'
+ fi
+
+else
+
+ wx_cv_use_libjbig='wxUSE_LIBJBIG=${'DEFAULT_wxUSE_LIBJBIG":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_libjbig"
+
+ if test x"$withstring" = xwithout; then
+ if test $wxUSE_LIBJBIG = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_LIBJBIG
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
+ withstring=without
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$withstring" = xwithout; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-liblzma" >&5
+$as_echo_n "checking for --${withstring:-with}-liblzma... " >&6; }
+
+# Check whether --with-liblzma was given.
+if test "${with_liblzma+set}" = set; then :
+ withval=$with_liblzma;
+ if test "$withval" = yes; then
+ wx_cv_use_liblzma='wxUSE_LIBLZMA=yes'
+ else
+ wx_cv_use_liblzma='wxUSE_LIBLZMA=no'
+ fi
+
+else
+
+ wx_cv_use_liblzma='wxUSE_LIBLZMA=${'DEFAULT_wxUSE_LIBLZMA":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_liblzma"
+
+ if test x"$withstring" = xwithout; then
+ if test $wxUSE_LIBLZMA = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_LIBLZMA
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libxpm" >&5
$as_echo_n "checking for --with-libxpm... " >&6; }
$as_echo "$result" >&6; }
+ withstring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$withstring" = xwithout; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-libnotify" >&5
+$as_echo_n "checking for --${withstring:-with}-libnotify... " >&6; }
+
+# Check whether --with-libnotify was given.
+if test "${with_libnotify+set}" = set; then :
+ withval=$with_libnotify;
+ if test "$withval" = yes; then
+ wx_cv_use_libnotify='wxUSE_LIBNOTIFY=yes'
+ else
+ wx_cv_use_libnotify='wxUSE_LIBNOTIFY=no'
+ fi
+
+else
+
+ wx_cv_use_libnotify='wxUSE_LIBNOTIFY=${'DEFAULT_wxUSE_LIBNOTIFY":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_libnotify"
+
+ if test x"$withstring" = xwithout; then
+ if test $wxUSE_LIBNOTIFY = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_LIBNOTIFY
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
withstring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
$as_echo "$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-fsvolume" >&5
+$as_echo_n "checking for --${enablestring:-enable}-fsvolume... " >&6; }
+ # Check whether --enable-fsvolume was given.
+if test "${enable_fsvolume+set}" = set; then :
+ enableval=$enable_fsvolume;
+ if test "$enableval" = yes; then
+ wx_cv_use_fsvolume='wxUSE_FSVOLUME=yes'
+ else
+ wx_cv_use_fsvolume='wxUSE_FSVOLUME=no'
+ fi
+
+else
+
+ wx_cv_use_fsvolume='wxUSE_FSVOLUME=${'DEFAULT_wxUSE_FSVOLUME":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_fsvolume"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_FSVOLUME = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_FSVOLUME
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
$as_echo "$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-prefseditor" >&5
+$as_echo_n "checking for --${enablestring:-enable}-prefseditor... " >&6; }
+ # Check whether --enable-prefseditor was given.
+if test "${enable_prefseditor+set}" = set; then :
+ enableval=$enable_prefseditor;
+ if test "$enableval" = yes; then
+ wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=yes'
+ else
+ wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=no'
+ fi
+
+else
+
+ wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=${'DEFAULT_wxUSE_PREFERENCES_EDITOR":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_prefseditor"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_PREFERENCES_EDITOR = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_PREFERENCES_EDITOR
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
if test "x$OSX_ARCH_OPTS" != "x"; then
if echo $OSX_ARCH_OPTS | grep -q ","; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling dependency tracking due to universal binary build." >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling dependency tracking due to universal binary build." >&5
$as_echo "$as_me: WARNING: Disabling dependency tracking due to universal binary build." >&2;}
disable_macosx_deps=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling precompiled headers due to universal binary build." >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling precompiled headers due to universal binary build." >&5
$as_echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;}
- bk_use_pch=no
+ bk_use_pch=no
fi
OSX_ARCH_OPTS=`echo $OSX_ARCH_OPTS | sed -e 's/^/-arch /' -e 's/,/ -arch /g'`
USE_WIN32=1
$as_echo "#define __WIN32__ 1" >>confdefs.h
- $as_echo "#define __WIN95__ 1" >>confdefs.h
-
$as_echo "#define __WINDOWS__ 1" >>confdefs.h
$as_echo "#define __GNUWIN32__ 1" >>confdefs.h
LIBS="$LIBS -lcExt"
fi
- else
- RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc/libc version" >&5
$as_echo_n "checking for gcc/libc version... " >&6; }
wxUSE_OMF=yes
enable_omf=yes
fi
- ;;
- *)
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasecmp() in string.h" >&5
-$as_echo_n "checking for strcasecmp() in string.h... " >&6; }
-if ${ac_cv_string_strcasecmp+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <string.h>
-
-int
-main ()
-{
-
- strcasecmp("foo", "bar");
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_string_strcasecmp=yes
-else
- ac_cv_string_strcasecmp=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_string_strcasecmp" >&5
-$as_echo "$ac_cv_string_strcasecmp" >&6; }
-
- if test x"$ac_cv_string_strcasecmp" = "xyes"; then
- $as_echo "#define HAVE_STRCASECMP_IN_STRING_H 1" >>confdefs.h
-
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasecmp() in strings.h" >&5
-$as_echo_n "checking for strcasecmp() in strings.h... " >&6; }
-if ${ac_cv_strings_strcasecmp+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <strings.h>
-
-int
-main ()
-{
-
- strcasecmp("foo", "bar");
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_strings_strcasecmp=yes
-else
- ac_cv_strings_strcasecmp=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_strings_strcasecmp" >&5
-$as_echo "$ac_cv_strings_strcasecmp" >&6; }
-
- if test x"$ac_cv_strings_strcasecmp" = "xyes"; then
- $as_echo "#define HAVE_STRCASECMP_IN_STRINGS_H 1" >>confdefs.h
-
- else
- as_fn_error $? "No case-insensitive string comparison function found." "$LINENO" 5
- fi
- fi
-
;;
esac
esac
if test "$USE_UNIX" = 1 ; then
- for ac_header in sys/select.h
+ for ac_header in sys/select.h
do :
ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default
"
done
+
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ for ac_header in cxxabi.h
+do :
+ ac_fn_cxx_check_header_compile "$LINENO" "cxxabi.h" "ac_cv_header_cxxabi_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_cxxabi_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_CXXABI_H 1
+_ACEOF
+
+fi
+
+done
+
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
fi
int
main ()
{
-/* FIXME: Include the comments suggested by Paul. */
+
#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
+ /* Ultrix mips cc rejects this sort of thing. */
typedef int charset[2];
- const charset cs;
+ const charset cs = { 0, 0 };
/* SunOS 4.1.1 cc rejects this. */
char const *const *pcpcc;
char **ppc;
++pcpcc;
ppc = (char**) pcpcc;
pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
+ { /* SCO 3.2v4 cc rejects this sort of thing. */
+ char tx;
+ char *t = &tx;
char const *s = 0 ? (char *) 0 : (char const *) 0;
*t++ = 0;
iptr p = 0;
++p;
}
- { /* AIX XL C 1.02.0.0 rejects this saying
+ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
"k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
+ struct s { int j; const int *ap[3]; } bx;
+ struct s *b = &bx; b->j = 5;
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
fi
+else
+ $as_echo "#define wxNO_VARIADIC_MACROS 1" >>confdefs.h
+
fi
LARGEFILE_CPPFLAGS=
ac_configure_args="$ac_configure_args --disable-jpeg"
fi
+ if test "$wxUSE_LIBLZMA" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5
+$as_echo_n "checking for lzma_code in -llzma... " >&6; }
+if ${ac_cv_lib_lzma_lzma_code+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-llzma $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char lzma_code ();
+int
+main ()
+{
+return lzma_code ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_lzma_lzma_code=yes
+else
+ ac_cv_lib_lzma_lzma_code=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_code" >&5
+$as_echo "$ac_cv_lib_lzma_lzma_code" >&6; }
+if test "x$ac_cv_lib_lzma_lzma_code" = xyes; then :
+ LIBS="$LIBS -llzma"
+fi
+
+ else
+ ac_configure_args="$ac_configure_args --disable-lzma"
+ fi
+
+ if test "$wxUSE_LIBJBIG" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jbg_dec_init in -ljbig" >&5
+$as_echo_n "checking for jbg_dec_init in -ljbig... " >&6; }
+if ${ac_cv_lib_jbig_jbg_dec_init+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljbig $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jbg_dec_init ();
+int
+main ()
+{
+return jbg_dec_init ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_jbig_jbg_dec_init=yes
+else
+ ac_cv_lib_jbig_jbg_dec_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jbig_jbg_dec_init" >&5
+$as_echo "$ac_cv_lib_jbig_jbg_dec_init" >&6; }
+if test "x$ac_cv_lib_jbig_jbg_dec_init" = xyes; then :
+ LIBS="$LIBS -ljbig"
+fi
+
+ else
+ ac_configure_args="$ac_configure_args --disable-jbig"
+ fi
+
+
subdirs="$subdirs src/tiff"
-AFMINSTALL=
-WIN32INSTALL=
-
TOOLKIT=
TOOLKIT_INCLUDE=
WIDGET_SET=
LIBS="$LIBS -lkernel32 -luser32"
esac
- RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
- RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
-
- WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
-
- WIN32INSTALL=win32install
+ WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
fi
if test "$wxUSE_GUI" = "yes"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
- pkg_config_args=gtk+-3.0
+ pkg_gtk_version=gtk+-3.0
+ pkg_config_args=$pkg_gtk_version
for module in . $GTK_MODULES
do
case "$module" in
gthread)
- pkg_config_args="$pkg_config_args gthread-2.0"
+ pkg_gthread_version=gthread-2.0
+ pkg_config_args="$pkg_config_args $pkg_gthread_version"
;;
esac
done
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
enable_gtktest=no
fi
-
- if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+ if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_gtk_version ; then
:
else
no_gtk=yes
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
- AFMINSTALL=afminstall
TOOLKIT=GTK
GUIDIST=GTK_DIST
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
wxUSE_UNIVERSAL="yes"
- AFMINSTALL=afminstall
TOOLKIT=MICROWIN
GUIDIST=MICROWIN_DIST
GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'`
TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
- AFMINSTALL=afminstall
COMPILED_X_PROGRAM=0
fi
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-for ac_func in wcsdup wcsftime strnlen wcsnlen wcscasecmp wcsncasecmp
+for ac_func in wcsftime
+do :
+ ac_fn_c_check_func "$LINENO" "wcsftime" "ac_cv_func_wcsftime"
+if test "x$ac_cv_func_wcsftime" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_WCSFTIME 1
+_ACEOF
+
+fi
+done
+
+
+if test "$wxUSE_MAC" != 1; then
+ for ac_func in strnlen wcsdup wcsnlen wcscasecmp wcsncasecmp
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
fi
done
+fi
if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
$as_echo_n "(cached) " >&6
else
- ac_ext=cpp
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5
+$as_echo_n "checking for library containing backtrace... " >&6; }
+if ${ac_cv_search_backtrace+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char backtrace ();
+int
+main ()
+{
+return backtrace ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' execinfo; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_backtrace=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_backtrace+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search_backtrace+:} false; then :
+
+else
+ ac_cv_search_backtrace=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_backtrace" >&5
+$as_echo "$ac_cv_search_backtrace" >&6; }
+ac_res=$ac_cv_search_backtrace
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <execinfo.h>
int
main ()
{
- void *trace[1];
- char **messages;
-
- backtrace(trace, 1);
- messages = backtrace_symbols(trace, 1);
+ void *trace[1];
+ char **messages;
+ backtrace(trace, 1);
+ messages = backtrace_symbols(trace, 1);
;
return 0;
}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
wx_cv_func_backtrace=yes
else
wx_cv_func_backtrace=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+else
+ wx_cv_func_backtrace=no
+
+fi
+
+
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_backtrace" >&5
$as_echo "$wx_cv_func_backtrace" >&6; }
-
if test "$wx_cv_func_backtrace" = "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: backtrace() is not available, wxStackWalker will not be available" >&5
$as_echo "$as_me: WARNING: backtrace() is not available, wxStackWalker will not be available" >&2;}
wxUSE_STACKWALKER=no
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cxa_demangle() in <cxxabi.h>" >&5
+ if test "$ac_cv_header_cxxabi_h" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cxa_demangle() in <cxxabi.h>" >&5
$as_echo_n "checking for __cxa_demangle() in <cxxabi.h>... " >&6; }
if ${wx_cv_func_cxa_demangle+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_ext=cpp
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <cxxabi.h>
int
main ()
{
- int rc;
- __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc);
+ int rc;
+ __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc);
;
return 0;
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- ac_ext=c
+ ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_cxa_demangle" >&5
$as_echo "$wx_cv_func_cxa_demangle" >&6; }
+ else
+ wx_cv_func_cxa_demangle=no
+ fi
if test "$wx_cv_func_cxa_demangle" = "yes"; then
$as_echo "#define HAVE_CXA_DEMANGLE 1" >>confdefs.h
fi
fi
+
+ if test "$ac_cv_header_cxxabi_h" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for abi::__forced_unwind() in <cxxabi.h>" >&5
+$as_echo_n "checking for abi::__forced_unwind() in <cxxabi.h>... " >&6; }
+if ${wx_cv_type_abi_forced_unwind+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <cxxabi.h>
+int
+main ()
+{
+
+ void foo(abi::__forced_unwind&);
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ wx_cv_type_abi_forced_unwind=yes
+else
+ wx_cv_type_abi_forced_unwind=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_abi_forced_unwind" >&5
+$as_echo "$wx_cv_type_abi_forced_unwind" >&6; }
+ else
+ wx_cv_type_abi_forced_unwind=no
+ fi
+
+ if test "$wx_cv_type_abi_forced_unwind" = "yes"; then
+ $as_echo "#define HAVE_ABI_FORCEDUNWIND 1" >>confdefs.h
+
+ fi
fi
else
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GTKPRINT_LIBS"
CFLAGS="$GTKPRINT_CFLAGS $CFLAGS"
CXXFLAGS="$GTKPRINT_CFLAGS $CXXFLAGS"
$as_echo "#define wxUSE_GTKPRINT 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $LIBGNOMEPRINTUI_LIBS"
CFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CFLAGS"
CXXFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CXXFLAGS"
$as_echo "#define wxUSE_LIBGNOMEPRINT 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GNOMEVFS_LIBS"
CFLAGS="$GNOMEVFS_CFLAGS $CFLAGS"
CXXFLAGS="$GNOMEVFS_CFLAGS $CXXFLAGS"
$as_echo "#define wxUSE_LIBGNOMEVFS 1" >>confdefs.h
fi
fi
+ if test "$wxUSE_NOTIFICATION_MESSAGE" = "yes" ; then
+ if test "$wxUSE_LIBNOTIFY" = "yes" ; then
+ HAVE_LIBNOTIFY=0
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5
+$as_echo_n "checking for LIBNOTIFY... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBNOTIFY_CFLAGS"; then
+ pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.7" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBNOTIFY_LIBS"; then
+ pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.7" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= 0.7"`
+ else
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= 0.7"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBNOTIFY_PKG_ERRORS" >&5
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5
+$as_echo_n "checking for LIBNOTIFY... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBNOTIFY_CFLAGS"; then
+ pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.4" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBNOTIFY_LIBS"; then
+ pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.4" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= 0.4"`
+ else
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= 0.4"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBNOTIFY_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
+$as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;}
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
+$as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;}
+
+else
+ LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
+ LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_LIBNOTIFY=1
+fi
+
+
+elif test $pkg_failed = untried; then
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5
+$as_echo_n "checking for LIBNOTIFY... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBNOTIFY_CFLAGS"; then
+ pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.4" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBNOTIFY_LIBS"; then
+ pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.4" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= 0.4"`
+ else
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= 0.4"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBNOTIFY_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
+$as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;}
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
+$as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;}
+
+else
+ LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
+ LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_LIBNOTIFY=1
+fi
+
+
+else
+ LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
+ LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+ HAVE_LIBNOTIFY=1
+ $as_echo "#define wxUSE_LIBNOTIFY_0_7 1" >>confdefs.h
+
+
+fi
+
+ if test "$HAVE_LIBNOTIFY" = "1" ; then
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $LIBNOTIFY_LIBS"
+ CFLAGS="$LIBNOTIFY_CFLAGS $CFLAGS"
+ CXXFLAGS="$LIBNOTIFY_CFLAGS $CXXFLAGS"
+ $as_echo "#define wxUSE_LIBNOTIFY 1" >>confdefs.h
+
+ fi
+ fi
+ fi
+
if test "$wxUSE_LIBHILDON" = "yes" ; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- EXTRALIBS_HILDON="$HILDON_LIBS"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $HILDON_LIBS"
CFLAGS="$CFLAGS $HILDON_CFLAGS"
CXXFLAGS="$CXXFLAGS $HILDON_CFLAGS"
$as_echo "#define wxUSE_LIBHILDON 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- EXTRALIBS_HILDON="$HILDON2_LIBS"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $HILDON2_LIBS"
CFLAGS="$CFLAGS $HILDON2_CFLAGS"
CXXFLAGS="$CXXFLAGS $HILDON2_CFLAGS"
$as_echo "#define wxUSE_LIBHILDON2 1" >>confdefs.h
fi
fi
+if test "$wxUSE_FSVOLUME" = "yes"; then
+ $as_echo "#define wxUSE_FSVOLUME 1" >>confdefs.h
+
+fi
+
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
if test "$USE_UNIX" != 1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&5
fi
+for ac_func in setpriority
+do :
+ ac_fn_c_check_func "$LINENO" "setpriority" "ac_cv_func_setpriority"
+if test "x$ac_cv_func_setpriority" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SETPRIORITY 1
+_ACEOF
+
+fi
+done
+
+
+
if test "$wxUSE_SOCKETS" = "yes"; then
if test "$TOOLKIT" != "MSW"; then
ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
fi
fi
+if test "$wxUSE_PREFERENCES_EDITOR" = "yes"; then
+ $as_echo "#define wxUSE_PREFERENCES_EDITOR 1" >>confdefs.h
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS prefseditor"
+fi
+
if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Dialup manager not supported on this platform... disabled" >&5
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
else
USE_MEDIA=0
fi
+
+ elif test "$wxUSE_MAC" = 1; then
+ GST_LIBS="-framework QTKit"
fi
if test $USE_MEDIA = 1; then
EXTRALIBS_MEDIA="$GST_LIBS"
EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
if test "$wxUSE_GUI" = "yes"; then
- EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
+ EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK`
fi
if test "$wxUSE_OPENGL" = "yes"; then
EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
-
-
-
-
if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then
TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomevfs"
fi
+ if test "$wxUSE_LIBNOTIFY" = "yes" ; then
+ TOOLKIT_EXTRA="$TOOLKIT_EXTRA libnotify"
+ fi
if test "$wxUSE_LIBHILDON" = "yes"; then
TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
fi
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_NM="${ac_tool_prefix}nm"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_NM="nm"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AIX_CXX_LD="makeC++SharedLib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_WINDRES="windres"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_REZ="Rez"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_SETFILE="SetFile"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
- COND_BUILD_DEBUG="#"
- if test "x$BUILD" = "xdebug" ; then
- COND_BUILD_DEBUG=""
- fi
-
- COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="#"
- if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
- COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT=""
- fi
-
- COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="#"
- if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
- COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT=""
- fi
-
- COND_BUILD_DEBUG_UNICODE_0="#"
- if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
- COND_BUILD_DEBUG_UNICODE_0=""
- fi
-
- COND_BUILD_DEBUG_UNICODE_1="#"
- if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
- COND_BUILD_DEBUG_UNICODE_1=""
- fi
-
- COND_BUILD_RELEASE="#"
- if test "x$BUILD" = "xrelease" ; then
- COND_BUILD_RELEASE=""
- fi
-
- COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="#"
- if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
- COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT=""
- fi
-
- COND_BUILD_RELEASE_UNICODE_0="#"
- if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
- COND_BUILD_RELEASE_UNICODE_0=""
- fi
-
- COND_BUILD_RELEASE_UNICODE_1="#"
- if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
- COND_BUILD_RELEASE_UNICODE_1=""
- fi
-
COND_BUILD_debug="#"
if test "x$BUILD" = "xdebug" ; then
COND_BUILD_debug=""
fi
- COND_BUILD_debug_DEBUG_FLAG_default="#"
- if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
- COND_BUILD_debug_DEBUG_FLAG_default=""
- fi
-
COND_BUILD_debug_DEBUG_INFO_default="#"
if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
COND_BUILD_debug_DEBUG_INFO_default=""
fi
- COND_BUILD_debug_UNICODE_0="#"
- if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
- COND_BUILD_debug_UNICODE_0=""
- fi
-
- COND_BUILD_debug_UNICODE_1="#"
- if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
- COND_BUILD_debug_UNICODE_1=""
- fi
-
COND_BUILD_release="#"
if test "x$BUILD" = "xrelease" ; then
COND_BUILD_release=""
COND_BUILD_release_DEBUG_INFO_default=""
fi
- COND_BUILD_release_UNICODE_0="#"
- if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
- COND_BUILD_release_UNICODE_0=""
- fi
-
- COND_BUILD_release_UNICODE_1="#"
- if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
- COND_BUILD_release_UNICODE_1=""
- fi
-
COND_DEBUG_FLAG_0="#"
if test "x$DEBUG_FLAG" = "x0" ; then
COND_DEBUG_FLAG_0=""
fi
- COND_DEBUG_FLAG_1="#"
- if test "x$DEBUG_FLAG" = "x1" ; then
- COND_DEBUG_FLAG_1=""
- fi
-
COND_DEBUG_INFO_0="#"
if test "x$DEBUG_INFO" = "x0" ; then
COND_DEBUG_INFO_0=""
COND_MONOLITHIC_1_SHARED_1=""
fi
+ COND_MONOLITHIC_1_USE_STC_1="#"
+ if test "x$MONOLITHIC" = "x1" -a "x$USE_STC" = "x1" ; then
+ COND_MONOLITHIC_1_USE_STC_1=""
+ fi
+
COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0=""
fi
+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
+ fi
+
+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
+ fi
+
+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
+ fi
+
+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
+ fi
+
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1=""
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
fi
- COND_PLATFORM_MACOS_1="#"
- if test "x$PLATFORM_MACOS" = "x1" ; then
- COND_PLATFORM_MACOS_1=""
- fi
-
COND_PLATFORM_MAC_0="#"
if test "x$PLATFORM_MAC" = "x0" ; then
COND_PLATFORM_MAC_0=""
COND_PLATFORM_WIN32_0=""
fi
+ COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
+ if test "x$PLATFORM_WIN32" = "x0" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
+ COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
+ fi
+
COND_PLATFORM_WIN32_1="#"
if test "x$PLATFORM_WIN32" = "x1" ; then
COND_PLATFORM_WIN32_1=""
COND_PLATFORM_WIN32_1_SHARED_0=""
fi
+ COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
+ if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
+ COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
+ fi
+
+ COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
+ if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
+ COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
+ fi
+
+ COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
+ if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
+ COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
+ fi
+
+ COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
+ if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
+ COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
+ fi
+
COND_SHARED_0="#"
if test "x$SHARED" = "x0" ; then
COND_SHARED_0=""
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
fi
+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1="#"
+ if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1=""
+ fi
+
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
fi
+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1="#"
+ if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x1" ; then
+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1=""
+ fi
+
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
COND_TOOLKIT_X11_USE_GUI_1=""
fi
+ COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#"
+ if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+ COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1=""
+ fi
+
+ COND_TOOLKIT_X11_WXUNIV_1="#"
+ if test "x$TOOLKIT" = "xX11" -a "x$WXUNIV" = "x1" ; then
+ COND_TOOLKIT_X11_WXUNIV_1=""
+ fi
+
COND_UNICODE_1="#"
if test "x$UNICODE" = "x1" ; then
COND_UNICODE_1=""
COND_USE_GUI_1_WXUNIV_1=""
fi
- COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
- if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
- COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
- fi
-
- COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
- if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
- COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
- fi
-
- COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
- if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
- COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
- fi
-
COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
COND_WXUNIV_1=""
fi
- COND_WXUSE_EXPAT_BUILTIN="#"
- if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
- COND_WXUSE_EXPAT_BUILTIN=""
- fi
-
- COND_WXUSE_LIBJPEG_BUILTIN="#"
- if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
- COND_WXUSE_LIBJPEG_BUILTIN=""
- fi
-
- COND_WXUSE_LIBPNG_BUILTIN="#"
- if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
- COND_WXUSE_LIBPNG_BUILTIN=""
- fi
-
- COND_WXUSE_LIBTIFF_BUILTIN="#"
- if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
- COND_WXUSE_LIBTIFF_BUILTIN=""
- fi
-
- COND_WXUSE_REGEX_BUILTIN="#"
- if test "x$wxUSE_REGEX" = "xbuiltin" ; then
- COND_WXUSE_REGEX_BUILTIN=""
- fi
-
- COND_WXUSE_ZLIB_BUILTIN="#"
- if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
- COND_WXUSE_ZLIB_BUILTIN=""
- fi
-
COND_wxUSE_EXPAT_builtin="#"
if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
COND_wxUSE_EXPAT_builtin=""
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DEREZ="DeRez"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-if test "$wxUSE_MAC" = 1 ; then
+if test "$DEPS_TRACKING" = 1 -a "$wxUSE_MAC" = 1 ; then
if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then
if test "x$disable_macosx_deps" = "xyes"; then
- sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp
- mv temp bk-deps
+ sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp
+ mv temp bk-deps
chmod +x bk-deps
- fi
+ fi
fi
fi
-
-
-
-
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# values after options handling.
ac_log="
This file was extended by wxWidgets $as_me 2.9.5, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
wxWidgets config.status 2.9.5
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
projects / wxWidgets.git / blobdiff