X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef5dbedecfb8e5d04297abba73267df43ce1878c..a8bda512079352ba81933e278d9ccdb8ef7a9866:/configure.in diff --git a/configure.in b/configure.in index bc4dae89b1..a9f6d3b791 100644 --- a/configure.in +++ b/configure.in @@ -389,6 +389,7 @@ DEFAULT_wxUSE_IPV6=no DEFAULT_wxUSE_GSTREAMER8=no dnl automatic features +DEFAULT_wxUSE_ARTPROVIDER_TANGO=auto DEFAULT_wxUSE_UNICODE_UTF8=auto DEFAULT_wxUSE_OPENGL=auto DEFAULT_wxUSE_MEDIACTRL=auto @@ -452,6 +453,7 @@ if test "$wxUSE_ALL_FEATURES" = "no"; then dnl reset all the options with default value of auto if all features are to dnl be disabled because we can't have an option with default value of dnl "auto-or-no-if-wxUSE_ALL_FEATURES-is-disabled" + DEFAULT_wxUSE_ARTPROVIDER_TANGO=no DEFAULT_wxUSE_MEDIACTRL=no fi @@ -926,6 +928,8 @@ fi dnl please keep the settings below in alphabetical order WX_ARG_FEATURE(accel, [ --enable-accel use accelerators], wxUSE_ACCEL) WX_ARG_FEATURE(animatectrl, [ --enable-animatectrl use wxAnimationCtrl class], wxUSE_ANIMATIONCTRL) +WX_ARG_FEATURE(artstd, [ --enable-artstd use standard XPM icons in wxArtProvider], wxUSE_ARTPROVIDER_STD) +WX_ARG_FEATURE(arttango, [ --enable-arttango use Tango icons in wxArtProvider], wxUSE_ARTPROVIDER_TANGO) WX_ARG_FEATURE(bmpbutton, [ --enable-bmpbutton use wxBitmapButton class], wxUSE_BMPBUTTON) WX_ARG_FEATURE(bmpcombobox, [ --enable-bmpcombobox use wxBitmapComboBox class], wxUSE_BITMAPCOMBOBOX) WX_ARG_FEATURE(button, [ --enable-button use wxButton class], wxUSE_BUTTON) @@ -1664,11 +1668,10 @@ AC_CHECK_SIZEOF(wchar_t, 0, #include ] ) -if test "$ac_cv_sizeof_wchar_t" != 0; then - wxUSE_WCHAR_T=yes -else - wxUSE_WCHAR_T=no +if test "$ac_cv_sizeof_wchar_t" = 0; then + AC_MSG_ERROR([wxWidgets requires wchar_t support.]) fi +AC_DEFINE(wxUSE_WCHAR_T) dnl checks needed to define wxVaCopy AC_CACHE_CHECK([for va_copy], @@ -2749,17 +2752,6 @@ dnl ------------------------------------------------------------------------ dnl Check for expat libraries dnl ------------------------------------------------------------------------ -if test "$wxUSE_WCHAR_T" != "yes"; then - if test "$wxUSE_EXPAT" != "no"; then - AC_MSG_WARN([wxWidgets requires wchar_t to use expat, disabling]) - wxUSE_EXPAT=no - fi - if test "$wxUSE_XML" != "no"; then - AC_MSG_WARN([wxWidgets requires wchar_t to use xml, disabling]) - wxUSE_XML=no - fi -fi - if test "$wxUSE_EXPAT" != "no"; then wxUSE_XML=yes AC_DEFINE(wxUSE_EXPAT) @@ -4241,51 +4233,44 @@ dnl --------------------------------------------------------------------------- dnl Check for functions dnl --------------------------------------------------------------------------- -dnl don't check for wchar_t functions if we haven't got wchar_t itself -if test "$wxUSE_WCHAR_T" = "yes"; then - AC_DEFINE(wxUSE_WCHAR_T) - - dnl check for wcslen in all possible places - WCSLEN_FOUND=0 - WCHAR_LINK= - AC_CHECK_FUNCS(wcslen, WCSLEN_FOUND=1) - - if test "$WCSLEN_FOUND" = 0; then - if test "$TOOLKIT" = "MSW"; then - AC_CHECK_LIB(msvcrt, wcslen, WCHAR_OK=1) - else - AC_CHECK_LIB(w, wcslen, [ - WCHAR_LINK=" -lw" - WCSLEN_FOUND=1 - ]) - fi - fi +dnl check for wcslen in all possible places +WCSLEN_FOUND=0 +WCHAR_LINK= +AC_CHECK_FUNCS(wcslen, WCSLEN_FOUND=1) - if test "$WCSLEN_FOUND" = 1; then - AC_DEFINE(HAVE_WCSLEN) +if test "$WCSLEN_FOUND" = 0; then + if test "$TOOLKIT" = "MSW"; then + AC_CHECK_LIB(msvcrt, wcslen, WCHAR_OK=1) + else + AC_CHECK_LIB(w, wcslen, [ + WCHAR_LINK=" -lw" + WCSLEN_FOUND=1 + ]) fi +fi - AC_CHECK_FUNCS([wcsdup strnlen wcsnlen wcscasecmp wcsncasecmp]) +if test "$WCSLEN_FOUND" = 1; then + AC_DEFINE(HAVE_WCSLEN) +fi - dnl On HP-UX aCC need this define to find mbstrtowcs() &c - dnl Can't be used for g++ since the mbstate_t in wchar.h can conflict - dnl with g++'s in (unless -D_INCLUDE__STDC_A1_SOURCE is in the - dnl flags when g++ is configured, it will declare it's own). - if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then - CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" - fi +AC_CHECK_FUNCS([wcsdup wcsftime strnlen wcsnlen wcscasecmp wcsncasecmp]) - dnl Try to use wcsrtombs instead of wcstombs which is buggy in old GNU - dnl libc versions if possible. AC_CHECK_FUNCS only checks it's in the - dnl library, not the header, so do a header check for mbstate_t first. - AC_CHECK_TYPES([mbstate_t], - [AC_CHECK_FUNCS(wcsrtombs)], - [], - [#include ]) -else - AC_MSG_WARN([Wide character support is unavailable]) +dnl On HP-UX aCC need this define to find mbstrtowcs() &c +dnl Can't be used for g++ since the mbstate_t in wchar.h can conflict +dnl with g++'s in (unless -D_INCLUDE__STDC_A1_SOURCE is in the +dnl flags when g++ is configured, it will declare it's own). +if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then + CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" fi +dnl Try to use wcsrtombs instead of wcstombs which is buggy in old GNU +dnl libc versions if possible. AC_CHECK_FUNCS only checks it's in the +dnl library, not the header, so do a header check for mbstate_t first. +AC_CHECK_TYPES([mbstate_t], + [AC_CHECK_FUNCS(wcsrtombs)], + [], + [#include ]) + dnl check for vsnprintf() -- a safe version of vsprintf()) dnl dnl the trouble here is that on some systems (e.g HP-UX 10) this function is @@ -7163,6 +7148,27 @@ if test "$wxUSE_ACCESSIBILITY" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access" fi +if test "$wxUSE_ARTPROVIDER_STD" = "yes"; then + AC_DEFINE(wxUSE_ARTPROVIDER_STD) +fi + +if test "$wxUSE_ARTPROVIDER_TANGO" = "auto"; then + dnl Tango-based art provider is not needed in GTK-based ports as the + dnl native art provider completely replaces it. + if test "$wxUSE_GTK" != 1; then + dnl It also requires support for memory-mapped PNG images. + if test "$wxUSE_LIBPNG" != no -a \ + "$wxUSE_IMAGE" = yes -a \ + "$wxUSE_STREAMS" = yes; then + wxUSE_ARTPROVIDER_TANGO="yes" + fi + fi +fi + +if test "$wxUSE_ARTPROVIDER_TANGO" = "yes"; then + AC_DEFINE(wxUSE_ARTPROVIDER_TANGO) +fi + if test "$wxUSE_DRAGIMAGE" = "yes"; then AC_DEFINE(wxUSE_DRAGIMAGE) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"