--------------------- PatchSet 1836 Date: 2005/09/15 08:49:37 Author: serassio Branch: nt Tag: (none) Log: related things. --------------------------------------------------------------------- Members: acinclude.m4:1.3.16.7->1.3.16.8 configure.in:1.26.2.60->1.26.2.61 Index: squid3/acinclude.m4 =================================================================== RCS file: /cvsroot/squid-sf//squid3/acinclude.m4,v retrieving revision 1.3.16.7 retrieving revision 1.3.16.8 diff -u -r1.3.16.7 -r1.3.16.8 --- squid3/acinclude.m4 18 Dec 2004 08:11:34 -0000 1.3.16.7 +++ squid3/acinclude.m4 15 Sep 2005 08:49:37 -0000 1.3.16.8 @@ -1,123 +1,3 @@ -dnl COMPILER WIN32 support ==================================== -# figure out how to run CC with access to the win32 api if present -# configure that as the CC program, -# WIN32 may be present with WINE, under cygwin, or under mingw, -# or cross compilers targeting those same three targets. -# as it happens, I can only test cygwin, so extra input here will be appreciated -# send bug reports to Robert Collins -# -# logic: is CC already configured? if not, call AC_PROG_CC. -# if so - try it. If that doesn't work ,try -mwin32. If that doesn't work, fail -# -# 2001-03-15 - Changed from yes/no to true/false -suggested by Lars J Aas -# * Change true to : - suggest by Alexandre Oliva -# * changed layout on the basis of autoconf mailing list: -# there are now two interfaces, a language specific one which sets -# or clears WIN32 && WIN32FLAGS as appropriate -# * m4 Syntax fixup: Akim Demaille -# -# All faults& bugs are mine - Robert - -AC_DEFUN([AC_PROG_CC_WIN32], [ -dnl AC_REQUIRE([AC_PROG_CC])dnl -AC_MSG_CHECKING([how to access the Win32 API]) -WIN32FLAGS= -AC_TRY_COMPILE(,[ -#ifndef WIN32 -# ifndef _WIN32 -# error WIN32 or _WIN32 not defined -# endif -#endif], [ -dnl found windows.h with the current config. -AC_MSG_RESULT([present by default]) -], [ -dnl try -mwin32 -ac_compile_save="$ac_compile" -dnl we change CC so config.log looks correct -save_CC="$CC" -ac_compile="$ac_compile -mwin32" -CC="$CC -mwin32" -AC_TRY_COMPILE(,[ -#ifndef WIN32 -# ifndef _WIN32 -# error WIN32 or _WIN32 not defined -# endif -#endif], [ -dnl found windows.h using -mwin32 -AC_MSG_RESULT([found via -mwin32]) -ac_compile="$ac_compile_save" -CC="$save_CC" -WIN32FLAGS="-mwin32" -], [ -ac_compile="$ac_compile_save" -CC="$save_CC" -AC_MSG_RESULT([not found]) -]) -]) - -]) - - -# figure out how to run CXX with access to the win32 api if present -# configure that as the CXX program, -# WIN32 may be present with WINE, under cygwin, or under mingw, -# or cross compilers targeting those same three targets. -# as it happens, I can only test cygwin, so extra input here will be appreciated -# send bug reports to Robert Collins - -AC_DEFUN([AC_PROG_CXX_WIN32], [ -dnl AC_REQUIRE([AC_PROG_CXX])dnl -AC_MSG_CHECKING([how to access the Win32 API]) -WIN32FLAGS= -AC_TRY_COMPILE(,[ -#ifndef WIN32 -# ifndef _WIN32 -# error WIN32 or _WIN32 not defined -# endif -#endif], [ -dnl found windows.h with the current config. -AC_MSG_RESULT([present by default]) -], [ -dnl try -mwin32 -ac_compile_save="$ac_compile" -dnl we change CC so config.log looks correct -save_CXX="$CXX" -ac_compile="$ac_compile -mwin32" -CXX="$CXX -mwin32" -AC_TRY_COMPILE(,[ -#ifndef WIN32 -# ifndef _WIN32 -# error WIN32 or _WIN32 not defined -# endif -#endif], [ -dnl found windows.h using -mwin32 -AC_MSG_RESULT([found via -mwin32]) -ac_compile="$ac_compile_save" -CXX="$save_CXX" -WIN32FLAGS="-mwin32" -], [ -ac_compile="$ac_compile_save" -CXX="$save_CXX" -AC_MSG_RESULT([not found]) -]) -]) - -]) - - -# high level interface for finding out compiler support for win32. -AC_DEFUN([AC_API_WIN32], [ - -AC_LANG_CASE( - [C], AC_PROG_CC_WIN32 [CFLAGS="$WIN32FLAGS $CFLAGS" - CPPFLAGS="$WIN32FLAGS $CPPFLAGS"], - [C++], AC_PROG_CXX_WIN32 [CXXFLAGS="$WIN32FLAGS $CXXFLAGS" - CPPFLAGS="$WIN32FLAGS $CPPFLAGS"], - [AC_FATAL([No macro support for WIN32 with ] _AC_LANG) ]) -]) - -dnl end compiler WIN32 support =========================================== - dnl This encapsulates the nasty mess of headers we need to check when dnl checking types. AC_DEFUN([SQUID_DEFAULT_INCLUDES],[[ Index: squid3/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid3/configure.in,v retrieving revision 1.26.2.60 retrieving revision 1.26.2.61 diff -u -r1.26.2.60 -r1.26.2.61 --- squid3/configure.in 13 Sep 2005 07:25:38 -0000 1.26.2.60 +++ squid3/configure.in 15 Sep 2005 08:49:37 -0000 1.26.2.61 @@ -3,7 +3,7 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.26.2.60 2005/09/13 07:25:38 serassio Exp $ +dnl $Id: configure.in,v 1.26.2.61 2005/09/15 08:49:37 serassio Exp $ dnl dnl dnl @@ -13,7 +13,7 @@ AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE(squid, 3.0-PRE3-NT-CVS) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.26.2.60 $)dnl +AC_REVISION($Revision: 1.26.2.61 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -97,9 +97,6 @@ AC_DEFINE_UNQUOTED(CONFIG_HOST_TYPE, "$host",[Host type from configure]) -dnl Can the CC program be asked to use the Win32 API? -AC_API_WIN32 - AC_DEFINE_UNQUOTED(SQUID_CONFIGURE_OPTIONS, "$ac_configure_args", [configure command line used to configure Squid]) dnl Check for GNU cc