Changeset 944


Ignore:
Timestamp:
Mar 11, 2008 4:58:43 PM (15 years ago)
Author:
gah
Message:
 
Location:
trunk/vizservers
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/vizservers/configure

    r940 r944  
    679679RP2_INCL_DIR
    680680RP_DIR
     681DX_DIR
    681682LIBOBJS
    682683LTLIBOBJS'
     
    47534754done
    47544755
     4756
     4757
    47554758fi
    47564759{ echo "$as_me:$LINENO: result: ${RP_DIR}/include" >&5
     
    47584761
    47594762
     4763
     4764{ echo "$as_me:$LINENO: checking for DX installation" >&5
     4765echo $ECHO_N "checking for DX installation... $ECHO_C" >&6; }
     4766DX_DIR=""
     4767for dir in \
     4768 /apps/rappture \
     4769 /usr/dx \
     4770 /usr
     4771do
     4772  if test -r "${dir}/include/dx/dx.h" ; then
     4773    DX_DIR="$dir"
     4774    break
     4775  fi
     4776done
     4777if test "x${DX_DIR}" = "x" ; then
     4778  { { echo "$as_me:$LINENO: error: can't find OpenDX installation" >&5
     4779echo "$as_me: error: can't find OpenDX installation" >&2;}
     4780   { (exit 1); exit 1; }; }
     4781fi
     4782if test "${DX_DIR}" = "/usr" ; then
     4783  DX_DIR=""
     4784fi
     4785
     4786{ echo "$as_me:$LINENO: result: ${DX_DIR}" >&5
     4787echo "${ECHO_T}${DX_DIR}" >&6; }
    47604788
    47614789
     
    54645492RP2_INCL_DIR!$RP2_INCL_DIR$ac_delim
    54655493RP_DIR!$RP_DIR$ac_delim
     5494DX_DIR!$DX_DIR$ac_delim
    54665495LIBOBJS!$LIBOBJS$ac_delim
    54675496LTLIBOBJS!$LTLIBOBJS$ac_delim
    54685497_ACEOF
    54695498
    5470   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then
     5499  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
    54715500    break
    54725501  elif $ac_last_try; then
  • trunk/vizservers/configure.in

    r940 r944  
    173173    AC_CHECK_HEADERS([rappture.h], [],
    174174           [AC_MSG_ERROR([cannot find rappture.h, try using --with-rappture])])
     175
     176
    175177fi
    176178AC_MSG_RESULT([${RP_DIR}/include])
    177179AC_SUBST(RP2_INCL_DIR)
    178180AC_SUBST(RP_DIR)
     181
     182AC_CHECK_HEADER([GL/glui.h])
     183AC_CHECK_HEADER([glui.h])
     184AC_CHECK_HEADER([GL/glut.h])
     185
     186AC_MSG_CHECKING([for DX installation])
     187DX_DIR=""
     188for dir in \
     189 /apps/rappture \
     190 /usr/dx \
     191 /usr
     192do
     193  if test -r "${dir}/include/dx/dx.h" ; then
     194    DX_DIR="$dir"
     195    break
     196  fi
     197done
     198if test "x${DX_DIR}" = "x" ; then
     199  AC_MSG_ERROR([can't find OpenDX installation])
     200fi
     201if test "${DX_DIR}" = "/usr" ; then
     202  DX_DIR=""
     203fi
     204AC_SUBST(DX_DIR)
     205AC_MSG_RESULT([${DX_DIR}])
    179206
    180207dnl AC_MSG_CHECKING(tcl library version)
  • trunk/vizservers/nanovis/Makefile.in

    r940 r944  
    2727AUXSRC          = config.h define.h global.h
    2828
    29 DX_DIR          = /usr/lib/dx
     29DX_DIR          = @DX_DIR@
    3030DX_INC_SPEC     = -I$(DX_DIR)/include
    3131DX_LIB_SPEC     = -L$(DX_DIR)/lib_linux -lDXcallm -lm
  • trunk/vizservers/nanovis/transfer-function/ColorGradientGLUTWindow.h

    r574 r944  
    1919
    2020
    21 #include "glui.h"
     21#include <glui.h>
    2222#include "ColorGradient.h"
    2323#include "ControlPoint.h"
  • trunk/vizservers/nanovis/transfer-function/TransferFunctionMain.h

    r574 r944  
    1 #include "GL/glut.h"
    2 #include "glui.h"
     1
     2#include <GL/glut.h>
     3#include <glui.h>
    34
    45#ifndef __TF_MAIN_H__
Note: See TracChangeset for help on using the changeset viewer.