dnl initialization
dnl ---------------------------------------------------------------------------
-AC_INIT([wxWidgets], [2.9.0], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.9.1], [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])
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
+dnl notice that if --host was given but --build was not, cross_compiling is
+dnl only set to "maybe" and not "yes" and will be either set to "yes" later or
+dnl configure will exit with error in AC_PROG_CC so don't test for = "yes" here
+if test "$cross_compiling" != "no"; then
+ HOST_PREFIX="${host_alias}-"
+ HOST_SUFFIX="-$host_alias"
+else
+ HOST_PREFIX=
+ HOST_SUFFIX=
+fi
dnl When making releases do:
dnl
wx_major_version_number=2
wx_minor_version_number=9
-wx_release_number=0
+wx_release_number=1
wx_subrelease_number=0
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
PROGRAM_EXT=
SAMPLES_RPATH_FLAG=
-SAMPLES_RPATH_POSTLINK=
+DYLIB_RPATH_INSTALL=
+DYLIB_RPATH_POSTLINK=
DEFAULT_STD_FLAG=yes
AC_DEFINE(__DARWIN__)
AC_DEFINE(TARGET_CARBON)
DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
- DEFAULT_STD_FLAG=no
- ;;
- powerpc-apple-macos* )
- dnl Classic Mac OS (< X)
- USE_UNIX=0
- dnl For some reason the test that should be cross-compiler capable fails
- dnl However, there is no doubt that MacOS PowerPC is big endian.
- ac_cv_c_bigendian=yes
- dnl AC_DEFINE(TARGET_CARBON)
- dnl platform.h needs TARGET_CARBON before setup.h, we'll add it to CPPFLAGS
- DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
- DEFAULT_STD_FLAG=no
;;
*-*-beos* )
DEFAULT_wxUSE_UNICODE_UTF8=auto
DEFAULT_wxUSE_OPENGL=auto
DEFAULT_wxUSE_MEDIACTRL=auto
+DEFAULT_wxUSE_COMPILER_TLS=auto
DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
WX_ARG_ENABLE(omf, [ --enable-omf use OMF object format], wxUSE_OMF)
fi
-dnl --enablle-debug is equivalent to both --enable-debug_flag and
+dnl --enable-debug is equivalent to both --enable-debug_flag and
dnl --enable-debug_info
if test "$wxUSE_DEBUG" = "yes"; then
DEFAULT_wxUSE_DEBUG_FLAG=yes
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)
-dnl currently we don't provide a switch for disabling it as it shouldn't be
-dnl necessary to do it unless the compiler doesn't support the new events and
-dnl this should be tested for by configure itself (but also isn't done yet
-dnl because there are no known examples of such compilers among the currently
-dnl supported ones)
-AC_DEFINE(wxEVENTS_COMPATIBILITY_2_8, 0)
-
WX_ARG_DISABLE(rpath, [ --disable-rpath disable use of rpath for uninstalled builds], wxUSE_RPATH)
WX_ARG_ENABLE(objc_uniquifying,[ --enable-objc_uniquifying enable Objective-C class name uniquifying], wxUSE_OBJC_UNIQUIFYING)
WX_ARG_DISABLE(visibility, [ --disable-visibility disable use of ELF symbols visibility even if supported], wxUSE_VISIBILITY)
+WX_ARG_DISABLE(tls, [ --disable-tls disable use of compiler TLS support], wxUSE_COMPILER_TLS)
dnl ---------------------------------------------------------------------------
dnl optional non GUI features
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 we add
-dnl -g and -O flags ourselves below
+dnl (if not already present in C*FLAGS) the -g and -O flags ourselves below
CFLAGS=${CFLAGS:=}
AC_BAKEFILE_PROG_CC
fi
fi
+dnl ---------------------------------------------------------------------------
+dnl Mac-specific SDK/architectures checks
+dnl ---------------------------------------------------------------------------
+
+if test "$wxUSE_MAC" = 1; then
+
retest_macosx_linking=no
dnl Support the old --enable-universal_binary in case anyone was using it.
-#if test "$wxUSE_MAC" = 1; then
if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
dnl --enable-universal_binary uses a default SDK (currently 10.4u)
dnl --enable-universal_binary=SDK names a path to an SDK
AC_MSG_WARN([Disabling precompiled headers due to universal binary build.])
bk_use_pch=no
fi
-#fi
dnl Set up the Mac OS X SDK. We do this early so configure tests will occur
dnl with the SDK in place.
wxUSE_MACOSX_VERSION_MIN=
fi
elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
- if test "$wxUSE_MAC" = 1; then
+ OSX_VERSION=`sw_vers -productVersion | grep 10.[[0-9]]`
+ if test "$wxUSE_OSX_CARBON" = 1 -o "x$OSX_VERSION" = "x10.4"; then
# otherwise configure stops on leopard for universal_binary
wxUSE_MACOSX_VERSION_MIN=10.4
+ else
+ # for OS X Cocoa, use 10.5 so we can get 64-bit compile on Snow Leopard
+ wxUSE_MACOSX_VERSION_MIN=10.5
+ fi
+fi
+
+NEEDS_GCC40="no"
+if test "x$wxUSE_MACOSX_VERSION_MIN" == "x10.4"; then
+ NEEDS_GCC40="yes"
+fi
+
+if test "$wxUSE_OSX_CARBON" = 1; then
+ NEEDS_GCC40="yes"
+fi
+
+if test "x$NEEDS_GCC40" == "xyes"; then
+ # gcc 4.2 cannot compile 10.4 compatible code, so if the user is using it
+ # and wants 10.4 compatible code, then 'downgrade' to 4.0
+ # This is also the simplest way to get 32-bit binaries on Snow Leopard.
+ if test "x$CC" = "xgcc"; then
+ CCVERSION=`$CC --version | grep 4.[[2-9]].`
+ if test "x$CCVERSION" != "x"; then
+ echo "$as_me:$LINENO: WARNING: gcc >= 4.2 cannot compile 10.4 compatible code. Using gcc 4.0 instead."
+ CC="/usr/bin/gcc-4.0"
+ fi
+ fi
+
+ if test "x$CXX" = "xg++"; then
+ CCVERSION=`$CXX --version | grep 4.[[2-9]].`
+ if test "x$CCVERSION" != "x"; then
+ CXX="/usr/bin/g++-4.0"
+ fi
fi
fi
AC_LANG_POP()
fi
+fi dnl wxUSE_MAC
case "${host}" in
/usr/local/include \
/usr/local/X11/include \
/usr/local/include/X11 \
+ /usr/local/X11R7/include \
/usr/local/X11R6/include \
+ /usr/local/include/X11R7 \
/usr/local/include/X11R6 \
\
/usr/Motif-2.1/include \
\
/usr/include/Xm \
\
+ /usr/X11R7/include \
/usr/X11R6/include \
/usr/X11R6.4/include \
\
+ /usr/include/X11R7 \
/usr/include/X11R6 \
\
/usr/X11/include \
wxUSE_OPENGL=no
USE_OPENGL=0
fi
- else
- dnl libraries are available... change 'auto' in 'yes'
- wxUSE_OPENGL=yes
fi
else
AC_MSG_WARN([wxGLCanvas not implemented for this port, library will be compiled without it.])
wxUSE_OPENGL="no"
fi
+ if test "$wxUSE_OPENGL" = "auto"; then
+ dnl if the OpenGL libraries were unavailable, this would have been
+ dnl changed to "no" above, if it wasn't, change it to "yes" as we've
+ dnl verified that we can indeed use OpenGL
+ wxUSE_OPENGL=yes
+ fi
+
if test "$wxUSE_OPENGL" = "yes"; then
USE_OPENGL=1
AC_DEFINE(wxUSE_OPENGL)
;;
*-*-darwin* )
- install_name_tool=`which install_name_tool`
+ install_name_tool=`which ${HOST_PREFIX}install_name_tool`
if test "$install_name_tool" -a -x "$install_name_tool"; then
- SAMPLES_RPATH_POSTLINK="\$(wx_top_builddir)/change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
+ DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
cat <<EOF >change-install-names
#!/bin/sh
libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
-inst_cmd="install_name_tool "
for i in \${libnames} ; do
- inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}"
+ ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
+ for dep in \${libnames} ; do
+ ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i}
+ done
done
-\${inst_cmd} \${3}
EOF
chmod +x change-install-names
+ DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib"
fi
dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error:
if test $wxUSE_RPATH = "no"; then
SAMPLES_RPATH_FLAG=''
- SAMPLES_RPATH_POSTLINK=''
+ DYLIB_PATH_POSTLINK=''
WXCONFIG_RPATH=''
fi
WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[[a-z]]' '[[A-Z]]'`
-TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}"
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
-TOOLCHAIN_FULLNAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
-
-if test "$cross_compiling" = "yes"; then
- HOST_SUFFIX="-$host_alias"
- TOOLCHAIN_NAME="$TOOLCHAIN_NAME$HOST_SUFFIX"
- TOOLCHAIN_FULLNAME="${host_alias}-$TOOLCHAIN_FULLNAME"
-fi
+TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
dnl library link name
dnl These just save us from exporting lib_{unicode,debug,flavour}_suffix.
fi
fi
- dnl test for compiler thread-specific variables support
- AC_CACHE_CHECK([for __thread keyword],
- wx_cv_cc___thread,
- [
- AC_TRY_COMPILE([#include <pthread.h>],
- [
- static __thread int n = 0;
- static __thread int *p = 0;
- ],
- wx_cv_cc___thread=yes,
- wx_cv_cc___thread=no
- )
- ]
- )
-
- if test "$wx_cv_cc___thread" = "yes"; then
- AX_GXX_VERSION
- if test -n "$ax_cv_gxx_version"; then
- dnl g++ supports __thread since at least version 3.3 but its support
- dnl seems to be broken until 4.1, see
- dnl http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/108388
- dnl
- dnl NB: we still need to test __thread support with
- dnl AC_TRY_COMPILE above even for g++ 4 as it doesn't
- dnl support it for all architectures (e.g. it doesn't
- dnl work under OS X)
- AC_MSG_CHECKING([whether __thread support in g++ is usable])
- case "$ax_cv_gxx_version" in
- 1.* | 2.* | 3.* )
- AC_MSG_RESULT([no, it's broken])
- wx_cv_cc___thread=no
- ;;
- *)
- AC_MSG_RESULT([yes, it works])
- ;;
- esac
+ if test "$wxUSE_COMPILER_TLS" = "auto"; then
+ if test "$USE_NETBSD" = 1; then
+ AC_MSG_WARN([Disabling TLS under NetBSD, please contact wx-dev if it works now])
+ wxUSE_COMPILER_TLS=no
+ else
+ wxUSE_COMPILER_TLS=yes
fi
fi
- if test "$wx_cv_cc___thread" = "yes"; then
- AC_DEFINE(HAVE___THREAD_KEYWORD)
- fi
+ if test "$wxUSE_COMPILER_TLS" = "yes"; then
+ dnl test for compiler thread-specific variables support
+ AC_CACHE_CHECK([for __thread keyword],
+ wx_cv_cc___thread,
+ [
+ AC_TRY_COMPILE([#include <pthread.h>],
+ [
+ static __thread int n = 0;
+ static __thread int *p = 0;
+ ],
+ wx_cv_cc___thread=yes,
+ wx_cv_cc___thread=no
+ )
+ ]
+ )
+
+ if test "$wx_cv_cc___thread" = "yes"; then
+ AX_GXX_VERSION
+ if test -n "$ax_cv_gxx_version"; then
+ dnl g++ supports __thread since at least version 3.3 but its support
+ dnl seems to be broken until 4.1, see
+ dnl http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/108388
+ dnl
+ dnl NB: we still need to test __thread support with
+ dnl AC_TRY_COMPILE above even for g++ 4 as it doesn't
+ dnl support it for all architectures (e.g. it doesn't
+ dnl work under OS X)
+ AC_MSG_CHECKING([whether __thread support in g++ is usable])
+ case "$ax_cv_gxx_version" in
+ 1.* | 2.* | 3.* )
+ AC_MSG_RESULT([no, it's broken])
+ wx_cv_cc___thread=no
+ ;;
+ *)
+ AC_MSG_RESULT([yes, it works])
+ ;;
+ esac
+ fi
+ fi
+
+ if test "$wx_cv_cc___thread" = "yes"; then
+ AC_DEFINE(HAVE___THREAD_KEYWORD)
+ fi
+ fi
fi
dnl from if !MSW
dnl DEBUG_CFLAGS contains debugging options (supposed to be the same for C and C++
dnl compilers: we'd need a separate DEBUG_CXXFLAGS if this is ever not the case)
DEBUG_CFLAGS=
-if test "$wxUSE_DEBUG_INFO" = "yes" ; then
+if `echo $CXXFLAGS $CFLAGS | grep " -g" >/dev/null`; then
+ dnl the CXXFLAGS or the CFLAGS variable already contains the -g flag
+ dnl (e.g. it was specified by the user before running configure); since
+ dnl later they will be merged with DEBUG_CFLAGS, don't set the -g option
+ dnl in DEBUG_CFLAGS to avoid (possibly different) flag duplicates
+ AC_MSG_WARN([CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option])
+elif test "$wxUSE_DEBUG_INFO" = "yes" ; then
DEBUG_CFLAGS="-g"
fi
dnl C/C++ compiler option for optimization (supposed to be the same for both)
OPTIMISE_CFLAGS=
-if test "$wxUSE_OPTIMISE" = "no" ; then
- if test "$GCC" = yes ; then
- dnl use -O0 because compiling with it is faster than compiling with no
- dnl optimization options at all (at least with g++ 3.2)
- OPTIMISE_CFLAGS="-O0"
- fi
+if `echo $CXXFLAGS $CFLAGS | grep " -O" >/dev/null`; then
+ dnl the CXXFLAGS or the CFLAGS variable already contains -O optimization flag
+ dnl (e.g. it was specified by the user before running configure); since
+ dnl later they will be merged with OPTIMISE_CFLAGS, don't set the -O option
+ dnl in OPTIMISE_CFLAGS to avoid (possibly different) flag duplicates
+ AC_MSG_WARN([CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option])
else
- if test "$GCC" = yes ; then
- case "${host}" in
- *-pc-os2_emx | *-pc-os2-emx )
- dnl Not all of the supported gcc versions understand
- dnl -fstrict-aliasing and none actually needs it (yet).
- OPTIMISE_CFLAGS="-O2"
- ;;
- *)
- dnl Switch on optimisation but keep strict-aliasing off for
- dnl now (see -fstrict-aliasing in the gcc manual). When it is
- dnl switched back on consider using -Wstrict-aliasing=2.
- OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
- ;;
- esac
+ if test "$wxUSE_OPTIMISE" = "no" ; then
+ if test "$GCC" = yes ; then
+ dnl use -O0 because compiling with it is faster than compiling with no
+ dnl optimization options at all (at least with g++ 3.2)
+ OPTIMISE_CFLAGS="-O0"
+ fi
else
- OPTIMISE_CFLAGS="-O"
+ if test "$GCC" = yes ; then
+ case "${host}" in
+ *-pc-os2_emx | *-pc-os2-emx )
+ dnl Not all of the supported gcc versions understand
+ dnl -fstrict-aliasing and none actually needs it (yet).
+ OPTIMISE_CFLAGS="-O2"
+ ;;
+ *)
+ dnl Switch on optimisation but keep strict-aliasing off for
+ dnl now (see -fstrict-aliasing in the gcc manual). When it is
+ dnl switched back on consider using -Wstrict-aliasing=2.
+ OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
+ ;;
+ esac
+ else
+ OPTIMISE_CFLAGS="-O"
+ fi
fi
fi
fi
if test "$wxUSE_DATETIME" = "yes"; then
- dnl check for strptime and for its declaration as some systems lack it
- AC_CHECK_FUNC(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>
- ],
- [
- struct tm t;
- strptime("foo", "bar", &t);
- ],
- wx_cv_func_strptime_decl=yes,
- wx_cv_func_strptime_decl=no
- )
- AC_LANG_POP()
- ]
- )
- fi
- if test "$wx_cv_func_strptime_decl" = "yes"; then
- AC_DEFINE(HAVE_STRPTIME_DECL)
- else
- wx_strptime_decl="extern char *strptime(const char *, const char *, struct tm *);"
- fi
- if test "$ac_cv_func_strptime" = "yes"; then
- dnl strptime() behaviour doesn't conform to POSIX under Mac OS X <
- dnl 10.5 and possibly other BSD variants, check that strptime() we
- dnl have fails to parse format when the string doesn't match it instea
- dnl of just stopping immediately and returning non-NULL
- AC_CACHE_CHECK([whether strptime() fails on invalid strings],
- wx_cv_func_strptime_ok,
- [AC_RUN_IFELSE(
- [
- #include <stdlib.h>
- #include <time.h>
- #include "confdefs.h"
-
- $wx_strptime_decl
-
- int main()
- {
- struct tm t;
- return !!strptime("", "%x", &t);
- }
- ],
- wx_cv_func_strptime_ok=yes,
- wx_cv_func_strptime_ok=no,
- dnl be pessimistic when cross-compiling
- wx_cv_func_strptime_ok=no
- )]
- )
-
- if test "$wx_cv_func_strptime_ok" = "yes"; then
- AC_DEFINE(HAVE_STRPTIME)
- fi
- fi
-
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>,
AC_DEFINE(wxUSE_STC)
USE_STC=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc"
+
+ dnl python is used to update src/stc.h (see build/bakefiles/scintilla.bkl)
+ AC_PATH_PROG(PYTHON, python)
+ if test "x$PYTHON" = "x"; then
+ COND_PYTHON="#"
+ fi
+ AC_SUBST(COND_PYTHON)
fi
if test "$wxUSE_MENUS" = "yes"; then
dnl get the string with OS info - used by wxGetOsDescription() on MacOS X
dnl ---------------------------------------------------------------------------
-if test "$cross_compiling" = "yes"; then
+if test "$cross_compiling" != "no"; then
dnl Use best guess from host as we can't use uname when cross compiling
OSINFO="\"$host\""
else
elif test "$GXX" = yes ; then
CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy"
AX_CXXFLAGS_GCC_OPTION(-Woverloaded-virtual, CXXWARNINGS)
+
+ dnl when building under Mac we currently get hundreds of deprecation
+ dnl warnings for Carbon symbols from the standard headers -- disable them
+ dnl as we already know that they're deprecated and nothing else can be seen
+ dnl with these warnings on
+ if test "$wxUSE_MAC" = 1 ; then
+ CXXWARNINGS="$CXXWARNINGS -Wno-deprecated-declarations"
+ fi
fi
fi
AC_SUBST(TOOLKIT_LOWERCASE)
AC_SUBST(TOOLKIT_VERSION)
+AC_SUBST(DYLIB_RPATH_INSTALL)
+AC_SUBST(DYLIB_RPATH_POSTLINK)
AC_SUBST(SAMPLES_RPATH_FLAG)
-AC_SUBST(SAMPLES_RPATH_POSTLINK)
AC_SUBST(HEADER_PAD_OPTION)
AC_SUBST(HOST_SUFFIX)
AC_SUBST(CPPUNIT_CFLAGS)
AC_CONFIG_HEADERS([lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in])
if test "$USE_WIN32" = 1; then
- AC_CONFIG_COMMANDS(
- [
- rcdefs.h
- ],
+ AC_CONFIG_COMMANDS([rcdefs.h],
[
mkdir -p $outdir &&
$CPP $infile | sed 's/^# *[1-9].*//;s/^ *//;/./,/^$/!d' > $outdir/rcdefs.h
projects / wxWidgets.git / blobdiff