summaryrefslogtreecommitdiff
path: root/www/fhttpd/files/patch-ac
blob: b1ba191ba6e98c4fd1c84908b4425e0c7a02acd0 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
--- Makefile.orig	Mon Apr 19 10:38:56 1999
+++ Makefile	Wed Sep  4 19:46:45 2002
@@ -10,8 +10,8 @@
 
 # Default compilers and linker
 
-CC	= gcc
-CXX	= g++
+CC	?= cc
+CXX	?= c++
 LD	= $(CXX)
 
 # OS-dependent definitions (choose one and adjust, if necessary)
@@ -99,21 +99,21 @@
 
 ## for Linux (glibc2/libc 6):
 #
-COPTS   = -Wall -O3 -felide-constructors -DLS_OPTIONS_IGNORE\
-	 -DNEED_CRYPT_H -DCMSG_DATA_IS_A_MACRO \
-	 -DMMAPPAGESIZE=65536 -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
-	 -D__s32=int\
-	 -DGLOBAL_TIMEZONE -DGLIBC -DERRNO_DEFINED # -DFLOCK
-LFLAGS= -lcrypt
+#COPTS   = -Wall -O3 -felide-constructors -DLS_OPTIONS_IGNORE\
+#	 -DNEED_CRYPT_H -DCMSG_DATA_IS_A_MACRO \
+#	 -DMMAPPAGESIZE=65536 -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
+#	 -D__s32=int\
+#	 -DGLOBAL_TIMEZONE -DGLIBC -DERRNO_DEFINED # -DFLOCK
+#LFLAGS= -lcrypt
 
 ## for FreeBSD 2.2:
 #
-#COPTS   = -O2 -fno-strength-reduce -DLS_OPTIONS_IGNORE\
-#	 -D__s32=int -DMMAPPAGESIZE=65536\
-#	 -DPSEUDOPOLL -DCMSG_DATA_IS_A_MACRO\
-#	 -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
-#	 -DTM_GMTOFF_PRESENT -DERRNO_DEFINED # -DFLOCK
-#LFLAGS = -lcrypt
+COPTS   = -fno-strength-reduce -DLS_OPTIONS_IGNORE\
+	 -D__s32=int -DMMAPPAGESIZE=65536\
+	 -DPSEUDOPOLL -DCMSG_DATA_IS_A_MACRO\
+	 -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
+	 -DTM_GMTOFF_PRESENT -DERRNO_DEFINED # -DFLOCK
+LFLAGS = -lcrypt
 
 # End of OS-dependent definitions
 
@@ -126,8 +126,8 @@
 # Don't modify anything below
 
 CXXOPTS	= $(COPTS)
-CXXFLAGS = $(CXXOPTS) $(DEBUG)
-CFLAGS = $(COPTS) $(DEBUG)
+CXXFLAGS += $(CXXOPTS) $(DEBUG)
+CFLAGS += $(COPTS) $(DEBUG)
 
 FHTTPD_OFILES	= pseudopoll.o lists.o wildmat.o util.o configfile.o users.o \
 	 process.o log.o loadedfile.o sockobj.o configargs.o fhttpd.o