dnl initialization
dnl ---------------------------------------------------------------------------
-AC_INIT([wxWidgets], [2.7.1], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.8.0], [wx-dev@lists.wxwidgets.org])
dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
AC_CONFIG_SRCDIR([wx-config.in])
dnl wx_release_number += 1
wx_major_version_number=2
-wx_minor_version_number=7
-wx_release_number=2
-wx_subrelease_number=0
+wx_minor_version_number=8
+wx_release_number=0
+wx_subrelease_number=2
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
WX_VERSION=$WX_RELEASE.$wx_release_number
DEFAULT_wxUSE_OPTIMISE=no
DEFAULT_wxUSE_PROFILE=no
DEFAULT_wxUSE_NO_DEPS=no
+ DEFAULT_wxUSE_VARARG_MACROS=no
DEFAULT_wxUSE_NO_RTTI=no
DEFAULT_wxUSE_NO_EXCEPTIONS=no
DEFAULT_wxUSE_UNIVERSAL_BINARY=no
DEFAULT_wxUSE_RADIOBTN=no
DEFAULT_wxUSE_SASH=no
DEFAULT_wxUSE_SCROLLBAR=no
+ DEFAULT_wxUSE_SEARCHCTRL=no
DEFAULT_wxUSE_SLIDER=no
DEFAULT_wxUSE_SPINBTN=no
DEFAULT_wxUSE_SPINCTRL=no
DEFAULT_wxUSE_OPTIMISE=yes
DEFAULT_wxUSE_PROFILE=no
DEFAULT_wxUSE_NO_DEPS=no
+ DEFAULT_wxUSE_VARARG_MACROS=yes
DEFAULT_wxUSE_NO_RTTI=no
DEFAULT_wxUSE_NO_EXCEPTIONS=no
DEFAULT_wxUSE_UNIVERSAL_BINARY=no
DEFAULT_wxUSE_LIBXPM=yes
DEFAULT_wxUSE_LIBMSPACK=yes
DEFAULT_wxUSE_LIBSDL=no
- DEFAULT_wxUSE_LIBGNOMEPRINT=no
+ DEFAULT_wxUSE_LIBGNOMEPRINT=yes
DEFAULT_wxUSE_LIBGNOMEVFS=no
DEFAULT_wxUSE_LIBHILDON=no
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_RADIOBTN=yes
DEFAULT_wxUSE_SASH=yes
DEFAULT_wxUSE_SCROLLBAR=yes
+ DEFAULT_wxUSE_SEARCHCTRL=yes
DEFAULT_wxUSE_SLIDER=yes
DEFAULT_wxUSE_SPINBTN=yes
DEFAULT_wxUSE_SPINCTRL=yes
WX_ARG_ENABLE(no_exceptions, [ --enable-no_exceptions create code without C++ exceptions handling], wxUSE_NO_EXCEPTIONS)
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_ENABLE(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[=SDK] create Mac PowerPC and Intel Universal binary (not yet working)]], wxUSE_UNIVERSAL_BINARY)
WX_ARG_ENABLE(compat24, [ --enable-compat24 enable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, enable)
DEFAULT_wxUSE_RADIOBTN=yes
DEFAULT_wxUSE_SASH=yes
DEFAULT_wxUSE_SCROLLBAR=yes
+ DEFAULT_wxUSE_SEARCHCTRL=yes
DEFAULT_wxUSE_SLIDER=yes
DEFAULT_wxUSE_SPINBTN=yes
DEFAULT_wxUSE_SPINCTRL=yes
DEFAULT_wxUSE_RADIOBTN=no
DEFAULT_wxUSE_SASH=no
DEFAULT_wxUSE_SCROLLBAR=no
+ DEFAULT_wxUSE_SEARCHCTRL=no
DEFAULT_wxUSE_SLIDER=no
DEFAULT_wxUSE_SPINBTN=no
DEFAULT_wxUSE_SPINCTRL=no
WX_ARG_ENABLE(fontpicker, [ --enable-fontpicker use wxFontPickerCtrl class], wxUSE_FONTPICKERCTRL)
WX_ARG_ENABLE(gauge, [ --enable-gauge use wxGauge class], wxUSE_GAUGE)
WX_ARG_ENABLE(grid, [ --enable-grid use wxGrid class], wxUSE_GRID)
-WX_ARG_ENABLE(dataviewctrl,[ --enable-dataviewctrl, use wxDataViewCtrl class], wxUSE_DATAVIEWCTRL)
+WX_ARG_ENABLE(dataviewctrl,[ --enable-dataviewctrl use wxDataViewCtrl class], wxUSE_DATAVIEWCTRL)
WX_ARG_ENABLE(hyperlink, [ --enable-hyperlink use wxHyperlinkCtrl class], wxUSE_HYPERLINKCTRL)
WX_ARG_ENABLE(imaglist, [ --enable-imaglist use wxImageList class], wxUSE_IMAGLIST)
WX_ARG_ENABLE(listbook, [ --enable-listbook use wxListbook class], wxUSE_LISTBOOK)
WX_ARG_ENABLE(radiobtn, [ --enable-radiobtn use wxRadioButton class], wxUSE_RADIOBTN)
WX_ARG_ENABLE(sash, [ --enable-sash use wxSashWindow class], wxUSE_SASH)
WX_ARG_ENABLE(scrollbar, [ --enable-scrollbar use wxScrollBar class and scrollable windows], wxUSE_SCROLLBAR)
+WX_ARG_ENABLE(searchctrl, [ --enable-searchctrl use wxSearchCtrl class], wxUSE_SEARCHCTRL)
WX_ARG_ENABLE(slider, [ --enable-slider use wxSlider class], wxUSE_SLIDER)
WX_ARG_ENABLE(spinbtn, [ --enable-spinbtn use wxSpinButton class], wxUSE_SPINBTN)
WX_ARG_ENABLE(spinctrl, [ --enable-spinctrl use wxSpinCtrl class], wxUSE_SPINCTRL)
DEFAULT_DEFAULT_wxUSE_MOTIF=0
DEFAULT_DEFAULT_wxUSE_MSW=1
wxUSE_SHARED=no
+ CC=${CC:-winegcc}
+ CXX=${CXX:-wineg++}
fi
dnl ar command
dnl defines AR with the appropriate command
-AC_CHECK_TOOL(AR, ar)
-if test "x$AR" = "x" ; then
- AC_MSG_ERROR([ar is needed to build wxWidgets])
+dnl
+dnl For Sun CC AC_BAKEFILE below sets AR to the compiler itself.
+if test "x$SUNCXX" != xyes; then
+ AC_CHECK_TOOL(AR, ar)
+ if test "x$AR" = "x" ; then
+ AC_MSG_ERROR([ar is needed to build wxWidgets])
+ fi
fi
dnl install checks
AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
[
if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
- egrep -s GNU > /dev/null); then
+ $EGREP -s GNU > /dev/null); then
wx_cv_prog_makeisgnu="yes"
else
wx_cv_prog_makeisgnu="no"
if test "$wxUSE_WINE" = "yes"; then
wants_win32=1
- dnl FIXME: we should do a better job of testing for these
- CC=winegcc
- CXX=wineg++
LDFLAGS_GUI="-mwindows"
fi
dnl Check for headers
dnl ------------------------------------------------------------------------
-dnl defines HAVE_STDLIB_H
-AC_CHECK_HEADERS(stdlib.h)
-dnl defines HAVE_MALLOC_H
-AC_CHECK_HEADERS(malloc.h)
-dnl defines HAVE_UNISTD_H
-AC_CHECK_HEADERS(unistd.h)
-dnl defines HAVE_WCHAR_H
-AC_CHECK_HEADERS(wchar.h)
+AC_CHECK_HEADERS(stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h)
dnl maybe wchar_t is in wcstr.h if we don't have wchar.h?
if test "$ac_cv_header_wchar_h" != "yes"; then
- dnl defines HAVE_WCSTR_H
AC_CHECK_HEADERS(wcstr.h)
fi
-dnl defines HAVE_FNMATCH_H
-AC_CHECK_HEADERS(fnmatch.h)
-
-dnl defines HAVE_LANGINFO_H (GNU libc locale parameters)
-AC_CHECK_HEADERS(langinfo.h)
-
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
dnl Explicitly link -lintl if langinfo.h is available
fi
fi
+dnl don't check for vararg macros if they're explicitly disabled: this is
+dnl useful if the user code using the library wants to limit itself to standard
+dnl C++ only (e.g. is compiled with g++ -std=c++98)
+if test "$wxUSE_VARARG_MACROS" = "yes"; then
+
dnl Check if variadic macros (C99 feature) are supported:
AC_CACHE_CHECK(
[whether the compiler supports variadic macros],
[wx_cv_have_variadic_macros],
[
+ dnl C compiler might support variadic macros when C++ one doesn't
+ dnl (happens with gcc/g++ 2.95.4), so must use C++ one explicitly
+ AC_LANG_PUSH(C++)
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[
[wx_cv_have_variadic_macros=yes],
[wx_cv_have_variadic_macros=no]
)
+ AC_LANG_POP()
]
)
AC_DEFINE(HAVE_VARIADIC_MACROS)
fi
+fi dnl wxUSE_VARARG_MACROS == yes
+
dnl check for large file support
AC_SYS_LARGEFILE
[if -D__STDC_EXT__ is required],
wx_cv_STDC_EXT_required,
[
+ AC_LANG_PUSH(C++)
AC_TRY_COMPILE(
[],
[
wx_cv_STDC_EXT_required=no,
wx_cv_STDC_EXT_required=yes
)
+ AC_LANG_POP()
]
)
if test "x$wx_cv_STDC_EXT_required" = "xyes"; then
CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit"
fi
+dnl the next few tests are all for C++ features and so need to be done using
+dnl C++ compiler
+AC_LANG_PUSH(C++)
+
dnl check for std::string or std::wstring
if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
if test "$wxUSE_UNICODE" = "yes"; then
char_type="char"
fi
- dnl check if <string> declares std::wstring
- AC_MSG_CHECKING([for $std_string in <string>])
- AC_TRY_COMPILE([#include <string>],
- [$std_string foo;],
- [AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_STD_WSTRING)],
- [AC_MSG_RESULT(no)
- AC_MSG_CHECKING([if std::basic_string<$char_type> works])
- AC_TRY_COMPILE([
- #ifdef HAVE_WCHAR_H
- # ifdef __CYGWIN__
- # include <stddef.h>
- # endif
- # include <wchar.h>
- #endif
- #ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- #endif
- #include <stdio.h>
- #include <string>
- ],
- [std::basic_string<$char_type> foo;
- const $char_type* dummy = foo.c_str();],
- [AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT([no])
- if test "$wxUSE_STL" = "yes"; then
- AC_MSG_ERROR([Can't use --enable-stl without $std_string or std::basic_string<$char_type>])
- elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then
- AC_MSG_ERROR([Can't use --enable-std_string without $std_string or std::basic_string<$char_type>])
- else
- AC_MSG_WARN([No $std_string or std::basic_string<$char_type>, switching to --disable-std_string])
- wxUSE_STD_STRING=no
- fi
- ]
- )
- ])
+ dnl check if <string> declares std::[w]string
+ AC_CACHE_CHECK([for $std_string in <string>],
+ wx_cv_class_stdstring,
+ [
+ AC_TRY_COMPILE([#include <string>],
+ [$std_string foo;],
+ wx_cv_class_stdstring=yes,
+ wx_cv_class_stdstring=no
+ )
+ ]
+ )
+
+ if test "$wx_cv_class_stdstring" = yes; then
+ if test "$wxUSE_UNICODE" = "yes"; then
+ AC_DEFINE(HAVE_STD_WSTRING)
+ fi
+ dnl we don't need HAVE_STD_STRING, we just suppose it's available if
+ dnl wxUSE_STD_STRING==yes
+ else
+ AC_CACHE_CHECK([if std::basic_string<$char_type> works],
+ wx_cv_class_stdbasicstring,
+ [
+ AC_TRY_COMPILE([
+ #ifdef HAVE_WCHAR_H
+ # ifdef __CYGWIN__
+ # include <stddef.h>
+ # endif
+ # include <wchar.h>
+ #endif
+ #ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ #endif
+ #include <stdio.h>
+ #include <string>
+ ],
+ [std::basic_string<$char_type> foo;
+ const $char_type* dummy = foo.c_str();],
+ wx_cv_class_stdbasicstring=yes,
+ wx_cv_class_stdbasicstring=no
+ )
+ ]
+ )
+
+ if test "$wx_cv_class_stdbasicstring" != yes; then
+ if test "$wxUSE_STL" = "yes"; then
+ AC_MSG_ERROR([Can't use --enable-stl without $std_string or std::basic_string<$char_type>])
+ elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then
+ AC_MSG_ERROR([Can't use --enable-std_string without $std_string or std::basic_string<$char_type>])
+ else
+ AC_MSG_WARN([No $std_string or std::basic_string<$char_type>, switching to --disable-std_string])
+ wxUSE_STD_STRING=no
+ fi
+ fi
+ fi
fi
if test "$wxUSE_STD_IOSTREAM" = "yes"; then
if test "$wxUSE_STL" = "yes"; then
dnl check for basic STL functionality
- AC_MSG_CHECKING([for basic STL functionality])
- AC_TRY_COMPILE([#include <string>
- #include <functional>
- #include <algorithm>
- #include <vector>
- #include <list>],
- [std::vector<int> moo;
- std::list<int> foo;
- std::vector<int>::iterator it =
- std::find_if(moo.begin(), moo.end(),
- std::bind2nd(std::less<int>(), 3));],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])
- AC_MSG_ERROR([Basic STL functionality missing])])
+ AC_CACHE_CHECK([for basic STL functionality],
+ wx_cv_lib_stl,
+ [AC_TRY_COMPILE([#include <string>
+ #include <functional>
+ #include <algorithm>
+ #include <vector>
+ #include <list>],
+ [std::vector<int> moo;
+ std::list<int> foo;
+ std::vector<int>::iterator it =
+ std::find_if(moo.begin(), moo.end(),
+ std::bind2nd(std::less<int>(), 3));],
+ wx_cv_lib_stl=yes,
+ wx_cv_lib_stl=no
+ )]
+ )
+
+ if test "$wx_cv_lib_stl" != yes; then
+ AC_MSG_ERROR([Can't use --enable-stl as basic STL functionality is missing])
+ fi
dnl check for compliant std::string::compare
- AC_MSG_CHECKING([for compliant std::string::compare])
- AC_TRY_COMPILE([#include <string>],
- [std::string foo, bar;
- foo.compare(bar);
- foo.compare(1, 1, bar);
- foo.compare(1, 1, bar, 1, 1);
- foo.compare("");
- foo.compare(1, 1, "");
- foo.compare(1, 1, "", 2);],
- [AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_STD_STRING_COMPARE)],
- [AC_MSG_RESULT(no)])
+ AC_CACHE_CHECK([for compliant std::string::compare],
+ wx_cv_func_stdstring_compare,
+ [AC_TRY_COMPILE([#include <string>],
+ [std::string foo, bar;
+ foo.compare(bar);
+ foo.compare(1, 1, bar);
+ foo.compare(1, 1, bar, 1, 1);
+ foo.compare("");
+ foo.compare(1, 1, "");
+ foo.compare(1, 1, "", 2);],
+ wx_cv_func_stdstring_compare=yes,
+ wx_cv_func_stdstring_compare=no
+ )]
+ )
+
+ if test "$wx_cv_func_stdstring_compare" = yes; then
+ AC_DEFINE(HAVE_STD_STRING_COMPARE)
+ fi
dnl check for hash_map and hash_set headers
AC_CHECK_HEADER([hash_map],
- [AC_MSG_CHECKING([for hash_map and hash_set])
- AC_TRY_COMPILE([#include <hash_map>
- #include <hash_set>],
- [std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
- std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;],
- [AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_HASH_MAP)
- AC_DEFINE(HAVE_STD_HASH_MAP)],
- [AC_MSG_RESULT(no)])
- ])
+ [AC_CACHE_CHECK([for standard hash_map and hash_set],
+ wx_cv_class_stdhashmapset,
+ [AC_TRY_COMPILE([#include <hash_map>
+ #include <hash_set>],
+ [std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
+ std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;],
+ wx_cv_class_stdhashmapset=yes,
+ wx_cv_class_stdhashmapset=no)
+ ]
+ )]
+ )
+
+ if test "$wx_cv_class_stdhashmapset" = yes; then
+ AC_DEFINE(HAVE_HASH_MAP)
+ AC_DEFINE(HAVE_STD_HASH_MAP)
+ fi
AC_CHECK_HEADER([ext/hash_map],
- [AC_MSG_CHECKING([for hash_map and hash_set])
- AC_TRY_COMPILE([#include <ext/hash_map>
- #include <ext/hash_set>],
- [__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
- __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;],
- [AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_EXT_HASH_MAP)
- AC_DEFINE(HAVE_GNU_CXX_HASH_MAP)],
- [AC_MSG_RESULT(no)])
- ])
+ [AC_CACHE_CHECK([for GNU hash_map and hash_set],
+ wx_cv_class_gnuhashmapset,
+ [AC_TRY_COMPILE([#include <ext/hash_map>
+ #include <ext/hash_set>],
+ [__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
+ __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;],
+ wx_cv_class_gnuhashmapset=yes,
+ wx_cv_class_gnuhashmapset=no)
+ ]
+ )]
+ )
+
+ if test "$wx_cv_class_gnuhashmapset" = yes; then
+ AC_DEFINE(HAVE_EXT_HASH_MAP)
+ AC_DEFINE(HAVE_GNU_CXX_HASH_MAP)
+ fi
fi
+dnl pop C++
+AC_LANG_POP()
+
dnl ---------------------------------------------------------------------------
dnl Define search path for includes and libraries: all headers and libs will be
dnl looked for in all directories of this path
else
dnl we are using the system library
wxUSE_LIBJPEG=sys
+
+ if test "$wxUSE_MSW" = 1; then
+ dnl boolean is defined by the jpeg headers and also by the
+ dnl Windows headers of some compilers. This type has been
+ dnl renamed in the builtin, so it is only an issue when
+ dnl using an external jpeg lib on Windows.
+ AC_CHECK_TYPES(
+ [boolean],
+ [
+ AC_CHECK_SIZEOF(
+ [boolean],
+ [],
+ [
+ #undef HAVE_BOOLEAN
+ #include <stdio.h>
+ #include <jpeglib.h>
+ ])
+ AC_DEFINE_UNQUOTED(
+ [wxHACK_BOOLEAN],
+ [wxInt`expr 8 \* $ac_cv_sizeof_boolean`])
+ ],
+ [],
+ [#include <windows.h>])
+ fi
fi
fi
fi
AC_CACHE_CHECK([if expat.h is valid C++ header],
wx_cv_expat_is_not_broken,
[
+ AC_LANG_PUSH(C++)
AC_TRY_COMPILE([#include <expat.h>],[],
wx_cv_expat_is_not_broken=yes,
wx_cv_expat_is_not_broken=no
)
+ AC_LANG_POP()
]
)
if test "$wx_cv_expat_is_not_broken" = "yes" ; then
dnl install Win32-specific files in "make install"
WIN32INSTALL=win32install
- dnl the jpeg header jmorecfg.h delcares the type boolean, which conflicts
- dnl on systems which declare it in the system headers. If HAVE_BOOLEAN is
- dnl defined then jmorecfg.h doesn't declare it, so checking for it here
- dnl solves the problem.
- AC_CHECK_TYPES(boolean, [], [], [#include <windows.h>])
-
dnl pbt.h is missing on Wine at least
AC_CHECK_HEADERS(pbt.h, [], [AC_DEFINE(NEED_PBT_H)])
fi
PKG_PROG_PKG_CONFIG()
PKG_CHECK_MODULES(DIRECTFB,
- [directfb >= 0.9.22],
+ [directfb >= 0.9.23],
[
wxUSE_UNIVERSAL="yes"
TOOLKIT_INCLUDE="$DIRECTFB_CFLAGS"
PKG_CHECK_MODULES(PANGOX, pangox,
[
+ CFLAGS="$PANGOX_CFLAGS $CFLAGS"
CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS"
],
)
PKG_CHECK_MODULES(PANGOFT2, pangoft2,
[
+ CFLAGS="$PANGOFT2_CFLAGS $CFLAGS"
CXXFLAGS="$PANGOFT2_CFLAGS $CXXFLAGS"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
],
PKG_CHECK_MODULES(PANGOXFT, pangoxft,
[
AC_DEFINE(HAVE_PANGO_XFT)
+ CFLAGS="$PANGOXFT_CFLAGS $CFLAGS"
CXXFLAGS="$PANGOXFT_CFLAGS $CXXFLAGS"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
],
AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support])
]
)
- save_CXXFLAGS="$CXXFLAGS"
save_LIBS="$LIBS"
- CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS"
LIBS="$LIBS $PANGOX_LIBS"
AC_CHECK_FUNCS([pango_font_family_is_monospace])
- CXXFLAGS="$save_CXXFLAGS"
LIBS="$save_LIBS"
fi
WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE)
TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
else
- save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$TOOLKIT_INCLUDE $CXXFLAGS"
+ save_CFLAGS=$CFLAGS
+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
AC_TRY_COMPILE(
[
]
)
- CXXFLAGS=$save_CXXFLAGS
+ CFLAGS=$save_CFLAGS
fi
dnl it might happen that we found headers in one of the standard
dnl paths but the libs are elsewhere but still in default (linker)
dnl path -- try to compile a test program to check for this
- save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$TOOLKIT_INCLUDE $CXXFLAGS"
+ save_CFLAGS=$CFLAGS
+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
save_LIBS="$LIBS"
LIBS="$GUI_TK_LIBRARY -lXm -lXmu -lXext -lX11"
]
)
- CXXFLAGS=$save_CXXFLAGS
+ CFLAGS=$save_CFLAGS
LIBS="$save_LIBS"
fi
if test "$libs_found" = "0"; then
save_LIBS="$LIBS"
LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
- save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$TOOLKIT_INCLUDE $CXXFLAGS"
+ save_CFLAGS=$CFLAGS
+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
AC_TRY_LINK(
[
)
LIBS="$save_LIBS"
- CXXFLAGS=$save_CXXFLAGS
+ CFLAGS=$save_CFLAGS
fi
done
fi
dnl elsewhere
AC_CHECK_LIB(Sgm, [SgCreateList], [libsgm_link=" -lSgm"])
- save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$TOOLKIT_INCLUDE $CXXFLAGS"
+ save_CFLAGS=$CFLAGS
+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
AC_CACHE_CHECK([for Motif 2],
wx_cv_lib_motif2,
AC_DEFINE(__WXLESSTIF__,0)
fi
- CXXFLAGS=$save_CXXFLAGS
+ CFLAGS=$save_CFLAGS
GUI_TK_LIBRARY="$GUI_TK_LIBRARY${libsgm_link} -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
TOOLKIT=MOTIF
AC_CACHE_CHECK([for X11/xpm.h],
wx_cv_x11_xpm_h,
[
- save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$TOOLKIT_INCLUDE $CXXFLAGS"
+ save_CFLAGS=$CFLAGS
+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
AC_TRY_COMPILE(
[
wx_cv_x11_xpm_h=no
)
- CXXFLAGS=$save_CXXFLAGS
+ CFLAGS=$save_CFLAGS
]
)
[], [$GUI_TK_LIBRARY -lX11])
if test "$wxHAVE_XEXT_LIB" = 1; then
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$TOOLKIT_INCLUDE $CXXFLAGS"
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
AC_MSG_CHECKING([for X11/extensions/shape.h])
AC_TRY_COMPILE([
[
AC_MSG_RESULT([not found])
])
- CXXFLAGS="$save_CXXFLAGS"
+ CFLAGS="$save_CFLAGS"
fi
fi
USE_OPENGL=0
if test "$wxUSE_OPENGL" = "yes"; then
- if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
+ if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = "1"; then
+ AC_MSG_WARN([wxGLCanvas not implemented for this port, library will be compiled without it.])
+ wxUSE_OPENGL="no"
+ elif test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
OPENGL_LIBS="-framework OpenGL -framework AGL"
elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32"
dnl check what exactly size_t is on this machine - this is necessary to avoid
dnl ambiguous overloads in several places, notably wx/string.h and wx/array.h
+AC_LANG_PUSH(C++) dnl tests below use overloaded functions and so need C++
AC_CACHE_CHECK([if size_t is unsigned int],
wx_cv_size_t_is_uint,
[
fi
fi
+AC_LANG_POP() dnl C++
+
dnl ---------------------------------------------------------------------------
dnl Checks for structures
dnl ---------------------------------------------------------------------------
int main (void)
{
char buffer[128];
- snprintf (buffer, 128, "%2\$d %3\$d %1\$d", 1, 2, 3);
+ snprintf (buffer, 128, "%2$d %3$d %1$d", 1, 2, 3);
if (strcmp ("2 3 1", buffer) == 0)
exit (0);
exit (1);
fi
if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
- WX_CHECK_FUNCS(fnmatch)
+ WX_CHECK_FUNCS(fnmatch,,,[#include <fnmatch.h>])
fi
if test "$wxUSE_FILE" = "yes"; then
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
AC_CACHE_CHECK([for sa_handler type], wx_cv_type_sa_handler,
[
+ dnl C compiler happily compiles the code even if there is type mismatch
+ AC_LANG_PUSH(C++)
AC_TRY_COMPILE([#include <signal.h>],
[
extern void testSigHandler(int);
], [
wx_cv_type_sa_handler=void
])
+ AC_LANG_POP()
])
AC_DEFINE_UNQUOTED(wxTYPE_SA_HANDLER, $wx_cv_type_sa_handler)
if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
AC_CACHE_CHECK([for backtrace() in <execinfo.h>], wx_cv_func_backtrace,
[
+ AC_LANG_PUSH(C++)
AC_TRY_COMPILE([#include <execinfo.h>],
[
void *trace[1];
wx_cv_func_backtrace=yes,
wx_cv_func_backtrace=no
)
+ AC_LANG_POP()
]
)
else
AC_CACHE_CHECK([for __cxa_demangle() in <cxxabi.h>], wx_cv_func_cxa_demangle,
[
+ AC_LANG_PUSH(C++)
AC_TRY_LINK([#include <cxxabi.h>],
[
int rc;
wx_cv_func_cxa_demangle=yes,
wx_cv_func_cxa_demangle=no
)
+ AC_LANG_POP()
]
)
if test "$wx_cv_func_statfs" = "yes"; then
dnl check whether we have its dcelaration too: some systems (AIX 4) lack it
AC_CACHE_CHECK(for statfs declaration, wx_cv_func_statfs_decl,
+ AC_LANG_PUSH(C++)
AC_TRY_COMPILE(
[
#if defined(__BSD__)
wx_cv_func_statfs_decl=yes,
wx_cv_func_statfs_decl=no
)
+ AC_LANG_POP()
)
if test "$wx_cv_func_statfs_decl" = "yes"; then
dnl for this check C++ compiler has to be used as passing incompatible
dnl pointers is just a warning and not an error in C
AC_CACHE_CHECK(for statvfs argument type, wx_cv_type_statvfs_t,
+ AC_LANG_PUSH(C++)
AC_TRY_COMPILE(
[
#include <sys/statvfs.h>
)
]
)
+ AC_LANG_POP()
)
if test "$wx_cv_type_statvfs_t" != "unknown"; then
fi
dnl check for uname (POSIX) and gethostname (BSD)
-WX_CHECK_FUNCS(uname gethostname, break)
+WX_CHECK_FUNCS(uname,,,[#include <sys/utsname.h>])
+if test "$wx_cv_func_uname" != yes; then
+ WX_CHECK_FUNCS(gethostname)
+fi
WX_CHECK_FUNCS(strtok_r, [], [], [#define _REENTRANT])
dnl the code below:
dnl
- dnl defines THREADS_LINK and THREADS_CXXFLAGS which are the options
+ dnl defines THREADS_LINK and THREADS_CFLAGS which are the options
dnl necessary to build the MT programs for the linker and compiler
dnl respectively
dnl
dnl sets wxUSE_THREADS=1 if thread support is activated
THREADS_LINK=
- THREADS_CXXFLAGS=
+ THREADS_CFLAGS=
if test "$wxUSE_THREADS" = "yes" ; then
if test "$USE_BEOS" = 1; then
-*)
AC_MSG_CHECKING([whether pthreads work with $flag])
- THREADS_CXXFLAGS="$flag"
+ THREADS_CFLAGS="$flag"
;;
*)
esac
save_LIBS="$LIBS"
- save_CXXFLAGS="$CXXFLAGS"
+ save_CFLAGS="$CFLAGS"
LIBS="$THREADS_LINK $LIBS"
- CXXFLAGS="$THREADS_CXXFLAGS $CXXFLAGS"
+ CFLAGS="$THREADS_CFLAGS $CFLAGS"
AC_TRY_LINK([#include <pthread.h>],
[pthread_create(0,0,0,0);],
THREADS_OK=yes)
LIBS="$save_LIBS"
- CXXFLAGS="$save_CXXFLAGS"
+ CFLAGS="$save_CFLAGS"
AC_MSG_RESULT($THREADS_OK)
if test "x$THREADS_OK" = "xyes"; then
fi
THREADS_LINK=""
- THREADS_CXXFLAGS=""
+ THREADS_CFLAGS=""
done
if test "x$THREADS_OK" != "xyes"; then
else
dnl yes, these special compiler flags should be used with the
dnl linker as well
- LDFLAGS="$THREADS_CXXFLAGS $LDFLAGS"
+ LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
LIBS="$THREADS_LINK $LIBS"
AC_MSG_CHECKING([if more special flags are required for pthreads])
esac
AC_MSG_RESULT(${flag})
if test "x$flag" != xno; then
- THREADS_CXXFLAGS="$THREADS_CXXFLAGS $flag"
+ THREADS_CFLAGS="$THREADS_CFLAGS $flag"
fi
dnl don't add these options to CPPFLAGS as cpp might not know them
- WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS $THREADS_CXXFLAGS"
+ WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS $THREADS_CFLAGS"
fi
fi
AC_CACHE_CHECK([if compiler supports -mthreads],
wx_cv_cflags_mthread,
[
- CXXFLAGS_OLD="$CXXFLAGS"
- CXXFLAGS="-mthreads $CXXFLAGS"
+ CFLAGS_OLD="$CFLAGS"
+ CFLAGS="-mthreads $CFLAGS"
AC_TRY_COMPILE([], [],
wx_cv_cflags_mthread=yes,
wx_cv_cflags_mthread=no
if test "$wx_cv_cflags_mthread" = "yes"; then
dnl it does, use it
- WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -mthreads"
+ WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -mthreads"
LDFLAGS="$LDFLAGS -mthreads"
else
dnl it doesn't
- CXXFLAGS="$CXXFLAGS_OLD"
+ CFLAGS="$CFLAGS_OLD"
fi
;;
*-pc-os2*emx )
WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -Zmt -D__ST_MT_ERRNO__"
- WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -Zmt -D__ST_MT_ERRNO__"
LDFLAGS="$LDFLAGS -Zmt"
;;
esac
dnl Unix implementation needs additional checks because audio support
dnl comes in many favours:
if test "$USE_UNIX" = "1" ; then
- dnl it's not enough to check for just the header because OSS under NetBSD
- dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
- dnl whether we need -lossaudio at link-time
- AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [
- AC_TRY_LINK([
- #include <sys/ioctl.h>
- #include <sys/soundcard.h>
- ],
- [
- ioctl(0, SNDCTL_DSP_SPEED, 0);
- ],
- ac_cv_header_sys_soundcard=yes,
- [
- saveLibs="$LIBS"
- LIBS="$saveLibs -lossaudio"
- AC_TRY_LINK([
- #include <sys/ioctl.h>
- #include <sys/soundcard.h>
- ],
- [
- ioctl(0, SNDCTL_DSP_SPEED, 0);
- ],
- ac_cv_header_sys_soundcard=yes,
- [
- LIBS="$saveLibs"
- ac_cv_header_sys_soundcard=no
- ]
- )
- ]
- )
- ])
+ dnl mmedia doesn't compile with wxMGL, remove this if this is ever fixed
+ if test "$wxUSE_MGL" != 1; then
+ dnl it's not enough to check for just the header because OSS under NetBSD
+ dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
+ dnl whether we need -lossaudio at link-time
+ AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [
+ AC_TRY_LINK([
+ #include <sys/ioctl.h>
+ #include <sys/soundcard.h>
+ ],
+ [
+ ioctl(0, SNDCTL_DSP_SPEED, 0);
+ ],
+ ac_cv_header_sys_soundcard=yes,
+ [
+ saveLibs="$LIBS"
+ LIBS="$saveLibs -lossaudio"
+ AC_TRY_LINK([
+ #include <sys/ioctl.h>
+ #include <sys/soundcard.h>
+ ],
+ [
+ ioctl(0, SNDCTL_DSP_SPEED, 0);
+ ],
+ ac_cv_header_sys_soundcard=yes,
+ [
+ LIBS="$saveLibs"
+ ac_cv_header_sys_soundcard=no
+ ]
+ )
+ ]
+ )
+ ])
+ fi
if test "$ac_cv_header_sys_soundcard" = "yes"; then
AC_DEFINE(HAVE_SYS_SOUNDCARD_H)
DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"
fi
fi
+
WITH_PLUGIN_SDL=0
if test "$wxUSE_SOUND" = "yes"; then
if test "$USE_UNIX" = "1" ; then
AM_PATH_SDL([1.2.0],
[
EXTRALIBS_SDL="$SDL_LIBS"
+ CFLAGS="$SDL_CFLAGS $CFLAGS"
CXXFLAGS="$SDL_CFLAGS $CXXFLAGS"
AC_DEFINE(wxUSE_LIBSDL)
],
PKG_CHECK_MODULES(LIBGNOMEPRINTUI,
[libgnomeprintui-2.2 >= 2.8],
[
+ CFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CFLAGS"
CXXFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CXXFLAGS"
AC_DEFINE(wxUSE_LIBGNOMEPRINT)
],
PKG_CHECK_MODULES(GNOMEVFS,
[gnome-vfs-2.0 >= 2.0],
[
+ CFLAGS="$GNOMEVFS_CFLAGS $CFLAGS"
CXXFLAGS="$GNOMEVFS_CFLAGS $CXXFLAGS"
AC_DEFINE(wxUSE_LIBGNOMEVFS)
],
[hildon-lgpl >= 0.9],
[
EXTRALIBS_HILDON="$HILDON_LIBS"
+ CFLAGS="$CFLAGS $HILDON_CFLAGS"
CXXFLAGS="$CXXFLAGS $HILDON_CFLAGS"
AC_DEFINE(wxUSE_LIBHILDON)
],
if test "$wxUSE_DATETIME" = "yes"; then
dnl check for strptime and for its declaration as some systems lack it
+ dnl FIXME: use WX_CHECK_FUNCS instead
AC_CHECK_FUNCS(strptime)
if test "$ac_cv_func_strptime" = "yes"; then
AC_CACHE_CHECK([for strptime declaration], wx_cv_func_strptime_decl,
[
+ AC_LANG_PUSH(C++)
AC_TRY_COMPILE(
[
#include <time.h>
wx_cv_func_strptime_decl=yes,
wx_cv_func_strptime_decl=no
)
+ AC_LANG_POP()
]
)
fi
AC_CACHE_CHECK(for timezone variable in <time.h>,
wx_cv_var_timezone,
[
+ AC_LANG_PUSH(C++)
AC_TRY_COMPILE(
[
#include <time.h>
)
]
)
+ AC_LANG_POP()
]
)
AC_CACHE_CHECK([what is the type of the third argument of getsockname],
wx_cv_type_getsockname3,
[
+ AC_LANG_PUSH(C++)
AC_TRY_COMPILE(
[
#include <sys/types.h>
dnl converting between incompatible pointer types, so
dnl try to use it to get the correct behaviour at
dnl least with gcc (otherwise we'd always use size_t)
- CXXFLAGS_OLD="$CXXFLAGS"
+ CFLAGS_OLD="$CFLAGS"
if test "$GCC" = yes ; then
- CXXFLAGS="-Werror $CXXFLAGS"
+ CFLAGS="-Werror $CFLAGS"
fi
AC_TRY_COMPILE(
)
)
- CXXFLAGS="$CXXFLAGS_OLD"
+ CFLAGS="$CFLAGS_OLD"
]
)
+ AC_LANG_POP()
])
if test "$wx_cv_type_getsockname3" = "unknown"; then
],
wx_cv_type_getsockopt5=socklen_t,
[
- dnl the compiler will compile the version with size_t
- dnl even if the real type of the last parameter is int
- dnl but it should give at least a warning about
- dnl converting between incompatible pointer types, so
- dnl try to use it to get the correct behaviour at
- dnl least with gcc (otherwise we'd always use size_t)
- CXXFLAGS_OLD="$CXXFLAGS"
- if test "$GCC" = yes ; then
- CXXFLAGS="-Werror $CXXFLAGS"
- fi
-
+ dnl Note that the rules for compatibility of pointers
+ dnl are somewhat different between C and C++, so code
+ dnl that fails in C++ may not even give a warning about
+ dnl converting between incompatible pointer types in C.
+ dnl So this test needs to be done in C++ mode.
+ AC_LANG_PUSH(C++)
AC_TRY_COMPILE(
[
#include <sys/types.h>
wx_cv_type_getsockopt5=unknown
)
)
-
- CXXFLAGS="$CXXFLAGS_OLD"
+ AC_LANG_POP()
]
)
])
if test "$USE_DARWIN" = 1; then
dnl check for a bug in the headers, some have bad setEventCallout
AC_MSG_CHECKING([headers have declarations needed for joystick support])
+ AC_LANG_PUSH(C++)
AC_TRY_COMPILE( [ #include <IOKit/hid/IOHIDLib.h> ],
[ IOHIDQueueInterface *qi = NULL;
IOHIDCallbackFunction cb = NULL;
qi->setEventCallout(NULL, cb, NULL, NULL); ],
[ wxUSE_JOYSTICK=yes ]
)
+ AC_LANG_POP()
AC_MSG_RESULT($wxUSE_JOYSTICK)
fi
else
dnl wxJoystick not supported by wxMGL at all
if test "$wxUSE_MGL" != "1"; then
- AC_CHECK_HEADERS(linux/joystick.h, wxUSE_JOYSTICK=yes)
+ dnl notice the dummy includes argument: without it, AC_CHECK_HEADER
+ dnl checks only whether the header can be preprocessed, not that it
+ dnl can be compiled and in Linux 2.6.16 joystick.h is present but
+ dnl can't be compiled because of an error and with the default
+ dnl AC_CHECK_HEADER semantics we'd still detect it in this case and
+ dnl build would fail later
+ AC_CHECK_HEADER(linux/joystick.h, wxUSE_JOYSTICK=yes,,[#include <stdio.h>])
fi
fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
fi
+if test "$wxUSE_SEARCHCTRL" = "yes"; then
+ AC_DEFINE(wxUSE_SEARCHCTRL)
+ USES_CONTROLS=1
+fi
+
if test "$wxUSE_SLIDER" = "yes"; then
AC_DEFINE(wxUSE_SLIDER)
USES_CONTROLS=1
disabled_var=DISABLED_`echo $subdir | tr [[a-z]] [[A-Z]]`;
eval "disabled=\$$disabled_var"
disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
- makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | egrep -v "$disabled"`
+ makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
fi
else dnl we build wxBase only
dnl don't take all samples/utils, just those which build with
projects / wxWidgets.git / blobdiff