From: robertc <> Date: Sun, 6 Oct 2002 14:18:01 +0000 (+0000) Subject: forgot to set the package name correctly X-Git-Tag: SQUID_3_0_PRE1~703 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e6c967ca51f55005cb8f313940272a2db1be3d2;p=thirdparty%2Fsquid.git forgot to set the package name correctly --- diff --git a/Makefile.in b/Makefile.in index 07afb4c4ac..402d7efddf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.28 2002/09/30 00:18:30 hno Exp $ +# $Id: Makefile.in,v 1.29 2002/10/06 08:18:01 robertc Exp $ # SHELL = @SHELL@ @@ -149,10 +149,9 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README ./include/autoconf.h.in ./include/stamp-h.in \ COPYING ChangeLog INSTALL Makefile.am Makefile.in TODO \ - acconfig.h acinclude.m4 aclocal.m4 cfgaux/compile \ - cfgaux/config.guess cfgaux/config.sub cfgaux/depcomp \ - cfgaux/install-sh cfgaux/missing cfgaux/mkinstalldirs configure \ - configure.in + acinclude.m4 aclocal.m4 cfgaux/compile cfgaux/config.guess \ + cfgaux/config.sub cfgaux/depcomp cfgaux/install-sh \ + cfgaux/missing cfgaux/mkinstalldirs configure configure.in all: all-recursive .SUFFIXES: @@ -188,7 +187,7 @@ $(srcdir)/./include/autoconf.h.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/./include/st rm -f $(srcdir)/./include/stamp-h.in; \ $(MAKE) $(srcdir)/./include/stamp-h.in; \ else :; fi -$(srcdir)/./include/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h +$(srcdir)/./include/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) @rm -f $(srcdir)/./include/stamp-h.in $(srcdir)/./include/stamp-h.inT @echo timestamp > $(srcdir)/./include/stamp-h.inT 2> /dev/null cd $(top_srcdir) && $(AUTOHEADER) diff --git a/configure b/configure index 46bee10ba3..657243927e 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.288 . +# From configure.in Revision: 1.289 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53. # @@ -1656,7 +1656,7 @@ fi # Define the identity of the package. PACKAGE=squid -VERSION=2.6-DEVEL-autoconf25 +VERSION=2.6-DEVEL cat >>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" diff --git a/configure.in b/configure.in index 8e7bfa1cbc..ec142d3c28 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ dnl Configuration input file for Squid dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.289 2002/10/06 02:21:25 robertc Exp $ +dnl $Id: configure.in,v 1.290 2002/10/06 08:18:01 robertc Exp $ dnl dnl dnl @@ -11,9 +11,9 @@ AC_INIT AC_PREREQ(2.53) AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_AUX_DIR(cfgaux) -AM_INIT_AUTOMAKE(squid, 2.6-DEVEL-autoconf25) +AM_INIT_AUTOMAKE(squid, 2.6-DEVEL) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.289 $)dnl +AC_REVISION($Revision: 1.290 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE diff --git a/include/autoconf.h.in b/include/autoconf.h.in index 6fb2bb6fc0..9b90149c72 100644 --- a/include/autoconf.h.in +++ b/include/autoconf.h.in @@ -1,408 +1,4 @@ /* include/autoconf.h.in. Generated from configure.in by autoheader. */ -/* - * All configurable options are enabled by using --enable-.... - * when running configure. See configure --help for a list - * of all available options. - * - * You are free to edit this file, but it will be overwritten - * each time you run configure. You may need to edit this file - * if configure falsely picks up a library function or structure - * that doesn't really work on your system. - * - * Another way to block a function that should not be detected - * is to - * setenv ac_cv_func_ no - * before running configure, as in - * setenv ac_cv_func_setresuid no - * - * It is possible to enable some of the configurable options - * by editing this file alone, but some of them requires changes - * in the Makefiles, wich is done automatically by configure. - * - */ - -#ifndef __CONFIGURE_H__ -#define __CONFIGURE_H__ -/* $Id: autoconf.h.in,v 1.125 2002/10/06 02:21:25 robertc Exp $ */ - -/* - * configure command line used to configure Squid - */ -#undef SQUID_CONFIGURE_OPTIONS - -/********************************* - * START OF CONFIGURABLE OPTIONS * - *********************************/ -/* - * If you are upset that the cachemgr.cgi form comes up with the hostname - * field blank, then define this to getfullhostname() - */ -#undef CACHEMGR_HOSTNAME - -/* - * What default TCP port to use for HTTP listening? - */ -#ifndef CACHE_HTTP_PORT -#undef CACHE_HTTP_PORT -#endif - -/* - * What default UDP port to use for ICP listening? - */ -#ifndef CACHE_ICP_PORT -#undef CACHE_ICP_PORT -#endif - -/* Compile & use the malloc package by Doug Lea] */ -#undef USE_DLMALLOC - -/* Define to do simple malloc debugging */ -#undef XMALLOC_DEBUG - -/* Define for log file trace of mem alloc/free */ -#undef MEM_GEN_TRACE - -/* Define to have malloc statistics */ -#undef XMALLOC_STATISTICS - -/* Define to have a detailed trace of memory allocations */ -#undef XMALLOC_TRACE - -#undef FORW_VIA_DB - -/* Define to enable CPU profiling within Squid */ -#undef USE_XPROF_STATS - -/* Define if you have problems with memPools and want to disable Pools */ -#undef DISABLE_POOLS - -/* Defines how many threads aufs uses for I/O */ -#undef AUFS_IO_THREADS - -/* - * If you want to use Squid's ICMP features (highly recommended!) then - * define this. When USE_ICMP is defined, Squid will send ICMP pings - * to origin server sites. This information is used in numerous ways: - * - Sent in ICP replies so neighbor caches know how close - * you are to the source. - * - For finding the closest instance of a URN. - * - With the 'test_reachability' option. Squid will return - * ICP_OP_MISS_NOFETCH for sites which it cannot ping. - */ -#undef USE_ICMP - -/* - * Traffic management via "delay pools". - */ -#undef DELAY_POOLS - -/* - * If you want to log User-Agent request header values, define this. - * By default, they are written to useragent.log in the Squid log - * directory. - */ -#undef USE_USERAGENT_LOG - -/* - * If you want to log Referer request header values, define this. - * By default, they are written to referer.log in the Squid log - * directory. - */ -#undef USE_REFERER_LOG - -/* - * A dangerous feature which causes Squid to kill its parent process - * (presumably the RunCache script) upon receipt of SIGTERM or SIGINT. - * Use with caution. - */ -#undef KILL_PARENT_OPT - -/* Define to enable SNMP monitoring of Squid */ -#undef SQUID_SNMP - -/* - * Define to enable WCCP - */ -#define USE_WCCP 1 - -/* - * Define this to include code which lets you specify access control - * elements based on ethernet hardware addresses. This code uses - * functions found in 4.4 BSD derviations (e.g. FreeBSD, ?). - */ -#undef USE_ARP_ACL - -/* - * Define this to include code for the Hypertext Cache Protocol (HTCP) - */ -#undef USE_HTCP - -/* - * Use Cache Digests for locating objects in neighbor caches. This - * code is still semi-experimental. - */ -#undef USE_CACHE_DIGESTS - -/* - * Cache Array Routing Protocol - */ -#define USE_CARP 1 - -/* Define if NTLM is allowed to fail gracefully when a helper has problems */ -#undef NTLM_FAIL_OPEN - -/******************************** - * END OF CONFIGURABLE OPTIONS * - ********************************/ - -/* Define if struct tm has tm_gmtoff member */ -#undef HAVE_TM_GMTOFF - -/* Define if struct mallinfo has mxfast member */ -#undef HAVE_EXT_MALLINFO - -/* Default FD_SETSIZE value */ -#undef DEFAULT_FD_SETSIZE - -/* Maximum number of open filedescriptors */ -#undef SQUID_MAXFD - -/* UDP send buffer size */ -#undef SQUID_UDP_SO_SNDBUF - -/* UDP receive buffer size */ -#undef SQUID_UDP_SO_RCVBUF - -/* TCP send buffer size */ -#undef SQUID_TCP_SO_SNDBUF - -/* TCP receive buffer size */ -#undef SQUID_TCP_SO_RCVBUF - -/* Host type from configure */ -#undef CONFIG_HOST_TYPE - -/* If we need to declare sys_errlist[] as external */ -#undef NEED_SYS_ERRLIST - -/* If gettimeofday is known to take only one argument */ -#undef GETTIMEOFDAY_NO_TZP - -/* If libresolv.a has been hacked to export _dns_ttl_ */ -#undef LIBRESOLV_DNS_TTL_HACK - -/* Define if struct ip has ip_hl member */ -#undef HAVE_IP_HL - -/* Define if your compiler supports prototyping */ -#undef HAVE_ANSI_PROTOTYPES - -/* Define if we should use GNU regex */ -#undef USE_GNUREGEX - -/* signed size_t, grr */ -#undef ssize_t - -/* - * Yay! Another Linux brokenness. Its not good enough to know that - * setresuid() exists, because RedHat 5.0 declare setresuid() but - * doesn't implement it. - */ -#undef HAVE_SETRESUID - -/* Define if you have struct rusage */ -#undef HAVE_STRUCT_RUSAGE - -/* - * This makes warnings go away. If you have socklen_t defined in your - * /usr/include files, then this should remain undef'd. Otherwise it - * should be defined to int. - */ -#undef socklen_t - -/* - * By default (for now anyway) Squid includes options which allows - * the cache administrator to violate the HTTP protocol specification - * in terms of cache behaviour. Setting this to '0' will disable - * such code. - */ -#define HTTP_VIOLATIONS 1 - -/* - * Enable support for Transparent Proxy on systems using IP-Filter - * address redirection. This provides "masquerading" support for non - * Linux system. - */ -#undef IPF_TRANSPARENT - -/* - * Enable support for Transparent Proxy on systems using PF address - * redirection. This provides "masquerading" support for OpenBSD. - */ -#undef PF_TRANSPARENT - -/* - * Enable code for assiting in finding memory leaks. Hacker stuff only. - */ -#undef USE_LEAKFINDER - -/* - * type of fd_set array - */ -#undef fd_mask - -/* - * If _res structure has nsaddr_list member - */ -#undef HAVE_RES_NSADDR_LIST - -/* - * If _res structure has ns_list member - */ -#undef HAVE_RES_NS_LIST - -/* - * Compile in support for Ident (RFC 931) lookups? Enabled by default. - */ -#define USE_IDENT 1 - -/* - * If your system has statvfs(), and if it actually works! - */ -#undef HAVE_STATVFS - -/* - * If --disable-internal-dns was given to configure, then we'll use - * the dnsserver processes instead. - */ -#undef USE_DNSSERVERS - -/* - * we check for the existance of struct mallinfo - */ -#undef HAVE_STRUCT_MALLINFO - -/* - * Do we want to use truncate(2) or unlink(2)? - */ -#undef USE_TRUNCATE - -/* - * Allow underscores in host names - */ -#undef ALLOW_HOSTNAME_UNDERSCORES - -/* - * Use the heap-based replacement techniques - */ -#undef HEAP_REPLACEMENT - -/* - * message type for message queues - */ -#undef mtyp_t - -/* - * Define this to include code for SSL encryption. - */ -#undef USE_SSL - -/* - * Define this to make use of the OpenSSL libraries for - * MD5 calculation rather than Squid's own MD5 implementation - * or if building with SSL encryption (USE_SSL) - */ -#undef USE_OPENSSL - -/* Define if you want to set the COSS membuf size */ -#undef COSS_MEMBUF_SZ - -/* Print stacktraces on fatal errors */ -#undef PRINT_STACK_TRACE - -/* - * Define this if unlinkd is required - * (strongly recommended for ufs storage type) - */ -#undef USE_UNLINKD - -/* - * Enable support for Transparent Proxy on Linux 2.4 systems - */ -#undef LINUX_NETFILTER - -/* - * Enable for cbdata debug information - */ -#undef CBDATA_DEBUG - -/* - * Do we have unix sockets? (required for the winbind ntlm helper - */ -#undef HAVE_UNIXSOCKET - -/* - * Known-size integers - */ - -#undef int16_t - -#undef u_int16_t - -#undef int32_t - -#undef u_int32_t - -#undef int64_t - -#undef u_int64_t - -/* The number of bytes in a __int64. */ -#undef SIZEOF___INT64 - -/* The number of bytes in a int16_t. */ -#undef SIZEOF_INT16_T - -/* The number of bytes in a int32_t. */ -#undef SIZEOF_INT32_T - -/* The number of bytes in a int64_t. */ -#undef SIZEOF_INT64_T - -/* The number of bytes in a off_t. */ -#undef SIZEOF_OFF_T - -/* The number of bytes in a size_t. */ -#undef SIZEOF_SIZE_T - -/* The number of bytes in a u_int16_t. */ -#undef SIZEOF_U_INT16_T - -/* The number of bytes in a u_int32_t. */ -#undef SIZEOF_U_INT32_T - -/* The number of bytes in a u_int64_t. */ -#undef SIZEOF_U_INT64_T - -/* The number of bytes in a uint16_t. */ -#undef SIZEOF_UINT16_T - -/* The number of bytes in a uint32_t. */ -#undef SIZEOF_UINT32_T - -/* The number of bytes in a uint64_t. */ -#undef SIZEOF_UINT64_T - -/* - * Enable support for the X-Accelerator-Vary HTTP header - */ -#undef X_ACCELERATOR_VARY - -/* Support for poll/select/etc stuff */ -#undef USE_POLL -#undef USE_SELECT -#undef USE_KQUEUE - /* Allow underscores in host names */ #undef ALLOW_HOSTNAME_UNDERSCORES @@ -1206,5 +802,3 @@ /* Define to empty if `const' does not conform to ANSI C. */ #undef const - -#endif /* __CONFIGURE_H__ */