Fri Aug 10 08:57:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 48 insertions, 10 deletions

diff --git a/ACE/include/makeinclude/platform_linux_icc.GNU b/ACE/include/makeinclude/platform_linux_icc.GNU
index 11c93176059..b0c0f4a10a7 100644
--- a/ACE/include/makeinclude/platform_linux_icc.GNU
+++ b/ACE/include/makeinclude/platform_linux_icc.GNU
@@ -14,7 +14,7 @@ PLATFORM_XT_LIBS=-lXt
 LATFORM_XT_LDFLAGS=
 
 PLATFORM_FL_CPPFLAGS=
-PLATFORM_FL_LIBS=-lfltk
+PLATFORM_FL_LIBS=-lfltk -lfltk_forms -lfltk_gl
 PLATFORM_FL_LDFLAGS=
 
 PLATFORM_X11_CPPFLAGS=-I/usr/X11R6/include
@@ -27,26 +27,48 @@ PLATFORM_GL_LDFLAGS =-L/usr/X11R6/lib
 
 PLATFORM_GTK_CPPFLAGS=$(shell gtk-config --cflags)
 PLATFORM_GTK_LIBS    =$(shell gtk-config --libs)
-PLATFORM_GTK_LDFLAGS=
+PLATFORM_GTK_LDFLAGS =
+
+PLATFORM_FOX_CPPFLAGS=
+PLATFORM_FOX_LIBS=-lFOX
+PLATFORM_FOX_LDFLAGS=
 
 # NOTE: we only support wxWindows over GTK
 PLATFORM_WX_CPPFLAGS= $(shell wx-config --cxxflags) $(PLATFORM_GTK_CPPFLAGS)
 PLATFORM_WX_LIBS    = $(shell wx-config --libs)     $(PLATFORM_GTK_LIBS)
 PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags)  $(PLATFORM_GTK_LDFLAGS)
 
-PLATFORM_TCL_CPPFLAGS ?= -I/usr/include/tcl8.4
-PLATFORM_TCL_LIBS ?= -ltcl8.4
-PLATFORM_TCL_LDFLAGS =
+PLATFORM_BOOST_CPPFLAGS ?=
+PLATFORM_BOOST_LDLAGS ?=
+PLATFORM_BOOST_UTF_LIBS ?= -lboost_unit_test_framework
+
+PLATFORM_TCL_CPPFLAGS=
+PLATFORM_TCL_LIBS=-ltcl
+PLATFORM_TCL_LDFLAGS=
 
-PLATFORM_TK_CPPFLAGS ?= -I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
-PLATFORM_TK_LIBS ?= $(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG)
-PLATFORM_TK_LDFLAGS ?=
+PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
+PLATFORM_TK_LIBS=$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+PLATFORM_TK_LDFLAGS=
 
 PLATFORM_AIO_SUPPORT := \
-       $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
+       $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -DACE_HAS_AIO_CALLS)
 
 SYSARCH := $(shell uname -m)
-
+ssl ?= 0
+ifeq ($(ssl),1)
+  # Some Linux OpenSSL installations compile in Kerberos support.  Add
+  # the Kerberos include path to preprocessor include path.
+  #
+  # We should probably also add the Kerberos libraries to
+  # PLATFORM_SSL_LIBS but we can't be sure if they are needed without
+  # a more sophisticated check.  This will only be a problem when
+  # statically linking the OpenSSL library.  The majority of
+  # installations use shared OpenSSL libraries so we should be okay,
+  # at least until we migrate to Autoconf.
+  PLATFORM_SSL_CPPFLAGS += -I/usr/kerberos/include
+endif # ssl
+
+insure ?= 0
 ifeq ($(insure),1)
   CC  = insure
   CXX = insure
@@ -160,3 +182,19 @@ ifeq ($(threads),1)
        PRELIB = @true
     endif # ! PRELIB
 endif
+
+sctp ?=
+# support for OpenSS7 SCTP
+ifeq ($(sctp),openss7)
+  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?= -L/usr/local/lib
+  PLATFORM_SCTP_LIBS?= -lsctp
+endif
+