Ignore:
Timestamp:
Sep 29, 2009 10:19:44 AM (13 years ago)
Author:
gah
Message:

Fixups for bit rot: gcc-4.4.1

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/configure

    r1364 r1571  
    641641LD_RPATH
    642642CG_DIR
    643 DX_DIR
     643DX_LIB_SPEC
     644DX_INC_SPEC
    644645RP_DIR
    645646RP2_INCL_DIR
     
    1006310064
    1006410065
    10065 { $as_echo "$as_me:$LINENO: checking for DX installation" >&5
    10066 $as_echo_n "checking for DX installation... " >&6; }
    10067 DX_DIR=""
     10066{ $as_echo "$as_me:$LINENO: checking for OpenDX headers" >&5
     10067$as_echo_n "checking for OpenDX headers... " >&6; }
     10068DX_INC_DIR=""
    1006810069for dir in \
    10069  /apps/rappture \
    10070  /usr/dx \
    10071  /usr
     10070 /apps/rappture/include \
     10071 /usr/dx/include \
     10072 /usr/include
    1007210073do
    10073   if test -r "${dir}/include/dx/dx.h" ; then
    10074     DX_DIR="$dir"
     10074  if test -r "${dir}/dx/dx.h" ; then
     10075    DX_INC_DIR="$dir"
    1007510076    break
    1007610077  fi
    1007710078done
    10078 if test "x${DX_DIR}" = "x" ; then
    10079   { { $as_echo "$as_me:$LINENO: error: can't find OpenDX installation" >&5
    10080 $as_echo "$as_me: error: can't find OpenDX installation" >&2;}
     10079if test "x${DX_INC_DIR}" = "x" ; then
     10080  { { $as_echo "$as_me:$LINENO: error: can't find OpenDX include files" >&5
     10081$as_echo "$as_me: error: can't find OpenDX include files" >&2;}
    1008110082   { (exit 1); exit 1; }; }
    1008210083fi
    1008310084
    10084 if test "${DX_DIR}" = "/usr" ; then
    10085   DX_DIR=""
    10086 else
    10087   LD_RPATH="$loader_run_path:${DX_DIR}/lib"
    10088 fi
    10089 
    10090 
    10091 { $as_echo "$as_me:$LINENO: result: ${DX_DIR}" >&5
    10092 $as_echo "${DX_DIR}" >&6; }
     10085if test "${DX_INC_DIR}" = "/usr/include" ; then
     10086  DX_INC_SPEC=""
     10087else
     10088  DX_INC_SPEC="-I{DX_INC_DIR}"
     10089fi
     10090
     10091{ $as_echo "$as_me:$LINENO: result: ${DX_INC_DIR}" >&5
     10092$as_echo "${DX_INC_DIR}" >&6; }
     10093
     10094{ $as_echo "$as_me:$LINENO: checking for OpenDX libraries" >&5
     10095$as_echo_n "checking for OpenDX libraries... " >&6; }
     10096DX_LIB_DIR=""
     10097for dir in \
     10098 /apps/rappture/lib \
     10099 /usr/lib/dx/lib_linux \
     10100 /usr/dx/lib_linux \
     10101 /usr/lib
     10102do
     10103  if test -r "${dir}/libDXcallm.a" ; then
     10104    DX_LIB_DIR="$dir"
     10105    break
     10106  fi
     10107done
     10108if test "x${DX_LIB_DIR}" = "x" ; then
     10109  { { $as_echo "$as_me:$LINENO: error: can't find OpenDX libraries" >&5
     10110$as_echo "$as_me: error: can't find OpenDX libraries" >&2;}
     10111   { (exit 1); exit 1; }; }
     10112fi
     10113
     10114if test "${DX_LIB_DIR}" = "/usr" ; then
     10115  DX_LIB_SPEC=""
     10116else
     10117  DX_LIB_SPEC="-L${DX_LIB_DIR}"
     10118fi
     10119
     10120
     10121{ $as_echo "$as_me:$LINENO: result: ${DX_LIB_DIR}" >&5
     10122$as_echo "${DX_LIB_DIR}" >&6; }
    1009310123
    1009410124
Note: See TracChangeset for help on using the changeset viewer.