dnl than checking it during run-time
NEEDS_D_REENTRANT_FOR_R_FUNCS=0
-dnl the additional define needed for MT programs
-CPP_MT_FLAG=-D_REENTRANT
-
dnl the list of all available toolkits
dnl
dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
*-*-freebsd*)
USE_BSD=1
USE_FREEBSD=1
- CPP_MT_FLAG=-D_THREAD_SAFE
AC_DEFINE(__FREEBSD__)
AC_DEFINE(__BSD__)
DEFAULT_DEFAULT_wxUSE_GTK=1
dnl PowerPC Darwin based distributions (including Mac OS X)
USE_BSD=1
USE_DARWIN=1
- CPP_MT_FLAG=
SO_SUFFIX=dylib
AC_DEFINE(__BSD__)
AC_DEFINE(__DARWIN__)
AC_DEFINE(__UNIX__)
fi
-dnl check for glibc version
-if test "$USE_LINUX" = 1; then
- AC_CACHE_CHECK([for glibc 2.1 or later], wx_lib_glibc21,[
- AC_TRY_COMPILE([#include <features.h>],
- [
- #if !__GLIBC_PREREQ(2, 1)
- #error not glibc2.1
- #endif
- ],
- [
- wx_lib_glibc21=yes
- ],
- [
- wx_lib_glibc21=no
- ]
- )
- ])
- if test "$wx_lib_glibc21" = "yes"; then
- AC_DEFINE(wxHAVE_GLIBC2)
- fi
-fi
-
dnl ---------------------------------------------------------------------------
dnl command line options for configure
dnl ---------------------------------------------------------------------------
DEFAULT_wxUSE_OPTIMISE=no
DEFAULT_wxUSE_PROFILE=no
DEFAULT_wxUSE_NO_DEPS=no
- DEFAULT_wxUSE_NO_RTTI=yes
- DEFAULT_wxUSE_NO_EXCEPTIONS=yes
+ DEFAULT_wxUSE_NO_RTTI=no
+ DEFAULT_wxUSE_NO_EXCEPTIONS=no
DEFAULT_wxUSE_PERMISSIVE=no
DEFAULT_wxUSE_DEBUG_FLAG=yes
DEFAULT_wxUSE_DEBUG_INFO=yes
DEFAULT_wxUSE_OPTIMISE=yes
DEFAULT_wxUSE_PROFILE=no
DEFAULT_wxUSE_NO_DEPS=no
- DEFAULT_wxUSE_NO_RTTI=yes
- DEFAULT_wxUSE_NO_EXCEPTIONS=yes
+ DEFAULT_wxUSE_NO_RTTI=no
+ DEFAULT_wxUSE_NO_EXCEPTIONS=no
DEFAULT_wxUSE_PERMISSIVE=no
DEFAULT_wxUSE_DEBUG_FLAG=no
DEFAULT_wxUSE_DEBUG_INFO=no
AC_ARG_WITH(motif, [ --with-motif use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(mac, [ --with-mac use Mac OS X], [wxUSE_MAC="$withval" TOOLKIT_GIVEN=1])
AC_ARG_WITH(wine, [ --with-wine use WINE], [wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(msw, [ --with-msw use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW TOOLKIT_GIVEN=1])
+AC_ARG_WITH(msw, [ --with-msw use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(pm, [ --with-pm use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(mgl, [ --with-mgl use SciTech MGL], [wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(microwin, [ --with-microwin use MicroWindows], [wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(x11, [ --with-x11 use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
WX_ARG_ENABLE(nanox, [ --enable-nanox use NanoX], wxUSE_NANOX)
-AC_ARG_ENABLE(gtk2, [ --enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL)],wxUSE_GTK2=1,wxUSE_GTK2=0)
+AC_ARG_ENABLE(gtk2, [ --enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL)],wxUSE_GTK2="yes",wxUSE_GTK2="no")
WX_ARG_SYS_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG)
WX_ARG_SYS_WITH(libjpeg, [ --with-libjpeg use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
dnl cross-compiling support: we're cross compiling if the build system is
dnl different from the target one (assume host and target be always the same)
if test "$build" != "$host" ; then
- if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 ; then
+ if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 -o "$USE_UNIX"; then
CC=$host_alias-gcc
CXX=$host_alias-c++
AR=$host_alias-ar
dnl defines GCC with yes if using gcc
dnl defines GCC empty if not using gcc
dnl defines CFLAGS
+dnl
+dnl this magic incantation is needed to prevent AC_PROG_CC from setting the
+dnl default CFLAGS (something like "-g -O2") - we don't need this as add
+dnl -g and -O flags ourselves below
+CFLAGS=${CFLAGS:=}
AC_PROG_CC
-CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
-
dnl is -traditional needed for correct compilations
dnl adds -traditional for gcc if needed
AC_PROG_GCC_TRADITIONAL
dnl defines GXX with yes if using gxx
dnl defines GXX empty if not using gxx
dnl defines CXXFLAGS
+dnl
+dnl see CFLAGS line above
+CXXFLAGS=${CXXFLAGS:=}
AC_PROG_CXX
-CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'`
-
AC_LANG_RESTORE
dnl ranlib command
dnl flush the cache because checking for libraries below might abort
AC_CACHE_SAVE
+dnl check for glibc version
+if test "$USE_LINUX" = 1; then
+ AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[
+ AC_TRY_COMPILE([#include <features.h>],
+ [
+ #if !__GLIBC_PREREQ(2, 1)
+ #error not glibc2.1
+ #endif
+ ],
+ [
+ wx_cv_lib_glibc21=yes
+ ],
+ [
+ wx_cv_lib_glibc21=no
+ ]
+ )
+ ])
+ if test "$wx_cv_lib_glibc21" = "yes"; then
+ AC_DEFINE(wxHAVE_GLIBC2)
+ fi
+fi
+
dnl ---------------------------------------------------------------------------
dnl Optional libraries
dnl
wx_cv_lib_gtk=
if test "x$wxUSE_GTK2" = "xyes"; then
- AM_PATH_GTK_2_0(1.3.1, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
+ AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
fi
if test -z "$wx_cv_lib_gtk"; then
if test "$wxUSE_MAC" = 1; then
if test "$wxUSE_PRECOMP" = "yes"; then
CPPFLAGS="$CPPFLAGS -cpp-precomp"
+ else
+ CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
fi
CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
CFLAGS="$CFLAGS -fpascal-strings"
ALL_HEADERS="\$(ALL_HEADERS) \${UNIV_HEADERS}"
PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
- TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}"
+ if test "$wxUSE_X11" = 1; then
+ TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}${PATH_IFS}\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes"
+ else
+ TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}"
+ fi
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
WIDGET_SET=univ
else
dnl ---------------------------------------------------------------------------
dnl OpenGL libraries
dnl ---------------------------------------------------------------------------
+
if test "$wxUSE_OPENGL" = "yes"; then
if test "$wxUSE_MAC" = 1; then
OPENGL_LIBS="-framework OpenGL -framework AGL"
+ elif test "$wxUSE_MSW" = 1; then
+ OPENGL_LIBS="-lopengl32 -lglu32"
else
-
AC_CHECK_HEADER(GL/gl.h,
[
AC_MSG_CHECKING([for -lGL])
fi
])
- dnl check for OpenGL libs availability first
- dnl -lGL requires -lm with soem OpenGL versions
-
-# AC_CHECK_HEADER(GL/gl.h,
-# [
-# AC_CHECK_LIB(GL, glFlush,
-# [
-# OPENGL_LIBS="-lGL -lGLU"
-# ],
-# [
-# AC_CHECK_LIB(MesaGL, glFlush,
-# [
-# OPENGL_LIBS="-lMesaGL -lMesaGLU"
-# ],
-# [],
-# [-lm])
-# ],
-# [-lm])
-# ])
-
if test "x$OPENGL_LIBS" = "x"; then
dnl it should be an error and not a warning because OpenGL is not on
dnl by default and so if it had been explicitely requested, we
WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
-dnl the name of the resources file for wxMac
-WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
-WX_RESOURCES_MACOSX_COMPILED="lib${WX_LIBRARY}.r"
-
case "${host}" in
*-*-cygwin* | *-*-mingw32* )
WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
fi
+ ;;
+ *-*-darwin* )
+ dnl Under Mac OS X, we should build real frameworks instead of simple
+ dnl dynamic shared libraries (in order to embed the resources)
+ if test "$wxUSE_MAC" = 1; then
+ dnl the name of the resources file for wxMac
+ WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.r"
+ WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.rsrc"
+ fi
+ ;;
esac
dnl the name of the static library
;;
*-*-darwin* )
- CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT"
- CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT"
- SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o"
+ dnl For Unix to MacOS X porting instructions, see:
+ dnl http://fink.sourceforge.net/doc/porting/porting.html
+ CFLAGS="$CFLAGS -fno-common -DWXMAKINGDLL"
+ CXXFLAGS="$CXXFLAGS -fno-common -DWXMAKINGDLL"
+ dnl wxWindows must be fully binded (lazy binding breaks RTTI classinfo)
+ dnl this can be done either with the exe linker flag -Wl,-bind_at_load
+ dnl or with a double stage link in order to create a single module
+ dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
+ SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
PIC_FLAG="-dynamic -fPIC"
+ SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION}"
+ SONAME_FLAGS_GL=${SONAME_FLAGS}
;;
*-*-aix* )
if test "$wxUSE_MAC" = 1; then
dnl add the resources target for wxMac
- WX_ALL="${WX_ALL} \$(build_libdir)/lib${WX_LIBRARY}.r"
+ LIBWXMACRES="\$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
+ WX_ALL="${WX_ALL} ${LIBWXMACRES}"
WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
MACOSX_BUNDLE="bundle"
- LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
- LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
- LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_COMPILED} -o"
+ if test "$wxUSE_SHARED" = "yes"; then
+ dnl resources are bundled with shared library, not with applications
+ LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r -o \$(BIN_PROGRAM)"
+ LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r -o"
+ else
+ dnl resources are bundled with applications, not with static library
+ LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
+ LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r \${prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
+ fi
else
if test "$wxUSE_PM" = 1; then
LIBWXMACRESCOMP="emxbind -ep \$(BIN_PROGRAM)"
dnl Check for headers
dnl ------------------------------------------------------------------------
-dnl do not check for strings.h for wxMac
-dnl it exists but is only a simple redirection to string.h
-dnl it is in conflict with Strings.h in FlatCarbon headers
+dnl test for strings.h needed under AIX, but do not check for it wxMac as
+dnl it exists but is only a simple redirection to string.h and it is in
+dnl conflict with Strings.h in FlatCarbon headers
if test "$wxUSE_MAC" != 1; then
- dnl defines HAVE_STRINGS_H (where some string functions live on AIX for example)
+ dnl defines HAVE_STRINGS_H
AC_CHECK_HEADERS(strings.h)
fi
AC_CHECK_HEADERS(unistd.h)
dnl defines HAVE_WCHAR_H
AC_CHECK_HEADERS(wchar.h)
-dnl defines HAVE_WCSTR_H
-AC_CHECK_HEADERS(wcstr.h)
-dnl defined HAVE_WCTYPE_H
-AC_CHECK_HEADERS(wctype.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 checking for wctype.h is useless as we need wcslen(), not just wchar_t and
+dnl this function is never provided by it
+dnl AC_CHECK_HEADERS(wctype.h)
+
dnl defines HAVE_FNMATCH_H
AC_CHECK_HEADERS(fnmatch.h)
+
+if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
+ AC_CHECK_FUNCS(fnmatch)
+fi
+
dnl defines HAVE_LANGINFO_H (GNU libc locale parameters)
AC_CHECK_HEADERS(langinfo.h)
dnl defines uid_t and gid_t if not already defined
AC_TYPE_UID_T
-dnl check for wchar_t
-dnl Mac OS X does not provide wchar.h and wchar_t is defined by stdlib.h (GD)
-dnl on Cygwin wchar.h needs stddef.h to be #included by hand
-AC_CACHE_CHECK([for wchar_t], wx_cv_type_wchar_t,
-[
- 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
- ],
- [
- wchar_t wc, *ws;
- wc = L'a';
- ws = L"Hello, world!";
- ],
- wx_cv_type_wchar_t=yes,
- wx_cv_type_wchar_t=no
- )
-])
-
-if test "$wx_cv_type_wchar_t" = "yes"; then
- AC_DEFINE(wxUSE_WCHAR_T)
-fi
-
dnl check what exactly size_t is on this machine - this is necessary to avoid
dnl ambiguos overloads in several places, notably wx/string.h and wx/array.h
AC_LANG_SAVE
AC_CHECK_SIZEOF(void *, 4)
AC_CHECK_SIZEOF(int, 4)
AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(long long, 0)
+
+case "${host}" in
+ arm-*-linux* )
+ AC_CHECK_SIZEOF(long long, 8)
+ ;;
+ * )
+ AC_CHECK_SIZEOF(long long, 0)
+esac
+
dnl we have to do it ourselves because SGI/Irix's stdio.h does not include
dnl wchar_t and AC_CHECK_SIZEOF only includes stdio.h
dnl Check for functions
dnl ---------------------------------------------------------------------------
-dnl check for wcslen
-AC_CHECK_LIB(c, wcslen, [
- AC_DEFINE(HAVE_WCSLEN)
- WCHAR_LINK=
- ], [
- AC_CHECK_LIB(w, wcslen, [
- AC_DEFINE(HAVE_WCSLEN)
- WCHAR_LINK=" -lw"
- ], [
- AC_CHECK_LIB(msvcrt, wcslen, [
+dnl don't check for wchar_t functions if we haven't got wchar_t itself
+WCHAR_OK=0
+if test "$wx_cv_sizeof_wchar_t" != "0"; then
+ dnl check for wcslen
+ WCHAR_LINK=
+ AC_CHECK_FUNCS(wcslen, [
AC_DEFINE(HAVE_WCSLEN)
- WCHAR_LINK=
- ])
+ WCHAR_OK=1
+ ])
+
+ if test "$WCHAR_OK" = 0; then
+ if test "$TOOLKIT" = "MSW"; then
+ AC_CHECK_LIB(msvcrt, wcslen, [
+ AC_DEFINE(HAVE_WCSLEN)
+ WCHAR_OK=1
])
- ])
+ else
+ AC_CHECK_LIB(w, wcslen, [
+ AC_DEFINE(HAVE_WCSLEN)
+ WCHAR_LINK=" -lw"
+ WCHAR_OK=1
+ ])
+ fi
+ fi
+fi
-dnl use wcsrtombs instead of wcstombs which is buggy in old GNU libc versions
-dnl if possible
-AC_CHECK_FUNCS(wcsrtombs)
+dnl we need at least the definition of wchar_t itself and wcslen() to compile
+dnl with wchar_t support -- turn it off if we don't have this
+if test "$WCHAR_OK" = 1; then
+ AC_DEFINE(wxUSE_WCHAR_T)
+
+ dnl also try to use wcsrtombs instead of wcstombs which is buggy in old GNU
+ dnl libc versions if possible
+ AC_CHECK_FUNCS(wcsrtombs)
+else
+ AC_MSG_WARN([Wide character support is unavailable])
+fi
dnl check for vprintf/vsprintf() which are GNU extensions
AC_FUNC_VPRINTF
dnl ---------------------------------------------------------------------------
dnl under MSW we always have thread support
+CPP_MT_FLAG=
if test "$TOOLKIT" != "MSW"; then
dnl the code below:
- dnl defines THREADS_OBJ which contains the object files to build
- dnl defines THREADS_LINK which contains the thread library to link with
- dnl defines wxUSE_THREADS=1 if thread support is activated
+ dnl
+ 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_OBJ=
- CODE_GEN_FLAGS=
- CODE_GEN_FLAGS_CXX=
+ THREADS_CFLAGS=
if test "$wxUSE_THREADS" = "yes" ; then
if test "$wxUSE_WINE" = 1 ; then
if test "$wxUSE_THREADS" = "yes" ; then
dnl find if POSIX threads are available
+ dnl
+ dnl the tests here are based on ACX_PTHREAD macro from autoconf macro
+ dnl archive from http://ac-archive.sourceforge.net/
+ dnl
+ dnl thanks to Steven G. Johnson <stevenj@alum.mit.edu> and Alejandro
+ dnl Forero Cuervo <bachue@bachue.com> for the original code
+
+ dnl TODO: cache the result
+
+ dnl define the list of the thread options to try in the loop below
+ dnl with the convention that anything starting with '-' is a cpp flag
+ dnl while anything else is a library (i.e. there is an implicit "-l")
+ THREAD_OPTS="-pthread"
+ case "${host}" in
+ *-*-solaris2* | *-*-sunos4* )
+ if test "x$GCC" = "xyes"; then
+ dnl Solaris/gcc combination use this one for some reason
+ THREAD_OPTS="-pthreads $THREAD_OPTS"
+ else
+ THREAD_OPTS="-mt $THREAD_OPTS"
+ fi
+ ;;
+ *-*-freebsd*)
+ dnl look, in order, for the kernel threads, then Linux threads
+ dnl and finally the userland threads
+ THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
+ ;;
+ *-*-darwin*)
+ dnl Darwin / Mac OS X just uses -lpthread tested below
+ THREAD_OPTS=""
+ ;;
+ *-*-aix*)
+ dnl AIX calls the library libpthreads - thanks IBM!
+ THREAD_OPTS="pthreads"
+ ;;
+ esac
- dnl AIX calls the library libpthreads - thanks IBM!
- if test "$USE_AIX" = 1; then
- THREADS_LIB=pthreads
- else
- THREADS_LIB=pthread
- fi
+ dnl simply linking with libpthread should make the test below work but
+ dnl it's far from certain that the threaded programs compiled without
+ dnl any special switches actually work, so try it after all the others
+ THREAD_OPTS="$THREAD_OPTS pthread none"
+
+ dnl now test for all possibilities
+ THREADS_OK=no
+ for flag in $THREAD_OPTS; do
+ case $flag in
+ none)
+ AC_MSG_CHECKING([whether pthreads work without any flags])
+ ;;
- dnl standard lib name is pthread
- dnl We no longer test for pthread-0.7 as it breaks compilation on some
- dnl glibc2 systems, especially for static linkage.
- AC_CHECK_LIB($THREADS_LIB, pthread_create, [
- THREADS_OBJ="threadpsx.lo"
- THREADS_LINK=$THREADS_LIB
- ], [
- dnl thread functions are in libc_r under FreeBSD
- AC_CHECK_LIB(c_r, pthread_create, [
- THREADS_OBJ="threadpsx.lo"
- THREADS_LINK="c_r"
- ], [
- dnl VZ: SGI threads are not supported currently
- AC_CHECK_HEADER(sys/prctl.h, [
- THREADS_OBJ="threadsgi.lo"
- ])
- ])
- ])
+ -*)
+ AC_MSG_CHECKING([whether pthreads work with $flag])
+ THREADS_CFLAGS="$flag"
+ ;;
- if test -z "$THREADS_OBJ" ; then
- wxUSE_THREADS=no
- AC_MSG_WARN([No thread support on this system... disabled])
- fi
+ *)
+ AC_MSG_CHECKING([for the pthreads library -l$flag])
+ THREADS_LINK="-l$flag"
+ ;;
+ esac
+
+ save_LIBS="$LIBS"
+ save_CFLAGS="$CFLAGS"
+ LIBS="$THREADS_LINK $LIBS"
+ CFLAGS="$THREADS_CFLAGS $CFLAGS"
+
+ AC_TRY_LINK([#include <pthread.h>],
+ [pthread_create(0,0,0,0);],
+ THREADS_OK=yes)
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+
+ AC_MSG_RESULT($THREADS_OK)
+ if test "x$THREADS_OK" = "xyes"; then
+ break;
+ fi
+
+ THREADS_LINK=""
+ THREADS_CFLAGS=""
+ done
+
+ if test "x$THREADS_OK" != "xyes"; then
+ wxUSE_THREADS=no
+ AC_MSG_WARN([No thread support on this system... disabled])
+ else
+ dnl yes, these special compiler flags should be used with the
+ dnl linker as well
+ LIBS="$THREADS_LINK $THREADS_CFLAGS $LIBS"
+
+ AC_MSG_CHECKING([if more special flags are required for pthreads])
+ flag=no
+ case "${host}" in
+ *-aix* | *-freebsd*)
+ flag="-D_THREAD_SAFE"
+ ;;
+ *solaris* | alpha*-osf*)
+ flag="-D_REENTRANT"
+ ;;
+ esac
+ AC_MSG_RESULT(${flag})
+ if test "x$flag" != xno; then
+ THREADS_CFLAGS="$THREADS_CFLAGS $flag"
+ fi
+
+ if test "x$THREADS_CFLAGS" != "x"; then
+ dnl don't add these options to CPPFLAGS as cpp might not know them
+ CFLAGS="$CFLAGS $THREADS_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $THREADS_CFLAGS"
+ fi
+ fi
fi
dnl do other tests only if we are using threads
if test "$wxUSE_THREADS" = "yes" ; then
AC_CHECK_FUNCS(thr_setconcurrency)
- dnl define autoconf macro to check for given function in both pthread and
- dnl posix4 libraries
- dnl usage: AC_FUNC_THREAD(FUNCTION_NAME)
- dnl VZ: TODO
- dnl AC_DEFUN(AC_FUNC_THREAD,
- dnl [
- dnl AC_CHECK_LIB($THREADS_LINK, $1,
- dnl AC_DEFINE(HAVE_`'translit($1, `A-Z', 'a-z'),
- dnl [AC_CHECK_LIB([posix4], $1,
- dnl [AC_DEFINE(HAVE_`'translit($1, `A-Z', 'a-z'))
- dnl POSIX4_LINK=" -lposix4"
- dnl ])
- dnl ])
- dnl ])
-
AC_CHECK_HEADERS(sched.h)
-
- AC_CHECK_LIB($THREADS_LINK, sched_yield,
- AC_DEFINE(HAVE_SCHED_YIELD),
- [AC_CHECK_LIB([posix4], sched_yield,
- [AC_DEFINE(HAVE_SCHED_YIELD) POSIX4_LINK=" -lposix4"],
- AC_MSG_WARN(wxThread::Yield will not work properly)
- )]
- )
+ if test "$ac_cv_header_sched_h" = "yes"; then
+ AC_CHECK_FUNC(sched_yield,
+ AC_DEFINE(HAVE_SCHED_YIELD),
+ [
+ AC_CHECK_LIB(posix4,
+ sched_yield,
+ [AC_DEFINE(HAVE_SCHED_YIELD) POSIX4_LINK=" -lposix4"],
+ AC_MSG_WARN(wxThread::Yield will not work properly)
+ )
+ ]
+ )
+ fi
dnl to be able to set the thread priority, we need to have all of the
dnl following functions:
dnl (this one can be in either libpthread or libposix4 (under Solaris))
dnl 3. pthread_attr_getschedparam and pthread_attr_setschedparam
HAVE_PRIOR_FUNCS=0
- AC_CHECK_LIB($THREADS_LINK, pthread_attr_getschedpolicy,
- AC_CHECK_LIB($THREADS_LINK, pthread_attr_setschedparam,
- AC_CHECK_LIB($THREADS_LINK, sched_get_priority_max,
+ AC_CHECK_FUNC(pthread_attr_getschedpolicy,
+ AC_CHECK_FUNC(pthread_attr_setschedparam,
+ AC_CHECK_FUNC(sched_get_priority_max,
HAVE_PRIOR_FUNCS=1,
AC_CHECK_LIB([posix4], sched_get_priority_max,
[
AC_MSG_WARN(Setting thread priority will not work)
fi
- AC_CHECK_LIB($THREADS_LINK, pthread_cancel,
- AC_DEFINE(HAVE_PTHREAD_CANCEL),
- AC_MSG_WARN([wxThread::Kill() will not work properly]))
+ AC_CHECK_FUNC(pthread_cancel,
+ AC_DEFINE(HAVE_PTHREAD_CANCEL),
+ AC_MSG_WARN([wxThread::Kill() will not work properly]))
AC_CACHE_CHECK([for pthread_cleanup_push/pop], wx_cv_func_pthread_cleanup_push,
[
dnl (strictly speaking we only need _XOPEN_SOURCE=500 but just defining
dnl this disables _BSD_SOURCE which breaks libtiff compilation, so it is
dnl simpler to just define _GNU_SOURCE to get everything)
- if test "x$wx_lib_glibc21" = "xyes"; then
+ if test "x$wx_cv_lib_glibc21" = "xyes"; then
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
fi
AC_MSG_WARN([wxMutex won't be recursive on this platform])
fi
fi
-
- THREADS_LINK=" -l$THREADS_LINK"
-
- dnl building MT programs under Solaris with the native compiler requires -mt
- dnl switch
- if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
- CPPFLAGS="$CFLAGS -mt"
- CXXFLAGS="$CXXFLAGS -mt"
- LDFLAGS="$LDFLAGS -mt"
- fi
fi
dnl from if !MSW
if test "$wxUSE_THREADS" = "yes"; then
AC_DEFINE(wxUSE_THREADS)
- dnl we must define _REENTRANT or something along these lines for MT code
- TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS $CPP_MT_FLAG"
-
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
else
dnl on some systems, _REENTRANT should be defined if we want to use any _r()
PROFILE=" -pg"
fi
+CODE_GEN_FLAGS=
+CODE_GEN_FLAGS_CXX=
if test "$GCC" = "yes" ; then
if test "$wxUSE_NO_RTTI" = "yes" ; then
CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti"
fi
fi
-
-CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
-CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
if test "$wxUSE_OPTIMISE" = "no" ; then
OPTIMISE=
else
AC_CHECK_FUNCS(strptime)
dnl check for timezone variable
+ dnl doesn't exist under Darwin / Mac OS X which uses tm_gmtoff instead
AC_CACHE_CHECK(for timezone variable in <time.h>,
wx_cv_var_timezone,
[
],
[
if test "$USE_DOS" = 0 ; then
- AC_MSG_ERROR(no timezone variable)
+ AC_MSG_WARN(no timezone variable, will use tm_gmtoff instead)
fi
]
)
if test "$wxUSE_UNICODE" = "yes" ; then
AC_DEFINE(wxUSE_UNICODE)
+
+ if test "$wxUSE_MSW" != 1; then
+ wxUSE_UNICODE_MSLU=no
+ fi
if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
AC_CHECK_LIB(unicows,main,
if test "$wxUSE_MSW" = 1; then
if test "$wxUSE_MS_HTML_HELP" = "yes"; then
- AC_CHECK_HEADER(htmlhelp.h,
- [
- AC_DEFINE(wxUSE_MS_HTML_HELP)
- ],
- [
- AC_MSG_WARN([MS HTML Help cannot be used without htmlhelp.h... disabled])
- wxUSE_MS_HTML_HELP=no
- ])
+ AC_DEFINE(wxUSE_MS_HTML_HELP)
fi
fi
fi
if test "$wxUSE_DIRDLG" = "yes"; then
- if test "$wxUSE_CONSTRAINTS" != "yes"; then
- AC_MSG_WARN(wxDirDialog requires constraints so it won't be compiled without them)
+ if test "$wxUSE_TREECTRL" != "yes"; then
+ AC_MSG_WARN(wxDirDialog requires wxTreeCtrl so it won't be compiled without it)
else
- if test "$wxUSE_TREECTRL" != "yes"; then
- AC_MSG_WARN(wxDirDialog requires wxTreeCtrl so it won't be compiled without it)
- else
- AC_DEFINE(wxUSE_DIRDLG)
- fi
+ AC_DEFINE(wxUSE_DIRDLG)
fi
fi
dnl given the -lm comment there? Or should that comment (and
dnl this one) be removed.. [ 7 Nov 2001 ]
-LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DL_LINK -lm $LIBS"
+LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK -lm $LIBS"
if test "$wxUSE_GUI" = "yes"; then
dnl TODO some samples are never built so far:
dnl ipc, mfc, nativdlg, oleauto, ownerdrw
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
drawing dynamic erase event exec font image \
minimal richedit rotate widgets"
EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
+dnl remove the extra white space from the cc/c++/ld options
CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
+LIBS=`echo $LIBS | sed 's/ \+/ /g'`
-LDFLAGS="$LDFLAGS$PROFILE"
+LDFLAGS="$LDFLAGS $PROFILE"
dnl for convenience, sort the samples in alphabetical order
dnl
dnl additional libraries and linker settings
AC_SUBST(LDFLAGS)
AC_SUBST(LDFLAGS_GL)
+AC_SUBST(LDFLAGS_EXE)
AC_SUBST(OPENGL_LIBS)
AC_SUBST(DMALLOC_LIBS)
AC_SUBST(EXTRADEFS)
AC_SUBST(RESCOMP)
AC_SUBST(RESFLAGS)
AC_SUBST(RESPROGRAMOBJ)
-AC_SUBST(WX_RESOURCES_MACOSX)
-AC_SUBST(WX_RESOURCES_MACOSX_COMPILED)
+AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
+AC_SUBST(WX_RESOURCES_MACOSX_DATA)
dnl additional for Mac OS X
AC_SUBST(DEREZ)
projects / wxWidgets.git / blobdiff