2010-10-13 18:58:57 +00:00
|
|
|
---
|
|
|
|
|
Makefile | 26 +++++++++++++-------------
|
|
|
|
|
cli/Makefile | 2 +-
|
|
|
|
|
usl/Makefile | 2 +-
|
|
|
|
|
3 files changed, 15 insertions(+), 15 deletions(-)
|
|
|
|
|
|
2009-07-26 10:26:13 +00:00
|
|
|
--- openl2tp-1.6.orig/Makefile
|
|
|
|
|
+++ openl2tp-1.6/Makefile
|
2010-10-13 18:58:57 +00:00
|
|
|
@@ -8,7 +8,7 @@ L2TP_FEATURE_LAIC_SUPPORT= y
|
2009-07-26 10:26:13 +00:00
|
|
|
L2TP_FEATURE_LAOC_SUPPORT= y
|
|
|
|
|
L2TP_FEATURE_LNIC_SUPPORT= y
|
|
|
|
|
L2TP_FEATURE_LNOC_SUPPORT= y
|
|
|
|
|
-L2TP_FEATURE_LOCAL_CONF_FILE= y
|
|
|
|
|
+#L2TP_FEATURE_LOCAL_CONF_FILE= y
|
|
|
|
|
#L2TP_FEATURE_LOCAL_STAT_FILE= y
|
|
|
|
|
|
|
|
|
|
# Define USE_DMALLOC to enable dmalloc memory debugging
|
2010-10-13 18:58:57 +00:00
|
|
|
@@ -29,31 +29,31 @@ L2TP_USE_ASYNC_RPC= y
|
2009-07-26 10:26:13 +00:00
|
|
|
# Build for UML environment?
|
|
|
|
|
# UML_TARGET= y
|
|
|
|
|
|
|
|
|
|
-ARCH=$(shell uname -p)
|
|
|
|
|
-ifeq ($(ARCH),x86_64)
|
|
|
|
|
-SYS_LIBDIR=/usr/lib64
|
|
|
|
|
-else
|
|
|
|
|
+#ARCH=$(shell uname -p)
|
|
|
|
|
+#ifeq ($(ARCH),x86_64)
|
|
|
|
|
+#SYS_LIBDIR=/usr/lib64
|
|
|
|
|
+#else
|
|
|
|
|
SYS_LIBDIR=/usr/lib
|
|
|
|
|
-endif
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
# Point to kernel source tree
|
|
|
|
|
-KERNEL_SRCDIR= /lib/modules/$(shell uname -r)/source
|
|
|
|
|
-KERNEL_BLDDIR= /lib/modules/$(shell uname -r)/build
|
|
|
|
|
+#KERNEL_SRCDIR= /lib/modules/$(shell uname -r)/source
|
|
|
|
|
+#KERNEL_BLDDIR= /lib/modules/$(shell uname -r)/build
|
|
|
|
|
|
|
|
|
|
# Points to pppd install.
|
|
|
|
|
# By default, pppd headers are assumed to be in /usr/include/pppd. but
|
|
|
|
|
# can be pointed to a local pppd source tree if desired.
|
|
|
|
|
-PPPD_VERSION= 2.4.4
|
|
|
|
|
+#PPPD_VERSION= 2.4.4
|
|
|
|
|
# PPPD_SRCDIR= /usr/local/src/ppp-2.4.4
|
|
|
|
|
# PPPD_LIBDIR= /usr/lib/pppd/2.4.4
|
|
|
|
|
|
|
|
|
|
# Points to readline install root. READLINE_DIR should have lib/ & include/ subdirs
|
|
|
|
|
# If not defined, readline is assumed to be installed in the standard places that
|
|
|
|
|
# the compiler looks.
|
|
|
|
|
-READLINE_DIR=
|
|
|
|
|
+#READLINE_DIR=
|
|
|
|
|
|
|
|
|
|
# For cross-compiling
|
|
|
|
|
-CROSS_COMPILE=
|
|
|
|
|
+#CROSS_COMPILE=
|
|
|
|
|
|
|
|
|
|
# END CONFIGURABLE SETTINGS
|
|
|
|
|
|
2010-10-13 18:58:57 +00:00
|
|
|
@@ -135,9 +135,9 @@ endif
|
|
|
|
|
|
|
|
|
|
CPPFLAGS= $(CPPFLAGS.l2tptest) $(CPPFLAGS-y)
|
2009-07-26 10:26:13 +00:00
|
|
|
CFLAGS= -I. -Iusl -Icli -isystem $(KERNEL_BLDDIR)/include \
|
2010-10-13 18:58:57 +00:00
|
|
|
- -isystem $(KERNEL_SRCDIR)/include -MMD -Wall -Werror $(CPPFLAGS) $(CPPFLAGS.dmalloc) -DSYS_LIBDIR=$(SYS_LIBDIR)
|
|
|
|
|
+ -isystem $(KERNEL_SRCDIR)/include -MMD -Wall $(CPPFLAGS) $(CPPFLAGS.dmalloc) -DSYS_LIBDIR=$(SYS_LIBDIR)
|
2009-07-26 10:26:13 +00:00
|
|
|
LDFLAGS.l2tpd= -Wl,-E -L. -Lusl -lusl -ldl $(LIBS.dmalloc) -lc
|
|
|
|
|
-LDFLAGS.l2tpconfig= -Lcli -lcli -lreadline $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc
|
|
|
|
|
+LDFLAGS.l2tpconfig= -Lcli -lcli -lreadline -lncurses $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc
|
|
|
|
|
|
|
|
|
|
OPT_CFLAGS?= -O
|
|
|
|
|
|
2010-10-13 18:58:57 +00:00
|
|
|
--- openl2tp-1.6.orig/cli/Makefile
|
|
|
|
|
+++ openl2tp-1.6/cli/Makefile
|
|
|
|
|
@@ -7,7 +7,7 @@ CLI_SRCS_TEST.o= $(CLI_SRCS_TEST.c:%.c=%
|
|
|
|
|
|
|
|
|
|
LDFLAGS.cli_test= -L.. -L. $(READLINE_LDFLAGS) -lcli -lusl -lreadline -lcurses -lc
|
|
|
|
|
|
|
|
|
|
-CFLAGS= $(CFLAGS.optimize) -MMD -Wall -Werror -I.. $(READLINE_CFLAGS)
|
|
|
|
|
+CFLAGS= $(CFLAGS.optimize) -MMD -Wall -I.. $(READLINE_CFLAGS)
|
|
|
|
|
|
|
|
|
|
.PHONY: all test clean
|
|
|
|
|
|
|
|
|
|
--- openl2tp-1.6.orig/usl/Makefile
|
|
|
|
|
+++ openl2tp-1.6/usl/Makefile
|
|
|
|
|
@@ -14,7 +14,7 @@ LIBS.dmalloc= -ldmalloc
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
CPPFLAGS+= $(CFLAGS.optimize) -g
|
|
|
|
|
-CFLAGS= -I. -MMD -Wall -Werror $(CPPFLAGS) $(CPPFLAGS.dmalloc)
|
|
|
|
|
+CFLAGS= -I. -MMD -Wall $(CPPFLAGS) $(CPPFLAGS.dmalloc)
|
|
|
|
|
|
|
|
|
|
.PHONY: all test clean
|
|
|
|
|
|
