Menu
▾
▴
[Wxlua-commit] wxLua/build/autoconf aclocal.m4, 1.54, 1.55 autoconf_inc.m4, 1.27, 1.28 bakefile-lang.m4, 1.1, 1.2 bakefile.m4, 1.1, 1.2
|
From: Francesco M. <fr...@us...> - 2008-01-15 00:05:11
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12306 Modified Files: aclocal.m4 autoconf_inc.m4 bakefile-lang.m4 bakefile.m4 Log Message: updated to bakefile 0.2.3 Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** autoconf_inc.m4 16 Jul 2007 19:34:28 -0000 1.27 --- autoconf_inc.m4 15 Jan 2008 00:04:58 -0000 1.28 *************** *** 1,13 **** ! dnl ### begin block 00_header[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### dnl dnl This macro was generated by ! dnl Bakefile 0.2.2 (http://www.bakefile.org) dnl Do not modify, all changes will be overwritten! ! BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2" dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../modules/build/bakefiles/modules.bkl] ### AC_BAKEFILE_PRECOMP_HEADERS ! dnl ### begin block 20_COND_BUILD_DEBUG[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG="#" if test "x$BUILD" = "xdebug" ; then --- 1,13 ---- ! dnl ### begin block 00_header[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### dnl dnl This macro was generated by ! dnl Bakefile 0.2.3 (http://www.bakefile.org) dnl Do not modify, all changes will be overwritten! ! BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.3" dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../modules/build/bakefiles/modules.bkl] ### AC_BAKEFILE_PRECOMP_HEADERS ! dnl ### begin block 20_COND_BUILD_DEBUG[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG="#" if test "x$BUILD" = "xdebug" ; then *************** *** 15,19 **** fi AC_SUBST(COND_BUILD_DEBUG) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG_UNICODE_0="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then --- 15,19 ---- fi AC_SUBST(COND_BUILD_DEBUG) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG_UNICODE_0="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then *************** *** 21,25 **** fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_0) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG_UNICODE_1="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then --- 21,25 ---- fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_0) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG_UNICODE_1="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then *************** *** 27,31 **** fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_1) ! dnl ### begin block 20_COND_BUILD_RELEASE[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_RELEASE="#" if test "x$BUILD" = "xrelease" ; then --- 27,31 ---- fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_1) ! dnl ### begin block 20_COND_BUILD_RELEASE[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_BUILD_RELEASE="#" if test "x$BUILD" = "xrelease" ; then *************** *** 33,37 **** fi AC_SUBST(COND_BUILD_RELEASE) ! dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_RELEASE_UNICODE_1="#" if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then --- 33,37 ---- fi AC_SUBST(COND_BUILD_RELEASE) ! dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_BUILD_RELEASE_UNICODE_1="#" if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then *************** *** 39,43 **** fi AC_SUBST(COND_BUILD_RELEASE_UNICODE_1) ! dnl ### begin block 20_COND_DEPS_TRACKING_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_DEPS_TRACKING_0="#" if test "x$DEPS_TRACKING" = "x0" ; then --- 39,43 ---- fi AC_SUBST(COND_BUILD_RELEASE_UNICODE_1) ! dnl ### begin block 20_COND_DEPS_TRACKING_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_DEPS_TRACKING_0="#" if test "x$DEPS_TRACKING" = "x0" ; then *************** *** 45,49 **** fi AC_SUBST(COND_DEPS_TRACKING_0) ! dnl ### begin block 20_COND_DEPS_TRACKING_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_DEPS_TRACKING_1="#" if test "x$DEPS_TRACKING" = "x1" ; then --- 45,49 ---- fi AC_SUBST(COND_DEPS_TRACKING_0) ! dnl ### begin block 20_COND_DEPS_TRACKING_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_DEPS_TRACKING_1="#" if test "x$DEPS_TRACKING" = "x1" ; then *************** *** 93,97 **** fi AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) ! dnl ### begin block 20_COND_PLATFORM_MAC_1[../../apps/build/bakefiles/apps.bkl,../../util/build/bakefiles/util.bkl] ### COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then --- 93,103 ---- fi AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) ! dnl ### begin block 20_COND_PLATFORM_MAC_0[../../apps/build/bakefiles/apps.bkl] ### ! COND_PLATFORM_MAC_0="#" ! if test "x$PLATFORM_MAC" = "x0" ; then ! COND_PLATFORM_MAC_0="" ! fi ! AC_SUBST(COND_PLATFORM_MAC_0) ! dnl ### begin block 20_COND_PLATFORM_MAC_1[../../apps/build/bakefiles/apps.bkl] ### COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then *************** *** 195,199 **** fi AC_SUBST(COND_SHARED_0_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_SHARED_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_1="#" if test "x$SHARED" = "x1" ; then --- 201,205 ---- fi AC_SUBST(COND_SHARED_0_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_SHARED_1[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_1="#" if test "x$SHARED" = "x1" ; then *************** *** 285,289 **** fi AC_SUBST(COND_SHARED_1_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_UNICODE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_UNICODE_0="#" if test "x$UNICODE" = "x0" ; then --- 291,295 ---- fi AC_SUBST(COND_SHARED_1_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_UNICODE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_UNICODE_0="#" if test "x$UNICODE" = "x0" ; then *************** *** 291,295 **** fi AC_SUBST(COND_UNICODE_0) ! dnl ### begin block 20_COND_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_UNICODE_1="#" if test "x$UNICODE" = "x1" ; then --- 297,301 ---- fi AC_SUBST(COND_UNICODE_0) ! dnl ### begin block 20_COND_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_UNICODE_1="#" if test "x$UNICODE" = "x1" ; then *************** *** 303,312 **** fi AC_SUBST(COND_USE_APPS_1) - dnl ### begin block 20_COND_USE_BIN2C_1[../../util/build/bakefiles/util.bkl] ### - COND_USE_BIN2C_1="#" - if test "x$USE_BIN2C" = "x1" ; then - COND_USE_BIN2C_1="" - fi - AC_SUBST(COND_USE_BIN2C_1) dnl ### begin block 20_COND_USE_PCH_1[../../modules/build/bakefiles/modules.bkl] ### COND_USE_PCH_1="#" --- 309,312 ---- *************** *** 375,412 **** fi AC_SUBST(COND_WINDOWS_IMPLIB_1) - dnl ### begin block 20_COND_WX_PORT_GTK[../../util/build/bakefiles/util.bkl] ### - COND_WX_PORT_GTK="#" - if test "x$WX_PORT" = "xgtk" ; then - COND_WX_PORT_GTK="" - fi - AC_SUBST(COND_WX_PORT_GTK) - dnl ### begin block 20_COND_WX_PORT_MAC[../../util/build/bakefiles/util.bkl] ### - COND_WX_PORT_MAC="#" - if test "x$WX_PORT" = "xmac" ; then - COND_WX_PORT_MAC="" - fi - AC_SUBST(COND_WX_PORT_MAC) - dnl ### begin block 20_COND_WX_PORT_MGL[../../util/build/bakefiles/util.bkl] ### - COND_WX_PORT_MGL="#" - if test "x$WX_PORT" = "xmgl" ; then - COND_WX_PORT_MGL="" - fi - AC_SUBST(COND_WX_PORT_MGL) - dnl ### begin block 20_COND_WX_PORT_MOTIF[../../util/build/bakefiles/util.bkl] ### - COND_WX_PORT_MOTIF="#" - if test "x$WX_PORT" = "xmotif" ; then - COND_WX_PORT_MOTIF="" - fi - AC_SUBST(COND_WX_PORT_MOTIF) - dnl ### begin block 20_COND_WX_PORT_MSW[../../util/build/bakefiles/util.bkl] ### - COND_WX_PORT_MSW="#" - if test "x$WX_PORT" = "xmsw" ; then - COND_WX_PORT_MSW="" - fi - AC_SUBST(COND_WX_PORT_MSW) - dnl ### begin block 20_COND_WX_PORT_X11[../../util/build/bakefiles/util.bkl] ### - COND_WX_PORT_X11="#" - if test "x$WX_PORT" = "xx11" ; then - COND_WX_PORT_X11="" - fi - AC_SUBST(COND_WX_PORT_X11) --- 375,376 ---- Index: bakefile.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/bakefile.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bakefile.m4 10 Jan 2008 00:25:16 -0000 1.1 --- bakefile.m4 15 Jan 2008 00:04:59 -0000 1.2 *************** *** 309,333 **** *-*-linux* ) ! if test "x$GCC" != "xyes"; then ! AC_CACHE_CHECK([for Intel compiler], bakefile_cv_prog_icc, ! [ ! AC_TRY_COMPILE([], ! [ ! #ifndef __INTEL_COMPILER ! This is not ICC ! #endif ! ], ! bakefile_cv_prog_icc=yes, ! bakefile_cv_prog_icc=no ! ) ! ]) ! if test "$bakefile_cv_prog_icc" = "yes"; then ! PIC_FLAG="-KPIC" ! fi fi ;; *-*-solaris2* ) ! if test "x$GCC" != xyes ; then SHARED_LD_CC="${CC} -G -o" SHARED_LD_CXX="${CXX} -G -o" --- 309,323 ---- *-*-linux* ) ! if test "$INTELCC" = "yes"; then ! PIC_FLAG="-KPIC" ! elif test "x$SUNCXX" = "xyes"; then ! SHARED_LD_CC="${CC} -G -o" ! SHARED_LD_CXX="${CXX} -G -o" ! PIC_FLAG="-KPIC" fi ;; *-*-solaris2* ) ! if test "x$SUNCXX" = xyes ; then SHARED_LD_CC="${CC} -G -o" SHARED_LD_CXX="${CXX} -G -o" *************** *** 499,504 **** case "${BAKEFILE_HOST}" in ! *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu ) ! SONAME_FLAG="-Wl,-soname," USE_SOVERSION=1 USE_SOVERLINUX=1 --- 489,499 ---- case "${BAKEFILE_HOST}" in ! *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \ ! *-*-k*bsd*-gnu | *-*-mirbsd* ) ! if test "x$SUNCXX" = "xyes"; then ! SONAME_FLAG="-h " ! else ! SONAME_FLAG="-Wl,-soname," ! fi USE_SOVERSION=1 USE_SOVERLINUX=1 *************** *** 645,660 **** AC_CHECK_TOOL(NM, nm, :) ! case ${BAKEFILE_HOST} in ! *-hp-hpux* ) ! dnl HP-UX install doesn't handle the "-d" switch so don't ! dnl use it there ! INSTALL_DIR="mkdir -p" ! ;; ! * ) ! dnl we must refer to makefile's $(INSTALL) variable and not ! dnl current value of shell variable, hence the single quoting: ! INSTALL_DIR='$(INSTALL) -d' ! ;; ! esac AC_SUBST(INSTALL_DIR) --- 640,658 ---- AC_CHECK_TOOL(NM, nm, :) ! dnl This check is necessary because "install -d" doesn't exist on ! dnl all platforms (e.g. HP/UX), see http://www.bakefile.org/ticket/80 ! AC_MSG_CHECKING([for command to install directories]) ! INSTALL_TEST_DIR=acbftest$$ ! $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1 ! if test $? = 0 -a -d $INSTALL_TEST_DIR; then ! rmdir $INSTALL_TEST_DIR ! dnl we must refer to makefile's $(INSTALL) variable and not ! dnl current value of shell variable, hence the single quoting: ! INSTALL_DIR='$(INSTALL) -d' ! AC_MSG_RESULT([$INSTALL -d]) ! else ! INSTALL_DIR="mkdir -p" ! AC_MSG_RESULT([mkdir -p]) ! fi AC_SUBST(INSTALL_DIR) *************** *** 804,807 **** --- 802,811 ---- AC_PREREQ([2.58]) + dnl We need to always run C/C++ compiler tests, but it's also possible + dnl for the user to call these macros manually, hence this instead of + dnl simply calling these macros. See http://www.bakefile.org/ticket/64 + AC_REQUIRE([AC_BAKEFILE_PROG_CC]) + AC_REQUIRE([AC_BAKEFILE_PROG_CXX]) + if test "x$BAKEFILE_HOST" = "x"; then if test "x${host}" = "x" ; then *************** *** 824,828 **** AC_BAKEFILE_RES_COMPILERS ! BAKEFILE_BAKEFILE_M4_VERSION="0.2.2" dnl includes autoconf_inc.m4: --- 828,832 ---- AC_BAKEFILE_RES_COMPILERS ! BAKEFILE_BAKEFILE_M4_VERSION="0.2.3" dnl includes autoconf_inc.m4: *************** *** 866,873 **** ${D}* ${D}{DEPSFLAG} status=${D}? ! if test ${D}{status} != 0 ; then ! exit ${D}{status} ! fi ! # move created file to the location we want it in: while test ${D}# -gt 0; do case "${D}1" in --- 870,875 ---- ${D}* ${D}{DEPSFLAG} status=${D}? ! ! # determine location of created files: while test ${D}# -gt 0; do case "${D}1" in *************** *** 886,889 **** --- 888,899 ---- depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\` depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\` + + # if the compiler failed, we're done: + if test ${D}{status} != 0 ; then + rm -f ${D}depfile + exit ${D}{status} + fi + + # move created file to the location we want it in: if test -f ${D}depfile ; then sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** aclocal.m4 14 Jan 2008 17:11:10 -0000 1.54 --- aclocal.m4 15 Jan 2008 00:04:58 -0000 1.55 *************** *** 1,6 **** ! # generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,6 ---- ! # generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 13,16 **** --- 13,17 ---- m4_include([bakefile-dllar.m4]) + m4_include([bakefile-lang.m4]) m4_include([bakefile.m4]) m4_include([wxwin.m4]) Index: bakefile-lang.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/bakefile-lang.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bakefile-lang.m4 10 Jan 2008 00:25:16 -0000 1.1 --- bakefile-lang.m4 15 Jan 2008 00:04:58 -0000 1.2 *************** *** 24,98 **** dnl $Id$ dnl ! dnl Compiler detection macros by David Elliott dnl dnl =========================================================================== ! dnl Macros to detect non-GNU compilers (MetroWerks, XLC) dnl =========================================================================== dnl Based on autoconf _AC_LANG_COMPILER_GNU - AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_MWERKS], - [AC_CACHE_CHECK([whether we are using the Metrowerks _AC_LANG compiler], - [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks], - [AC_TRY_COMPILE([],[#ifndef __MWERKS__ - choke me - #endif - ], - [bakefile_compiler_mwerks=yes], - [bakefile_compiler_mwerks=no]) - bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks=$bakefile_compiler_mwerks - ]) - ]) - - dnl Loosely based on autoconf AC_PROG_CC - dnl TODO: Maybe this should wrap the call to AC_PROG_CC and be used instead. - AC_DEFUN([AC_BAKEFILE_PROG_MWCC], - [AC_LANG_PUSH(C) - _AC_BAKEFILE_LANG_COMPILER_MWERKS - MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes` - AC_LANG_POP(C) - ]) - - dnl Loosely based on autoconf AC_PROG_CXX - dnl TODO: Maybe this should wrap the call to AC_PROG_CXX and be used instead. - AC_DEFUN([AC_BAKEFILE_PROG_MWCXX], - [AC_LANG_PUSH(C++) - _AC_BAKEFILE_LANG_COMPILER_MWERKS - MWCXX=`test $bakefile_cv_cxx_compiler_mwerks = yes && echo yes` - AC_LANG_POP(C++) - ]) - - dnl Based on autoconf _AC_LANG_COMPILER_GNU - AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_XLC], - [AC_CACHE_CHECK([whether we are using the IBM xlC _AC_LANG compiler], - [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc], - [AC_TRY_COMPILE([],[#ifndef __xlC__ - choke me - #endif - ], - [bakefile_compiler_xlc=yes], - [bakefile_compiler_xlc=no]) - bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc=$bakefile_compiler_xlc - ]) - ]) - - dnl Loosely based on autoconf AC_PROG_CC - AC_DEFUN([AC_BAKEFILE_PROG_XLCC], - [AC_LANG_PUSH(C) - _AC_BAKEFILE_LANG_COMPILER_XLC - XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes` - AC_LANG_POP(C) - ]) - - dnl Loosely based on autoconf AC_PROG_CXX - AC_DEFUN([AC_BAKEFILE_PROG_XLCXX], - [AC_LANG_PUSH(C++) - _AC_BAKEFILE_LANG_COMPILER_XLC - XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes` - AC_LANG_POP(C++) - ]) - - dnl Based on autoconf _AC_LANG_COMPILER_GNU dnl _AC_BAKEFILE_LANG_COMPILER(NAME, LANG, SYMBOL, IF-YES, IF-NO) AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER], --- 24,36 ---- dnl $Id$ dnl ! dnl Compiler detection macros by David Elliott and Vadim Zeitlin dnl dnl =========================================================================== ! dnl Macros to detect different C/C++ compilers dnl =========================================================================== dnl Based on autoconf _AC_LANG_COMPILER_GNU dnl _AC_BAKEFILE_LANG_COMPILER(NAME, LANG, SYMBOL, IF-YES, IF-NO) AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER], *************** *** 114,118 **** ] ) - AC_LANG_POP($2) if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3" = "xyes"; then :; $4 --- 52,55 ---- *************** *** 120,123 **** --- 57,83 ---- :; $5 fi + AC_LANG_POP($2) + ]) + + dnl CodeWarrior Metrowerks compiler defines __MWERKS__ for both C and C++ + AC_DEFUN([AC_BAKEFILE_PROG_MWCC], + [ + _AC_BAKEFILE_LANG_COMPILER(Metrowerks, C, __MWERKS__, MWCC=yes) + ]) + + AC_DEFUN([AC_BAKEFILE_PROG_MWCXX], + [ + _AC_BAKEFILE_LANG_COMPILER(Metrowerks, C++, __MWERKS__, MWCXX=yes) + ]) + + dnl IBM xlC compiler defines __xlC__ for both C and C++ + AC_DEFUN([AC_BAKEFILE_PROG_XLCC], + [ + _AC_BAKEFILE_LANG_COMPILER([IBM xlC], C, __xlC__, XLCC=yes) + ]) + + AC_DEFUN([AC_BAKEFILE_PROG_XLCXX], + [ + _AC_BAKEFILE_LANG_COMPILER([IBM xlC], C++, __xlC__, XLCXX=yes) ]) *************** *** 229,233 **** --- 189,198 ---- [ AC_PROG_$1 + + dnl Intel compiler can be used under several different OS and even + dnl different architectures (x86, amd64 and Itanium) so it's easier to just + dnl always test for it AC_BAKEFILE_PROG_INTEL$1 + dnl if we're using gcc, we can't be using any of incompatible compilers if test "x$G$1" != "xyes"; then *************** *** 256,259 **** --- 221,229 ---- ;; + Linux*) + dnl Sun CC is now available under Linux too + AC_BAKEFILE_PROG_SUN$1 + ;; + HP-UX*) AC_BAKEFILE_PROG_HP$1 |
