diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-06-20 20:33:41 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-06-20 20:33:41 +0000 |
| commit | ca06ccfa18f3e74a3693ad8eb83c1621283ff426 (patch) | |
| tree | b88fb9536087371ddc619fdff09a6336e77ad166 /include | |
| parent | 811934124fd3e782a53628fc77c3a91ee6f5b81e (diff) | |
| download | ATCD-ca06ccfa18f3e74a3693ad8eb83c1621283ff426.tar.gz | |
ChangeLogTag:Fri Jun 20 13:32:21 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/platform_linux.GNU | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU index 921df2eaee4..fb20138d42d 100644 --- a/include/makeinclude/platform_linux.GNU +++ b/include/makeinclude/platform_linux.GNU @@ -42,7 +42,7 @@ 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_WX_CPPFLAGS= $(shell wx-config --cflags) $(PLATFORM_GTK_CPPFLAGS) PLATFORM_WX_LIBS = $(shell wx-config --libs) $(PLATFORM_GTK_LIBS) @@ -51,6 +51,20 @@ PLATFORM_WX_LDFLAGS = PLATFORM_AIO_SUPPORT := \ $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS) + +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 # threads + ifeq ($(insure),1) CC = insure CXX = insure |