X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/239394fb06a3de189a6903ff5881fc6a26862976..16c587ca765d00a17eb4fe83f6d94901a08801a4:/aclocal.m4 diff --git a/aclocal.m4 b/aclocal.m4 index 0fce80ca4d..e9f5f1ac59 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.7.2 -*- Autoconf -*- +# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -612,6 +612,25 @@ if test "$ac_cv_cxx_const_cast" = yes; then fi ]) +dnl and http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_static_cast.html +AC_DEFUN([AC_CXX_STATIC_CAST], +[AC_CACHE_CHECK(whether the compiler supports static_cast<>, +ac_cv_cxx_static_cast, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +class Base { public : Base () {} virtual void f () = 0; }; +class Derived : public Base { public : Derived () {} virtual void f () {} }; +int g (Derived&) { return 0; }],[ +Derived d; Base& b = d; Derived& s = static_cast (b); return g (s);], + ac_cv_cxx_static_cast=yes, ac_cv_cxx_static_cast=no) + AC_LANG_RESTORE +]) +if test "$ac_cv_cxx_static_cast" = yes; then + AC_DEFINE(HAVE_STATIC_CAST,, [define if the compiler supports static_cast<>]) +fi +]) + # Configure paths for GTK+ # Owen Taylor 1997-2001 @@ -1062,6 +1081,182 @@ AC_DEFUN(PKG_CHECK_MODULES, [ +# Configure paths for SDL +# Sam Lantinga 9/21/99 +# stolen from Manish Singh +# stolen back from Frank Belew +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor + +dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS +dnl +AC_DEFUN(AM_PATH_SDL, +[dnl +dnl Get the cflags and libraries from the sdl-config script +dnl +AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], + sdl_prefix="$withval", sdl_prefix="") +AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], + sdl_exec_prefix="$withval", sdl_exec_prefix="") +AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], + , enable_sdltest=yes) + + if test x$sdl_exec_prefix != x ; then + sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" + if test x${SDL_CONFIG+set} != xset ; then + SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config + fi + fi + if test x$sdl_prefix != x ; then + sdl_args="$sdl_args --prefix=$sdl_prefix" + if test x${SDL_CONFIG+set} != xset ; then + SDL_CONFIG=$sdl_prefix/bin/sdl-config + fi + fi + + AC_REQUIRE([AC_CANONICAL_TARGET]) + PATH="$prefix/bin:$prefix/usr/bin:$PATH" + AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) + min_sdl_version=ifelse([$1], ,0.11.0,$1) + AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) + no_sdl="" + if test "$SDL_CONFIG" = "no" ; then + no_sdl=yes + else + SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` + SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` + + sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_sdltest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" +dnl +dnl Now check if the installed SDL is sufficiently new. (Also sanity +dnl checks the results of sdl-config to some extent +dnl + rm -f conf.sdltest + AC_TRY_RUN([ +#include +#include +#include +#include "SDL.h" + +char* +my_strdup (char *str) +{ + char *new_str; + + if (str) + { + new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str = NULL; + + return new_str; +} + +int main (int argc, char *argv[]) +{ + int major, minor, micro; + char *tmp_version; + + /* This hangs on some systems (?) + system ("touch conf.sdltest"); + */ + { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_sdl_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_sdl_version"); + exit(1); + } + + if (($sdl_major_version > major) || + (($sdl_major_version == major) && ($sdl_minor_version > minor)) || + (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); + printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); + printf("*** to point to the correct copy of sdl-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + +],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_sdl" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$SDL_CONFIG" = "no" ; then + echo "*** The sdl-config script installed by SDL could not be found" + echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the SDL_CONFIG environment variable to the" + echo "*** full path to sdl-config." + else + if test -f conf.sdltest ; then + : + else + echo "*** Could not run SDL test program, checking why..." + CFLAGS="$CFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + AC_TRY_LINK([ +#include +#include "SDL.h" + +int main(int argc, char *argv[]) +{ return 0; } +#undef main +#define main K_and_R_C_main +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding SDL or finding the wrong" + echo "*** version of SDL. If it is not finding SDL, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means SDL was incorrectly installed" + echo "*** or that you have moved SDL since it was installed. In the latter case, you" + echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + SDL_CFLAGS="" + SDL_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(SDL_CFLAGS) + AC_SUBST(SDL_LIBS) + rm -f conf.sdltest +]) + dnl --------------------------------------------------------------------------- dnl Support macros for makefiles generated by BAKEFILE. dnl --------------------------------------------------------------------------- @@ -1111,28 +1306,57 @@ AC_DEFUN(AC_BAKEFILE_PLATFORM, PLATFORM_MSDOS=0 PLATFORM_MAC=0 PLATFORM_MACOSX=0 - - case "${host}" in - *-*-cygwin* | *-*-mingw32* ) - PLATFORM_WIN32=1 - ;; - *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx ) - PLATFORM_MSDOS=1 - ;; - powerpc-*-darwin* ) - PLATFORM_MAC=1 - PLATFORM_MACOSX=1 - ;; - * ) - PLATFORM_UNIX=1 - ;; - esac + PLATFORM_OS2=0 + + if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then + case "${BAKEFILE_HOST}" in + *-*-cygwin* | *-*-mingw32* ) + PLATFORM_WIN32=1 + ;; + *-pc-msdosdjgpp ) + PLATFORM_MSDOS=1 + ;; + *-pc-os2_emx | *-pc-os2-emx ) + PLATFORM_OS2=1 + ;; + powerpc-*-darwin* ) + PLATFORM_MAC=1 + PLATFORM_MACOSX=1 + ;; + * ) + PLATFORM_UNIX=1 + ;; + esac + else + case "$BAKEFILE_FORCE_PLATFORM" in + win32 ) + PLATFORM_WIN32=1 + ;; + msdos ) + PLATFORM_MSDOS=1 + ;; + os2 ) + PLATFORM_OS2=1 + ;; + darwin ) + PLATFORM_MAC=1 + PLATFORM_MACOSX=1 + ;; + unix ) + PLATFORM_UNIX=1 + ;; + * ) + AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM]) + ;; + esac + fi AC_SUBST(PLATFORM_UNIX) AC_SUBST(PLATFORM_WIN32) AC_SUBST(PLATFORM_MSDOS) AC_SUBST(PLATFORM_MAC) AC_SUBST(PLATFORM_MACOSX) + AC_SUBST(PLATFORM_OS2) ]) @@ -1149,10 +1373,11 @@ AC_DEFUN(AC_BAKEFILE_SUFFIXES, SO_SUFFIX="so" SO_SUFFIX_MODULE="so" EXEEXT="" + LIBPREFIX=lib DLLPREFIX=lib DLLPREFIX_MODULE= - case "${host}" in + case "${BAKEFILE_HOST}" in *-hp-hpux* ) SO_SUFFIX="sl" SO_SUFFIX_MODULE="sl" @@ -1172,10 +1397,15 @@ AC_DEFUN(AC_BAKEFILE_SUFFIXES, EXEEXT=".exe" DLLPREFIX="" ;; - *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx ) + *-pc-msdosdjgpp ) EXEEXT=".exe" DLLPREFIX="" ;; + *-pc-os2_emx | *-pc-os2-emx ) + EXEEXT=".exe" + DLLPREFIX="" + LIBPREFIX="" + ;; powerpc-*-darwin* ) SO_SUFFIX="dylib" SO_SUFFIX_MODULE="bundle" @@ -1185,6 +1415,7 @@ AC_DEFUN(AC_BAKEFILE_SUFFIXES, AC_SUBST(SO_SUFFIX) AC_SUBST(SO_SUFFIX_MODULE) AC_SUBST(EXEEXT) + AC_SUBST(LIBPREFIX) AC_SUBST(DLLPREFIX) AC_SUBST(DLLPREFIX_MODULE) ]) @@ -1209,7 +1440,7 @@ AC_DEFUN(AC_BAKEFILE_SHARED_LD, PIC_FLAG="-fPIC" fi - case "${host}" in + case "${BAKEFILE_HOST}" in *-hp-hpux* ) dnl default settings are good for gcc but not for the native HP-UX if test "x$GCC" = "xyes"; then @@ -1266,7 +1497,27 @@ AC_DEFUN(AC_BAKEFILE_SHARED_LD, dnl or with a double stage link in order to create a single module dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved - cat <shared-ld-sh + dnl If using newer dev tools then there is a -single_module flag that + dnl we can use to do this, otherwise we'll need to use a helper + dnl script. Check the version of gcc to see which way we can go: + AC_CACHE_CHECK([for gcc 3.1 or later], wx_cv_gcc31, [ + AC_TRY_COMPILE([], + [ + #if (__GNUC__ < 3) || \ + ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1)) + #error old gcc + #endif + ], + [ + wx_cv_gcc31=yes + ], + [ + wx_cv_gcc31=no + ] + ) + ]) + if test "$wx_cv_gcc31" = "no"; then + cat <shared-ld-sh #!/bin/sh #----------------------------------------------------------------------------- #-- Name: distrib/mac/shared-ld-sh @@ -1294,7 +1545,7 @@ while test \${#} -gt 0; do shift ;; - -l*|-L*|-flat_namespace) + -l*|-L*|-flat_namespace|-headerpad_max_install_names) # collect these options args="\${args} \${1}" ;; @@ -1353,17 +1604,22 @@ rm -f master.\$\$.o exit 0 EOF - chmod +x shared-ld-sh + chmod +x shared-ld-sh + + dnl Use the shared-ld-sh helper script + SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o" + SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o" + SHARED_LD_CXX="$SHARED_LD_CC" + SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC" + else + dnl Use the -single_module flag and let the linker do it for us + SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o" + SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -headerpad_max_install_names -o" + SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o" + SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -headerpad_max_install_names -o" + fi - SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -undefined suppress -flat_namespace -o" - SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -undefined suppress -flat_namespace -o" - SHARED_LD_CXX="$SHARED_LD_CC" - SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC" PIC_FLAG="-dynamic -fPIC" - dnl FIXME - what about C libs? Gilles says to use c++ because it doesn't - dnl matter for C projects and matters for C++ ones - dnl FIXME - newer devel tools have linker flag to do this, the script - dnl is not necessary - detect! ;; *-*-aix* ) @@ -1401,12 +1657,13 @@ EOF *-*-sunos4* | \ *-*-osf* | \ *-*-dgux5* | \ + *-pc-os2_emx | *-pc-os2-emx | \ *-*-sysv5* ) dnl defaults are ok ;; *) - AC_MSG_ERROR(unknown system type $host.) + AC_MSG_ERROR(unknown system type $BAKEFILE_HOST.) esac if test "x$SHARED_LD_MODULE_CC" = "x" ; then @@ -1439,7 +1696,7 @@ AC_DEFUN(AC_BAKEFILE_SHARED_VERSIONS, USE_MACVERSION=0 SONAME_FLAG= - case "${host}" in + case "${BAKEFILE_HOST}" in *-*-linux* ) SONAME_FLAG="-Wl,-soname," USE_SOVERSION=1 @@ -1484,7 +1741,7 @@ AC_DEFUN(AC_BAKEFILE_DEPS, if test "x$GCC" = "xyes"; then DEPSMODE=gcc DEPS_TRACKING=1 - case "${host}" in + case "${BAKEFILE_HOST}" in powerpc-*-darwin* ) dnl -cpp-precomp (the default) conflicts with -MMD option dnl used by bk-deps (see also http://developer.apple.com/documentation/Darwin/Conceptual/PortingUnix/compiling/chapter_4_section_3.html) @@ -1503,8 +1760,8 @@ AC_DEFUN(AC_BAKEFILE_DEPS, cat <bk-deps #!/bin/sh -# This script is part of Bakefile (http://bakefile.sf.net) autoconf script. -# It is used to track C/C++ files dependencies in portable way. +# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf +# script. It is used to track C/C++ files dependencies in portable way. # # Permission is given to use this file in any way. @@ -1543,7 +1800,7 @@ if test \$DEPSMODE = gcc ; then else depfile=\`basename \$objfile | sed -e 's/\..*$/.d/g'\` if test -f \$depfile ; then - sed -e "/^\$objfile/! s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d + sed -e "/^\$objfile/!s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d rm -f \$depfile fi fi @@ -1575,15 +1832,11 @@ AC_DEFUN(AC_BAKEFILE_CHECK_BASIC_STUFF, AC_PROG_MAKE_SET AC_SUBST(MAKE_SET) - if test "$build" != "$host" ; then - AR=$host_alias-ar - STRIP=$host_alias-strip - else - AC_CHECK_PROG(AR, ar, ar, ar) - AC_CHECK_PROG(STRIP, strip, strip, true) - fi + AC_CHECK_TOOL(AR, ar, ar) + AC_CHECK_TOOL(STRIP, strip, :) + AC_CHECK_TOOL(NM, nm, :) - case ${host} in + case ${BAKEFILE_HOST} in *-hp-hpux* ) INSTALL_DIR="mkdir" ;; @@ -1593,7 +1846,7 @@ AC_DEFUN(AC_BAKEFILE_CHECK_BASIC_STUFF, AC_SUBST(INSTALL_DIR) LDFLAGS_GUI= - case ${host} in + case ${BAKEFILE_HOST} in *-*-cygwin* | *-*-mingw32* ) LDFLAGS_GUI="-Wl,--subsystem,windows -mwindows" esac @@ -1612,7 +1865,7 @@ AC_DEFUN(AC_BAKEFILE_RES_COMPILERS, RESCOMP= SETFILE= - case ${host} in + case ${BAKEFILE_HOST} in *-*-cygwin* | *-*-mingw32* ) dnl Check for win32 resources compiler: if test "$build" != "$host" ; then @@ -1632,14 +1885,122 @@ AC_DEFUN(AC_BAKEFILE_RES_COMPILERS, AC_SUBST(SETFILE) ]) +dnl --------------------------------------------------------------------------- +dnl AC_BAKEFILE_PRECOMP_HEADERS +dnl +dnl Check for precompiled headers support (GCC >= 3.4) +dnl --------------------------------------------------------------------------- + +AC_DEFUN(AC_BAKEFILE_PRECOMP_HEADERS, +[ + + AC_ARG_ENABLE([precomp-headers], + [ --disable-precomp-headers don't use precompiled headers even if compiler can], + [bk_use_pch="$enableval"]) + + GCC_PCH=0 + + if test "x$bk_use_pch" = "x" -o "x$bk_use_pch" = "xyes" ; then + if test "x$GCC" = "xyes"; then + dnl test if we have gcc-3.4: + AC_MSG_CHECKING([if the compiler supports precompiled headers]) + AC_TRY_COMPILE([], + [ + #if !defined(__GNUC__) || !defined(__GNUC_MINOR__) + #error "no pch support" + #endif + #if (__GNUC__ < 3) + #error "no pch support" + #endif + #if (__GNUC__ == 3) && \ + ((!defined(__APPLE_CC__) && (__GNUC_MINOR__ < 4)) || \ + ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3))) + #error "no pch support" + #endif + ], + [ + AC_MSG_RESULT([yes]) + dnl FIXME - this is temporary, till .gch dependencies + dnl are fixed in generated Makefiles + CPPFLAGS="-fpch-deps $CPPFLAGS" + GCC_PCH=1 + ], + [ + AC_MSG_RESULT([no]) + ]) + if test $GCC_PCH = 1 ; then + cat <bk-make-pch +#!/bin/sh + +# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf +# script. It is used to generated precompiled headers. +# +# Permission is given to use this file in any way. + +outfile="\${1}" +header="\${2}" +shift +shift + +compiler= +headerfile= +while test \${#} -gt 0; do + case "\${1}" in + -I* ) + incdir=\`echo \${1} | sed -e 's/-I\(.*\)/\1/g'\` + if test "x\${headerfile}" = "x" -a -f "\${incdir}/\${header}" ; then + headerfile="\${incdir}/\${header}" + fi + ;; + esac + compiler="\${compiler} \${1}" + shift +done + +if test "x\${headerfile}" = "x" ; then + echo "error: can't find header \${header} in include paths" >2 +else + if test -f \${outfile} ; then + rm -f \${outfile} + else + mkdir -p \`dirname \${outfile}\` + fi + depsfile=".deps/\`basename \${outfile}\`.d" + mkdir -p .deps + # can do this because gcc is >= 3.4: + \${compiler} -o \${outfile} -MMD -MF "\${depsfile}" "\${headerfile}" + exit \${?} +fi +EOF + chmod +x bk-make-pch + fi + fi + fi + + AC_SUBST(GCC_PCH) +]) + + + dnl --------------------------------------------------------------------------- dnl AC_BAKEFILE dnl dnl To be used in configure.in of any project using Bakefile-generated mks +dnl +dnl Behaviour can be modified by setting following variables: +dnl BAKEFILE_CHECK_BASICS set to "no" if you don't want bakefile to +dnl to perform check for basic tools like ranlib +dnl BAKEFILE_HOST set this to override host detection, defaults +dnl to ${host} +dnl BAKEFILE_FORCE_PLATFORM set to override platform detection dnl --------------------------------------------------------------------------- AC_DEFUN(AC_BAKEFILE, [ + if test "x$BAKEFILE_HOST" = "x"; then + BAKEFILE_HOST="${host}" + fi + if test "x$BAKEFILE_CHECK_BASICS" != "xno"; then AC_BAKEFILE_CHECK_BASIC_STUFF fi