--------------------- PatchSet 5699 Date: 2003/04/13 15:15:30 Author: serassio Branch: nt-2_5 Tag: (none) Log: MinGW + MSYS uses latest autotools version, so some update is needed in configure.in and lib/Makefile.am Members: configure.in:1.42.2.5.4.38->1.42.2.5.4.39 lib/Makefile.am:1.4.10.5->1.4.10.6 Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.42.2.5.4.38 retrieving revision 1.42.2.5.4.39 diff -u -r1.42.2.5.4.38 -r1.42.2.5.4.39 --- squid/configure.in 19 Mar 2003 10:19:01 -0000 1.42.2.5.4.38 +++ squid/configure.in 13 Apr 2003 15:15:30 -0000 1.42.2.5.4.39 @@ -3,7 +3,7 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.42.2.5.4.38 2003/03/19 10:19:01 serassio Exp $ +dnl $Id: configure.in,v 1.42.2.5.4.39 2003/04/13 15:15:30 serassio Exp $ dnl dnl dnl @@ -11,7 +11,7 @@ AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE(squid, 2.5.STABLE2.NT-CVS) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.42.2.5.4.38 $)dnl +AC_REVISION($Revision: 1.42.2.5.4.39 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -2231,7 +2231,7 @@ ;; *) echo "Will use our own inet_ntoa()." - AC_LIBOBJ="$AC_LIBOBJ inet_ntoa.o" + AC_LIBOBJ(inet_ntoa) # echo "WARNING: This looks bad, and probably prevents Squid from working." # echo " If you're on IRIX and using GCC 2.8, you probably need" # echo " to use the IRIX C compiler instead." Index: squid/lib/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid/lib/Makefile.am,v retrieving revision 1.4.10.5 retrieving revision 1.4.10.6 diff -u -r1.4.10.5 -r1.4.10.6 --- squid/lib/Makefile.am 8 Mar 2003 09:54:04 -0000 1.4.10.5 +++ squid/lib/Makefile.am 13 Apr 2003 15:15:31 -0000 1.4.10.6 @@ -40,8 +40,8 @@ EXTRA_libmiscutil_a_SOURCES = \ md5.c \ snprintf.c \ - drand48.c \ - getopt.c \ +# drand48.c \ +# getopt.c \ win32lib.c libmiscutil_a_SOURCES = \ Array.c \ @@ -66,7 +66,7 @@ uudecode.c \ $(WIN32SRC) libmiscutil_a_LIBADD = \ - @AC_LIBOBJ@ + @LIBOBJS@ # $(top_srcdir)/include/version.h should be a dependency libregex_a_SOURCES = \ GNUregex.c @@ -75,7 +75,7 @@ libntlmauth_a_SOURCES = \ ntlmauth.c libntlmauth_a_LIBADD = \ - @AC_LIBOBJ@ + @LIBOBJS@ libsspwin32_a_SOURCES = \ sspwin32.c