summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--include/makeinclude/platform_linux.GNU12
2 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 01bb152ce1f..3bb57434290 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 4 18:15:16 UTC 2004 Craig Rodrigues <crodrigu@bbn.com>
+
+ * include/makeinclude/platform_linux.GNU: Allow
+ user to override SCTP flags in platform_macros.GNU
+ before including platform_linux.GNU.
+
Wed Feb 4 17:41:25 UTC 2004 Craig Rodrigues <crodrigu@bbn.com>
* include/makeinclude/platform_freebsd.GNU:
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index 565d1178b17..e176a1fd2c0 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -127,16 +127,16 @@ endif
sctp ?=
# support for OpenSS7 SCTP
ifeq ($(sctp),openss7)
- PLATFORM_SCTP_CPPFLAGS= -DACE_HAS_OPENSS7_SCTP
- PLATFORM_SCTP_LDFLAGS=
- PLATFORM_SCTP_LIBS=
+ PLATFORM_SCTP_CPPFLAGS?= -DACE_HAS_OPENSS7_SCTP
+ PLATFORM_SCTP_LDFLAGS?=
+ PLATFORM_SCTP_LIBS?=
endif
# support for LKSCTP (Linux Kernel 2.5)
ifeq ($(sctp),lksctp)
- PLATFORM_SCTP_CPPFLAGS= -DACE_HAS_LKSCTP
- PLATFORM_SCTP_LDFLAGS=
- PLATFORM_SCTP_LIBS= /usr/local/lib/libsctp.a
+ PLATFORM_SCTP_CPPFLAGS?= -DACE_HAS_LKSCTP
+ PLATFORM_SCTP_LDFLAGS?=
+ PLATFORM_SCTP_LIBS?= /usr/local/lib/libsctp.a
endif
#### GNU gas has a string limit of 4096 characters. On Alphas,