--------------------- PatchSet 7907 Date: 2006/05/23 20:11:54 Author: serassio Branch: nt Tag: (none) Log: Fixed merge errors and Mingw cleanup Members: configure.in:1.87.2.7->1.87.2.8 Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.87.2.7 retrieving revision 1.87.2.8 diff -u -r1.87.2.7 -r1.87.2.8 --- squid/configure.in 23 May 2006 19:02:43 -0000 1.87.2.7 +++ squid/configure.in 23 May 2006 20:11:54 -0000 1.87.2.8 @@ -3,7 +3,7 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.87.2.7 2006/05/23 19:02:43 serassio Exp $ +dnl $Id: configure.in,v 1.87.2.8 2006/05/23 20:11:54 serassio Exp $ dnl dnl dnl @@ -11,7 +11,7 @@ AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE(squid, 2.6.DEVEL-NT-CVS) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.87.2.7 $)dnl +AC_REVISION($Revision: 1.87.2.8 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -68,7 +68,7 @@ echo "PSAPI.DLL is recommended to run Squid on Windows NT Platform" echo "Please see PSAPI.DLL section on doc/win32-relnotes.html." else - AC_DEFINE(HAVE_WIN32_PSAPI) + AC_DEFINE(HAVE_WIN32_PSAPI,1,[Define if you have PSAPI.DLL on Windows systems]) LIBS="$LIBS -lpsapi" fi ;; @@ -1094,7 +1094,7 @@ Works only on Windows NT and Windows 2000 Platforms.], [ if test "$enableval" = "yes" ; then echo "Enabling WIN32 run service mode" - AC_DEFINE(USE_WIN32_SERVICE) + AC_DEFINE(USE_WIN32_SERVICE,1,[Define Windows NT & Windows 2000 run service mode]) fi ]) @@ -1473,13 +1473,6 @@ AC_HEADER_DIRENT AC_HEADER_STDC -case "$host_os" in -mingw|mingw32) - ac_cv_header_crypt_h='yes' - ac_cv_header_getopt_h='yes' - ;; -esac - dnl Check for headers. sys/types.h and stddef.h and limits must be first (see below) AC_CHECK_HEADERS( \ sys/types.h \ @@ -1834,14 +1827,6 @@ LIBS="$save_LIBS" done AC_MSG_RESULT($have_winsock) -case "$host_os" in - mingw|mingw32) - echo "Using own getopt." - AC_LIBOBJ(getopt) - ;; - *) - ;; -esac dnl Ripped from the Samba sources AC_CACHE_CHECK([for unix domain sockets],squid_cv_unixsocket, [ @@ -2132,7 +2117,6 @@ dnl Override some functions detect on MinGW becasue are emulated in source code case "$host_os" in mingw|mingw32) - ac_cv_func_crypt='yes' ac_cv_func_statfs='yes' ;; esac @@ -2710,7 +2694,6 @@ AC_MSG_RESULT("yes") else AC_MSG_RESULT("no") -<<<<<<< configure.in case "$host_os" in mingw|mingw32) echo "Using Win32 resolver instead."