WX_ARG_ENABLE(permissive, [ --enable-permissive compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
WX_ARG_ENABLE(no_deps, [ --enable-no_deps create code without dependency information], wxUSE_NO_DEPS)
WX_ARG_DISABLE(vararg_macros,[ --disable-vararg_macros don't use vararg macros, even if they are supported], wxUSE_VARARG_MACROS)
-WX_ARG_ENABLE_PARAM(universal_binary, [[ --enable-universal_binary create Mac PowerPC and Intel Universal binary (not yet working)]], wxUSE_UNIVERSAL_BINARY)
+WX_ARG_ENABLE_PARAM(universal_binary, [[ --enable-universal_binary create Mac PowerPC and Intel Universal binary]], wxUSE_UNIVERSAL_BINARY)
WX_ARG_ENABLE(compat26, [ --enable-compat26 enable wxWidgets 2.6 compatibility], WXWIN_COMPATIBILITY_2_6)
WX_ARG_DISABLE(compat28, [ --disable-compat28 disable wxWidgets 2.8 compatibility], WXWIN_COMPATIBILITY_2_8)
WX_ARG_FEATURE(ipc, [ --enable-ipc use interprocess communication (wxSocket etc.)], wxUSE_IPC)
WX_ARG_FEATURE(baseevtloop, [ --enable-baseevtloop use event loop in console programs too], wxUSE_CONSOLE_EVENTLOOP)
-WX_ARG_FEATURE(epoolloop, [ --enable-epoolloop use wxEpollDispatcher class (Linux only)], wxUSE_EPOLL_DISPATCHER)
+WX_ARG_FEATURE(epollloop, [ --enable-epollloop use wxEpollDispatcher class (Linux only)], wxUSE_EPOLL_DISPATCHER)
WX_ARG_FEATURE(selectloop, [ --enable-selectloop use wxSelectDispatcher class], wxUSE_SELECT_DISPATCHER)
dnl please keep the settings below in alphabetical order
DEFAULT_wxUSE_DISPLAY=yes
DEFAULT_wxUSE_DETECT_SM=yes
DEFAULT_wxUSE_DIRPICKERCTRL=yes
+ DEFAULT_wxUSE_FILECTRL=yes
DEFAULT_wxUSE_FILEPICKERCTRL=yes
DEFAULT_wxUSE_FONTPICKERCTRL=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_DISPLAY=no
DEFAULT_wxUSE_DETECT_SM=no
DEFAULT_wxUSE_DIRPICKERCTRL=no
+ DEFAULT_wxUSE_FILECTRL=no
DEFAULT_wxUSE_FILEPICKERCTRL=no
DEFAULT_wxUSE_FONTPICKERCTRL=no
DEFAULT_wxUSE_GAUGE=no
WX_ARG_FEATURE(detect_sm, [ --enable-detect_sm use code to detect X11 session manager], wxUSE_DETECT_SM)
WX_ARG_FEATURE(editablebox, [ --enable-editablebox use wxEditableListBox class], wxUSE_EDITABLELISTBOX)
WX_ARG_FEATURE(filepicker, [ --enable-filepicker use wxFilePickerCtrl class], wxUSE_FILEPICKERCTRL)
+WX_ARG_FEATURE(filectrl, [ --enable-filectrl use wxFileCtrl class], wxUSE_FILECTRL)
WX_ARG_FEATURE(fontpicker, [ --enable-fontpicker use wxFontPickerCtrl class], wxUSE_FONTPICKERCTRL)
WX_ARG_FEATURE(gauge, [ --enable-gauge use wxGauge class], wxUSE_GAUGE)
WX_ARG_FEATURE(grid, [ --enable-grid use wxGrid class], wxUSE_GRID)
dnl Note: non-empty last parameter makes check compile-only,
dnl skipping worthless preprocessing check
-AC_CHECK_HEADERS(stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h,,, [AC_INCLUDES_DEFAULT()])
+AC_CHECK_HEADERS(langinfo.h wchar.h,,, [AC_INCLUDES_DEFAULT])
dnl maybe wchar_t is in wcstr.h if we don't have wchar.h?
if test "$ac_cv_header_wchar_h" != "yes"; then
fi
fi
+dnl check for atomic operations builtins for wx/atomic.h:
+WX_ATOMIC_BUILTINS
+
dnl pop C++
AC_LANG_POP()
dnl we are using the system library
wxUSE_LIBTIFF=sys
fi
+ if test "$wxUSE_LIBTIFF" = "builtin" ; then
+ AC_CONFIG_SUBDIRS([src/tiff])
+ fi
fi
fi
if test "$wx_cv_func_snprintf_decl" = "yes"; then
AC_DEFINE(HAVE_SNPRINTF_DECL)
-
- dnl we know there is an snprintf declaration, but some old headers
- dnl may have one taking a "char *" format instead of "const char *"
- AC_CACHE_CHECK([if snprintf declaration is broken], wx_cv_func_broken_snprintf_decl,
- [
- AC_TRY_COMPILE(
- [
- #include <stdio.h>
- #include <stdarg.h>
- #ifdef __MSL__
- #if __MSL__ >= 0x6000
- namespace std {}
- using namespace std;
- #endif
- #endif
- ],
- [
- char *buf;
- const char *fmt = "%s";
- snprintf(buf, 10u, fmt, "wx");
- ],
- wx_cv_func_broken_snprintf_decl=no,
- wx_cv_func_broken_snprintf_decl=yes
- )
- ]
- )
-
- if test "$wx_cv_func_broken_snprintf_decl" = "yes"; then
- AC_DEFINE(HAVE_BROKEN_SNPRINTF_DECL)
- fi
fi
if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then
if test "$wxUSE_UNICODE" = yes; then
- dnl our wxVsnprintf() implementation needs to use the system swprintf() in Unicode
- dnl builds so let's check if swprintf() is declared as C99 imposes:
- dnl int swprintf(wchar_t *s, size_t n, const wchar_t *format, ...);
- dnl or rather as:
- dnl int swprintf(wchar_t *s, const wchar_t *format, ...);
- AC_CHECK_FUNCS(swprintf)
-
- if test "$ac_cv_func_swprintf" = "yes"; then
- AC_CACHE_CHECK([if swprintf declaration is broken], wx_cv_func_broken_swprintf_decl,
- [
- AC_TRY_COMPILE(
- [
- #include <stdio.h>
- #include <stdarg.h>
- #include <wchar.h>
- ],
- [
- wchar_t *buf;
- const wchar_t *fmt = L"test";
- swprintf(buf, 10u, fmt);
- ],
- wx_cv_func_broken_swprintf_decl=no,
- wx_cv_func_broken_swprintf_decl=yes
- )
- ]
- )
-
- if test "$wx_cv_func_broken_swprintf_decl" = "yes"; then
- AC_DEFINE(HAVE_BROKEN_SWPRINTF_DECL)
- fi
- fi
-
dnl also look if we have wide char IO functions, notice that [f]putws are
dnl declared in special widec.h under Solaris
wchar_headers="#include <stdio.h>
fi
esac
- WX_CHECK_FUNCS(wputc wputchar putws fputws wprintf vswprintf,,,
+ WX_CHECK_FUNCS(putws fputws wprintf vswprintf,,,
[$wchar_headers])
dnl MinGW has a vswprintf with a different prototype, and
[AC_MSG_RESULT([no])]);
fi
-if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
- WX_CHECK_FUNCS(fnmatch,,,[#include <fnmatch.h>])
-fi
-
if test "$wxUSE_FILE" = "yes"; then
WX_CHECK_FUNCS(fsync)
fi
fi
fi
-dnl check for timegm() used by datetime.cpp
-AC_CHECK_FUNCS(timegm)
-
dnl look for a function to modify the environment
AC_CHECK_FUNCS(setenv putenv, break)
if test "$ac_cv_func_setenv" = "yes"; then
AC_CHECK_FUNC(localtime_r, [ AC_DEFINE(HAVE_LOCALTIME_R) ])
AC_CHECK_FUNC(gmtime_r, [ AC_DEFINE(HAVE_GMTIME_R) ])
-AC_CHECK_FUNC(readdir_r, [ AC_DEFINE(HAVE_READDIR_R) ])
dnl By preference, we probably should use getaddrinfo which avoids thread
dnl safety issues and supports IPv6, however there currently is no code
dnl for it, so testing for it is temporarily disabled and we are restricted
USES_CONTROLS=1
fi
+if test "$wxUSE_FILECTRL" = "yes"; then
+ AC_DEFINE(wxUSE_FILECTRL)
+ USES_CONTROLS=1
+fi
+
if test "$wxUSE_FILEPICKERCTRL" = "yes"; then
AC_DEFINE(wxUSE_FILEPICKERCTRL)
USES_CONTROLS=1
EXTRALIBS_ODBC="$ODBC_LINK"
EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${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_GTKPRINT`
+ EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
fi
if test "$wxUSE_OPENGL" = "yes"; then
EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
projects / wxWidgets.git / blobdiff