1 |
slords |
1.1 |
--- ppp-2.4.3/pppd/Makefile.linux.make 2004-11-13 13:02:22.000000000 +0100 |
2 |
|
|
+++ ppp-2.4.3/pppd/Makefile.linux 2004-11-22 15:46:49.871309478 +0100 |
3 |
|
|
@@ -30,10 +30,10 @@ |
4 |
|
|
include .depend |
5 |
|
|
endif |
6 |
|
|
|
7 |
|
|
-# CC = gcc |
8 |
|
|
+CC = gcc |
9 |
|
|
# |
10 |
|
|
-COPTS = -O2 -pipe -Wall -g |
11 |
|
|
-LIBS = |
12 |
|
|
+COPTS = -Wall $(RPM_OPT_FLAGS) |
13 |
|
|
+LIBS = -lutil |
14 |
|
|
|
15 |
|
|
# Uncomment the next 2 lines to include support for Microsoft's |
16 |
|
|
# MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. |
17 |
|
|
@@ -61,8 +61,8 @@ |
18 |
|
|
USE_TDB=y |
19 |
|
|
|
20 |
|
|
HAS_SHADOW=y |
21 |
|
|
-#USE_PAM=y |
22 |
|
|
-#HAVE_INET6=y |
23 |
|
|
+USE_PAM=y |
24 |
|
|
+HAVE_INET6=y |
25 |
|
|
|
26 |
|
|
# Enable plugins |
27 |
|
|
PLUGIN=y |
28 |
|
|
--- ppp-2.4.3/pppd/plugins/Makefile.linux.make 2004-11-14 08:57:35.000000000 +0100 |
29 |
|
|
+++ ppp-2.4.3/pppd/plugins/Makefile.linux 2004-11-22 15:46:49.873309203 +0100 |
30 |
|
|
@@ -1,5 +1,5 @@ |
31 |
|
|
#CC = gcc |
32 |
|
|
-COPTS = -O2 -g |
33 |
|
|
+COPTS = $(RPM_OPT_FLAGS) |
34 |
|
|
CFLAGS = $(COPTS) -I.. -I../../include -fPIC |
35 |
|
|
LDFLAGS = -shared |
36 |
|
|
INSTALL = install |
37 |
|
|
--- ppp-2.4.3/pppd/plugins/radius/Makefile.linux.make 2004-11-14 08:02:31.000000000 +0100 |
38 |
|
|
+++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux 2004-11-22 15:49:08.858233692 +0100 |
39 |
|
|
@@ -12,7 +12,7 @@ |
40 |
|
|
INSTALL = install |
41 |
|
|
|
42 |
|
|
PLUGIN=radius.so radattr.so radrealms.so |
43 |
|
|
-CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON |
44 |
|
|
+CFLAGS=-I. -I../.. -I../../../include $(RPM_OPT_FLAGS) -DRC_LOG_FACILITY=LOG_DAEMON |
45 |
|
|
|
46 |
|
|
# Uncomment the next line to include support for Microsoft's |
47 |
|
|
# MS-CHAP authentication protocol. |
48 |
|
|
--- ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux.make 2004-11-14 08:58:37.000000000 +0100 |
49 |
|
|
+++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux 2004-11-22 15:46:49.875308929 +0100 |
50 |
|
|
@@ -25,7 +25,7 @@ |
51 |
|
|
# Version is set ONLY IN THE MAKEFILE! Don't delete this! |
52 |
|
|
RP_VERSION=3.8p |
53 |
|
|
|
54 |
|
|
-COPTS=-O2 -g |
55 |
|
|
+COPTS=$(RPM_OPT_FLAGS) |
56 |
|
|
CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' |
57 |
|
|
all: rp-pppoe.so pppoe-discovery |
58 |
|
|
|
59 |
|
|
--- ppp-2.4.3/pppdump/Makefile.linux.make 2004-10-31 02:36:52.000000000 +0200 |
60 |
|
|
+++ ppp-2.4.3/pppdump/Makefile.linux 2004-11-22 15:48:16.795379237 +0100 |
61 |
|
|
@@ -2,7 +2,7 @@ |
62 |
|
|
BINDIR = $(DESTDIR)/sbin |
63 |
|
|
MANDIR = $(DESTDIR)/share/man/man8 |
64 |
|
|
|
65 |
|
|
-CFLAGS= -O -I../include/net |
66 |
|
|
+CFLAGS= $(RPM_OPT_FLAGS) -I../include/net |
67 |
|
|
OBJS = pppdump.o bsd-comp.o deflate.o zlib.o |
68 |
|
|
|
69 |
|
|
INSTALL= install |
70 |
|
|
--- ppp-2.4.3/pppstats/Makefile.linux.make 2004-10-31 23:09:03.000000000 +0100 |
71 |
|
|
+++ ppp-2.4.3/pppstats/Makefile.linux 2004-11-22 15:46:49.872309341 +0100 |
72 |
|
|
@@ -10,7 +10,7 @@ |
73 |
|
|
PPPSTATOBJS = pppstats.o |
74 |
|
|
|
75 |
|
|
#CC = gcc |
76 |
|
|
-COPTS = -O |
77 |
|
|
+COPTS = $(RPM_OPT_FLAGS) |
78 |
|
|
COMPILE_FLAGS = -I../include |
79 |
|
|
LIBS = |
80 |
|
|
|
81 |
|
|
--- ppp-2.4.3/chat/Makefile.linux.make 2004-11-03 12:51:47.000000000 +0100 |
82 |
|
|
+++ ppp-2.4.3/chat/Makefile.linux 2004-11-22 15:47:59.445760450 +0100 |
83 |
|
|
@@ -10,7 +10,7 @@ |
84 |
|
|
CDEF4= -DFNDELAY=O_NDELAY # Old name value |
85 |
|
|
CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) |
86 |
|
|
|
87 |
|
|
-COPTS= -O2 -g -pipe |
88 |
|
|
+COPTS= $(RPM_OPT_FLAGS) |
89 |
|
|
CFLAGS= $(COPTS) $(CDEFS) |
90 |
|
|
|
91 |
|
|
INSTALL= install |