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)
-WX_ARG_ENABLE(compat26, [ --disable-compat26 disable wxWidgets 2.6 compatibility], WXWIN_COMPATIBILITY_2_6, disable)
+WX_ARG_ENABLE(compat26, [ --enable-compat26 enable wxWidgets 2.6 compatibility], WXWIN_COMPATIBILITY_2_6, enable)
+WX_ARG_ENABLE(compat28, [ --disable-compat28 disable wxWidgets 2.8 compatibility], WXWIN_COMPATIBILITY_2_8, disable)
WX_ARG_ENABLE(rpath, [ --disable-rpath disable use of rpath for uninstalled builds], wxUSE_RPATH)
dnl Check for headers
dnl ------------------------------------------------------------------------
-AC_CHECK_HEADERS(stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h)
+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()])
dnl maybe wchar_t is in wcstr.h if we don't have wchar.h?
if test "$ac_cv_header_wchar_h" != "yes"; then
- AC_CHECK_HEADERS(wcstr.h)
+ AC_CHECK_HEADER(wcstr.h,,, [AC_INCLUDES_DEFAULT()])
fi
case "${host}" in
dnl POSIX needs this for select(), but old systems don't have it
if test "$USE_UNIX" = 1 ; then
- AC_CHECK_HEADERS([sys/select.h])
+ AC_CHECK_HEADER([sys/select.h],,, [AC_INCLUDES_DEFAULT()])
fi
dnl ---------------------------------------------------------------------------
dnl check the sizes of integral types (give some reasonable default values for
dnl cross-compiling)
dnl defines the size of certain types of variables in SIZEOF_<TYPE>
-AC_CHECK_SIZEOF(char, 1)
AC_CHECK_SIZEOF(short, 2)
AC_CHECK_SIZEOF(void *, 4)
AC_CHECK_SIZEOF(int, 4)
wx_cv_class_stdhashmapset=yes,
wx_cv_class_stdhashmapset=no)
]
- )]
+ )],
+ [],
+ [ ]
)
if test "$wx_cv_class_stdhashmapset" = yes; then
wx_cv_class_gnuhashmapset=yes,
wx_cv_class_gnuhashmapset=no)
]
- )]
+ )],
+ [],
+ [ ]
)
if test "$wx_cv_class_gnuhashmapset" = yes; then
if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
dnl according to Unix 98 specs, regcomp() is in libc but I believe that
dnl on some old systems it may be in libregex - check for it too?
- AC_CHECK_HEADER(regex.h, [AC_CHECK_FUNCS(regcomp re_search)])
+ AC_CHECK_HEADER(regex.h, [AC_CHECK_FUNCS(regcomp re_search)],, [ ])
if test "x$ac_cv_func_regcomp" != "xyes"; then
if test "$wxUSE_REGEX" = "sys" ; then
)
dnl If the test above did not come up with a value (e.g. cross
dnl compiling) then this should give a definitive answer
- AC_CHECK_HEADER(zlib.h)
+ AC_CHECK_HEADER(zlib.h,,, [ ])
system_zlib_h_ok=$ac_cv_header_zlib_h
fi
unset ac_cv_header_png_h
)]
)
- AC_CHECK_HEADER(png.h)
+ AC_CHECK_HEADER(png.h,,, [ ])
if test "$ac_cv_header_png_h" = "yes"; then
AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng -lz", , [-lz -lm])
TIFF_LINK=" -ltiff",
,
$TIFF_PREREQ_LINKS)
- ]
+ ],
+ [],
+ [ ]
)
if test "x$TIFF_LINK" = "x" ; then
AC_DEFINE(wxUSE_XML)
if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then
- AC_CHECK_HEADER([expat.h], [found_expat_h=1])
+ AC_CHECK_HEADER([expat.h], [found_expat_h=1],, [ ])
if test "x$found_expat_h" = "x1"; then
dnl Expat 1.95.6 comes with broken expat.h:
AC_CACHE_CHECK([if expat.h is valid C++ header],
dnl ------------------------------------------------------------------------
if test "$wxUSE_LIBMSPACK" != "no"; then
- AC_CHECK_HEADER([mspack.h], [found_mspack_h=1])
+ AC_CHECK_HEADER([mspack.h], [found_mspack_h=1],, [ ])
if test "x$found_mspack_h" = "x1"; then
AC_CHECK_LIB(mspack, mspack_create_chm_decompressor,
MSPACK_LINK=" -lmspack")
dnl are we building for a win32 target environment?
dnl If so, setup common stuff needed for both GUI and Base libs.
if test "$USE_WIN32" = 1 ; then
- AC_CHECK_HEADERS(w32api.h)
- AC_CHECK_HEADER(windows.h, [],
+ AC_CHECK_HEADER(w32api.h,,, [ ])
+ AC_CHECK_HEADER(windows.h,,
[
AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
- ])
+ ],
+ [ ])
dnl --- FIXME: This is still a somewhat random list of libs,
dnl --- some of them should probably be included conditionally.
WIN32INSTALL=win32install
dnl pbt.h is missing on Wine at least
- AC_CHECK_HEADERS(pbt.h, [], [AC_DEFINE(NEED_PBT_H)])
+ AC_CHECK_HEADER(pbt.h,, [AC_DEFINE(NEED_PBT_H)], [ ])
fi
if test "$wxUSE_GUI" = "yes"; then
wxUSE_DRAG_AND_DROP=no
fi
if test "$wxUSE_DRAGIMAGE" = "yes"; then
- AC_MSG_WARN([Drag Image and DandD not supported under wxCocoa yet, disabled])
+ AC_MSG_WARN([wxDragImage not supported under wxCocoa yet, disabled])
wxUSE_DRAGIMAGE=no
fi
fi
[AC_DEFINE(NEED_GTK_ICON_SIZE_LOOKUP)],
[#include <gtk/gtk.h>])
- dnl test if we have at least GTK+ 2.6:
- AC_MSG_CHECKING([if GTK+ is version >= 2.6])
+
+ dnl test if we have at least GTK+ 2.10:
+ AC_MSG_CHECKING([if GTK+ is version >= 2.10])
AC_TRY_COMPILE([
#include <gtk/gtk.h>
],
[
- #if !GTK_CHECK_VERSION(2,6,0)
- Not GTK+ 2.6
+ #if !GTK_CHECK_VERSION(2,10,0)
+ Not GTK+ 2.10
#endif
],
[
+ AC_DEFINE(__WXGTK210__)
AC_DEFINE(__WXGTK26__)
AC_DEFINE(__WXGTK24__)
AC_MSG_RESULT([yes])
- ac_wxgtk26=1
+ ac_wxgtk210=1
],
[
AC_MSG_RESULT([no])
- ac_wxgtk26=0
+ ac_wxgtk210=0
])
+ if test "$ac_wxgtk210" = 0; then
+ dnl test if we have at least GTK+ 2.6:
+ AC_MSG_CHECKING([if GTK+ is version >= 2.6])
+ AC_TRY_COMPILE([
+ #include <gtk/gtk.h>
+ ],
+ [
+ #if !GTK_CHECK_VERSION(2,6,0)
+ Not GTK+ 2.6
+ #endif
+ ],
+ [
+ AC_DEFINE(__WXGTK26__)
+ AC_DEFINE(__WXGTK24__)
+ AC_MSG_RESULT([yes])
+ ac_wxgtk26=1
+ ],
+ [
+ AC_MSG_RESULT([no])
+ ac_wxgtk26=0
+ ])
+ fi
+
if test "$ac_wxgtk26" = 0; then
- dnl test if we have at least GTK+ 2.4:
- AC_MSG_CHECKING([if GTK+ is version >= 2.4])
- AC_TRY_COMPILE([
- #include <gtk/gtk.h>
- ],
- [
- #if !GTK_CHECK_VERSION(2,4,0)
- Not GTK+ 2.4
- #endif
- ],
- [
- AC_DEFINE(__WXGTK24__)
- AC_MSG_RESULT([yes])
- ],
- [
- AC_MSG_RESULT([no])
- ])
+ dnl test if we have at least GTK+ 2.4:
+ AC_MSG_CHECKING([if GTK+ is version >= 2.4])
+ AC_TRY_COMPILE([
+ #include <gtk/gtk.h>
+ ],
+ [
+ #if !GTK_CHECK_VERSION(2,4,0)
+ Not GTK+ 2.4
+ #endif
+ ],
+ [
+ AC_DEFINE(__WXGTK24__)
+ AC_MSG_RESULT([yes])
+ ],
+ [
+ AC_MSG_RESULT([no])
+ ])
fi
CFLAGS="$save_CFLAGS"
if test "$wxUSE_GUI" = "yes"; then
if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
dnl defines HAVE_X11_XKBLIB_H
- AC_CHECK_HEADERS(X11/Xlib.h)
- AC_CHECK_HEADERS([X11/XKBlib.h], [], [],
+ AC_CHECK_HEADER(X11/Xlib.h,,, [ ])
+ AC_CHECK_HEADER([X11/XKBlib.h],,,
[
#if HAVE_X11_XLIB_H
#include <X11/Xlib.h>
dnl This is not ideal we really ough to use the unixodbc-config
dnl or iodbc-config if they exist.
- AC_CHECK_HEADER([sql.h], [found_sql_h=1])
+ AC_CHECK_HEADER([sql.h], [found_sql_h=1],, [ ])
if test "x$found_sql_h" = "x1" ; then
AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK=" -liodbc",
[
WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm)
if test "$ac_find_libraries" != "" ; then
AC_MSG_RESULT([yes])
- AC_CHECK_HEADERS([X11/extensions/xf86vmode.h],
+ AC_CHECK_HEADER([X11/extensions/xf86vmode.h],
[
GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
],
dnl ---------------------------------------------------------------------------
dnl DirectDraw for MSW - optionally used by WxDisplay.
dnl ---------------------------------------------------------------------------
- AC_CHECK_HEADERS([ddraw.h], [], [], [#include <windows.h>])
+ AC_CHECK_HEADER([ddraw.h], [], [], [#include <windows.h>])
fi
fi
fi
fi
])
- ])
+ ],
+ [],
+ [ ])
if test "x$OPENGL_LIBS" = "x"; then
dnl it should be an error and not a warning because OpenGL is not on
#include <wchar.h>"
case "${host}" in
*-*-solaris2* )
- AC_CHECK_HEADERS(widec.h)
+ AC_CHECK_HEADER(widec.h,,, [AC_INCLUDES_DEFAULT()])
if test "$ac_cv_header_widec_h" = "yes"; then
wchar_headers="$wchar_headers
#include <widec.h>"
dnl Check for ESD:
EXTRALIBS_ESD=
AC_CHECK_LIB(esd, esd_close, [
- AC_CHECK_HEADERS([esd.h], [
+ AC_CHECK_HEADER([esd.h], [
EXTRALIBS_ESD="-lesd"
- ])
+ ],
+ [],
+ [ ])
])
AC_SUBST(EXTRALIBS_ESD)
AC_DEFINE(wxHAVE_PTHREAD_CLEANUP)
fi
- AC_CHECK_HEADERS(sched.h)
+ AC_CHECK_HEADER(sched.h,,, [AC_INCLUDES_DEFAULT()])
if test "$ac_cv_header_sched_h" = "yes"; then
AC_CHECK_FUNC(sched_yield,
AC_DEFINE(HAVE_SCHED_YIELD),
AC_DEFINE(HAVE_PTHREAD_CANCEL),
AC_MSG_WARN([wxThread::Kill() will not work properly]))
+ AC_CHECK_FUNC(pthread_mutex_timedlock,
+ AC_DEFINE(HAVE_PTHREAD_MUTEX_TIMEDLOCK),
+ AC_MSG_WARN([wxMutex::LockTimeout() will not work]))
+
AC_CHECK_FUNC(pthread_attr_setstacksize,
AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE))
dnl compatibility level
dnl ---------------------------------------------------------------------------
-if test "x$WXWIN_COMPATIBILITY_2_4" = "xyes"; then
- AC_DEFINE(WXWIN_COMPATIBILITY_2_4)
+if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then
+ AC_DEFINE(WXWIN_COMPATIBILITY_2_6)
- WXWIN_COMPATIBILITY_2_6="yes"
+ WXWIN_COMPATIBILITY_2_8="yes"
fi
-if test "x$WXWIN_COMPATIBILITY_2_6" != "xno"; then
- AC_DEFINE(WXWIN_COMPATIBILITY_2_6)
+if test "x$WXWIN_COMPATIBILITY_2_8" != "xno"; then
+ AC_DEFINE(WXWIN_COMPATIBILITY_2_8)
fi
dnl ---------------------------------------------------------------------------
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>])
+ AC_CHECK_HEADER(linux/joystick.h, [wxUSE_JOYSTICK=yes],, [AC_INCLUDES_DEFAULT()])
fi
fi
-o "$wxUSE_CLIPBOARD" = "yes" \
-o "$wxUSE_OLE" = "yes" \
-o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
- AC_CHECK_HEADERS(ole2.h)
+ AC_CHECK_HEADER(ole2.h,,, [ ])
if test "$ac_cv_header_ole2_h" = "yes" ; then
if test "$GCC" = yes ; then
if test "$wxUSE_OLE" = "yes" ; then
AC_DEFINE(wxUSE_OLE)
AC_DEFINE(wxUSE_OLE_AUTOMATION)
- AC_DEFINE(wxUSE_OLE_ACTIVEX)
+ AC_DEFINE(wxUSE_ACTIVEX)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"
fi
fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
dynamic erase event exec font image minimal mobile \
mobile/wxedit mobile/styles propsize render \
- rotate shaped vscroll widgets"
+ rotate shaped taborder vscroll widgets"
if test "$wxUSE_MONOLITHIC" != "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
echo " Should wxWidgets be compiled in Unicode mode? ${wxUSE_UNICODE:-no}"
echo " What level of wxWidgets compatibility should be enabled?"
-echo " wxWidgets 2.4 ${WXWIN_COMPATIBILITY_2_4:-no}"
-echo " wxWidgets 2.6 ${WXWIN_COMPATIBILITY_2_6:-yes}"
+echo " wxWidgets 2.6 ${WXWIN_COMPATIBILITY_2_6:-no}"
+echo " wxWidgets 2.8 ${WXWIN_COMPATIBILITY_2_8:-yes}"
echo " Which libraries should wxWidgets use?"
echo " jpeg ${wxUSE_LIBJPEG-none}"
projects / wxWidgets.git / blobdiff