- Timestamp:
- Jun 25, 2010 9:47:21 AM (14 years ago)
- Location:
- branches/blt4
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/blt4/configure
r1758 r1780 607 607 SHLIB_LDFLAGS 608 608 RP_BASE 609 DX_LIB_SPEC 610 DX_INC_SPEC 609 611 JAVA_INC_SPEC 610 612 JAVA_INC_DIR … … 8749 8751 8750 8752 8753 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenDX headers" >&5 8754 $as_echo_n "checking for OpenDX headers... " >&6; } 8755 DX_INC_DIR="" 8756 for dir in \ 8757 /apps/rappture/include \ 8758 /usr/dx/include \ 8759 /usr/include 8760 do 8761 if test -r "${dir}/dx/dx.h" ; then 8762 DX_INC_DIR="$dir" 8763 break 8764 fi 8765 done 8766 8767 if test "${DX_INC_DIR}" = "/usr/include" ; then 8768 DX_INC_SPEC="" 8769 else 8770 DX_INC_SPEC="-I{DX_INC_DIR}" 8771 fi 8772 8773 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${DX_INC_DIR}" >&5 8774 $as_echo "${DX_INC_DIR}" >&6; } 8775 8776 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenDX libraries" >&5 8777 $as_echo_n "checking for OpenDX libraries... " >&6; } 8778 DX_LIB_DIR="" 8779 for dir in \ 8780 /apps/rappture/lib \ 8781 /usr/lib/dx/lib_linux \ 8782 /usr/dx/lib_linux \ 8783 /usr/lib 8784 do 8785 if test -r "${dir}/libDXcallm.a" ; then 8786 DX_LIB_DIR="$dir" 8787 break 8788 fi 8789 done 8790 8791 if test "${DX_LIB_DIR}" = "/usr" ; then 8792 DX_LIB_SPEC="" 8793 else 8794 DX_LIB_SPEC="-L${DX_LIB_DIR}" 8795 fi 8796 8797 8798 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${DX_LIB_DIR}" >&5 8799 $as_echo "${DX_LIB_DIR}" >&6; } 8800 8751 8801 RP_BASE=`pwd` 8752 8802 -
branches/blt4/configure.in
r1758 r1780 531 531 AC_SUBST(JAVA_INC_DIR) 532 532 AC_SUBST(JAVA_INC_SPEC) 533 534 AC_MSG_CHECKING([for OpenDX headers]) 535 DX_INC_DIR="" 536 for dir in \ 537 /apps/rappture/include \ 538 /usr/dx/include \ 539 /usr/include 540 do 541 if test -r "${dir}/dx/dx.h" ; then 542 DX_INC_DIR="$dir" 543 break 544 fi 545 done 546 547 if test "${DX_INC_DIR}" = "/usr/include" ; then 548 DX_INC_SPEC="" 549 else 550 DX_INC_SPEC="-I{DX_INC_DIR}" 551 fi 552 AC_SUBST(DX_INC_SPEC) 553 AC_MSG_RESULT([${DX_INC_DIR}]) 554 555 AC_MSG_CHECKING([for OpenDX libraries]) 556 DX_LIB_DIR="" 557 for dir in \ 558 /apps/rappture/lib \ 559 /usr/lib/dx/lib_linux \ 560 /usr/dx/lib_linux \ 561 /usr/lib 562 do 563 if test -r "${dir}/libDXcallm.a" ; then 564 DX_LIB_DIR="$dir" 565 break 566 fi 567 done 568 569 if test "${DX_LIB_DIR}" = "/usr" ; then 570 DX_LIB_SPEC="" 571 else 572 DX_LIB_SPEC="-L${DX_LIB_DIR}" 573 fi 574 575 AC_SUBST(DX_LIB_SPEC) 576 AC_MSG_RESULT([${DX_LIB_DIR}]) 533 577 534 578 RP_BASE=`pwd` -
branches/blt4/src/core/Makefile.in
r1270 r1780 30 30 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 31 31 CFLAGS = @CFLAGS@ 32 DX_LIB_SPEC = @DX_LIB_SPEC@ 33 DX_INC_SPEC = @DX_INC_SPEC@ 32 34 33 35 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 56 58 RpBufferCInterface.h \ 57 59 RpDict.h \ 58 RpDXWriter.h \59 RpDXWriterFInterface.h \60 RpDXWriterFStubs.h \61 60 RpEncode.h \ 62 61 RpEntityRef.h \ … … 79 78 RpUtilsFStubs.h \ 80 79 rappture.h 80 81 81 82 82 SCEW_HEADERS = \ … … 124 124 RpBuffer.o \ 125 125 RpBufferCInterface.o \ 126 RpDXWriter.o \127 RpDXWriterFInterface.o \128 126 RpEncode.o \ 129 127 RpEntityRef.o \ … … 145 143 $(SCEW_OBJS) \ 146 144 $(B64_OBJS) 145 146 ifneq ($(DX_INC_SPEC),) 147 HEADERS += \ 148 RpDXWriter.h \ 149 RpDXWriterFInterface.h \ 150 RpDXWriterFStubs.h 151 OBJS += \ 152 RpDXWriter.o \ 153 RpDXWriterFInterface.o 154 endif 147 155 148 156 name = rappture
Note: See TracChangeset
for help on using the changeset viewer.