diff options
| author | seibel_r <seibel_r@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-25 20:00:02 +0000 |
|---|---|---|
| committer | seibel_r <seibel_r@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-25 20:00:02 +0000 |
| commit | 963993b46319d3118ca752023fa12587512d9225 (patch) | |
| tree | fea6185a46a42ea57fea40435d9937fb4c9ea584 | |
| parent | bfcc25204ac6baa5009a30eae61dfcd8add5c475 (diff) | |
| download | ATCD-963993b46319d3118ca752023fa12587512d9225.tar.gz | |
Wed Aug 25 14:58:51 2004 Rich Seibel <seibel_r@ociweb.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/makeinclude/platform_linux.GNU | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 1fccc134423..a194fb01ac6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Aug 25 14:58:51 2004 Rich Seibel <seibel_r@ociweb.com> + + * include/makeincludes/platform_linux.GNU: + Generalized the way the rt library is searched. The + previous code did not find it on RedHat AS 3.0 for opteron. + Wed Aug 25 14:49:11 2004 Rich Seibel <seibel_r@ociweb.com> * ace/Basic_Types.h: diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU index c8dd8c8c201..16f220337da 100644 --- a/include/makeinclude/platform_linux.GNU +++ b/include/makeinclude/platform_linux.GNU @@ -47,7 +47,8 @@ PLATFORM_WX_LIBS = $(shell wx-config --libs) $(PLATFORM_GTK_LIBS) PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags) $(PLATFORM_GTK_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) ssl ?= 0 ifeq ($(ssl),1) @@ -94,7 +95,8 @@ LIBS += -ldl ifeq ($(threads),1) LIBS += -lpthread endif -LIBS += $(shell test -e /usr/lib/librt.so && echo -lrt) +# look for the rt library in the usual places +LIBS += $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -lrt) PLATFORM_QT_CPPFLAGS=-I$(QTDIR)/include PLATFORM_QT_LIBS=-lqt |