moved options from Makefile to options.h

diff --git a/src/Makefile.in b/src/Makefile.in
index 15c28441e0689ea16a41f934c7c5386cc0bc84dc..ac305a07766be5330ecd3edd8e899ab1763aa0bb 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,35 +1,17 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.106 1997/12/03 01:27:55 wessels Exp $
+#  $Id: Makefile.in,v 1.107 1997/12/05 22:01:13 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
-HOST_OPT       = # -DCACHEMGR_HOSTNAME="getfullhostname()"
-ICMP_OPT       = # -DUSE_ICMP=1
-DELAY_HACK      = # -DDELAY_HACK=1
-USERAGENT_OPT  = # -DUSE_USERAGENT_LOG=1
-KILL_PARENT_OPT        = # -DKILL_PARENT_OPT
-# do NOT define both USE_SPLAY_TREE and USE_BIN_TREE at the same time!
-USE_SPLAY_TREE  = # -DUSE_SPLAY_TREE
-USE_BIN_TREE    = # -DUSE_BIN_TREE
-ALARM_UPDATES_TIME = # -DALARM_UPDATES_TIME=1
-STORE_KEY_SHA  = # -DSTORE_KEY_SHA=1
-STORE_KEY_MD5  = # -DSTORE_KEY_MD5=1
-USE_ASYNC_IO   = # -DUSE_ASYNC_IO=1
 
 # define all three for SNMP support
 #SQUID_SNMP            = -DSQUID_SNMP=1
 #SQUID_MIB             = mib.txt 
 #SQUID_SNMP_LIBS       = -L../snmplib -lsnmp
 
-DEFINES         = $(HOST_OPT) \
-                  $(ICMP_OPT) $(DELAY_HACK) $(USERAGENT_OPT) \
-                  $(KILL_PARENT_OPT) $(USE_POLL_OPT) \
-                  $(USE_SPLAY_TREE) $(USE_BIN_TREE) \
-                 $(ALARM_UPDATES_TIME) \
-                 $(STORE_KEY_SHA) $(STORE_KEY_MD5) \
-                 $(USE_ASYNC_IO) $(SQUID_SNMP)
+DEFINES         = $(SQUID_SNMP)
 
 prefix         = @prefix@
 exec_prefix    = @exec_prefix@

diff --git a/src/squid.h b/src/squid.h
index c0cd205dec9265c435f67ce339a0d81f65c4ba73..292d97f58158494a6a41af8d64895eb270280a63 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.142 1997/12/03 01:32:38 wessels Exp $
+ * $Id: squid.h,v 1.143 1997/12/05 22:01:15 wessels Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -32,6 +32,7 @@
 #define SQUID_H
 
 #include "config.h"
+#include "options.h"
 
 /*
  * On some systems, FD_SETSIZE is set to something lower than the