Changeset 944

Timestamp:

Mar 11, 2008 4:58:43 PM (15 years ago)

Author:

gah

Message:

 

Location:

trunk/vizservers

Files:

• configure (modified) (4 diffs)
• configure.in (modified) (1 diff)
• nanovis/Makefile.in (modified) (1 diff)
• nanovis/transfer-function/ColorGradientGLUTWindow.h (modified) (1 diff)
• nanovis/transfer-function/TransferFunctionMain.h (modified) (1 diff)

trunk/vizservers/configure

@@ -679 +679 @@
 RP2_INCL_DIR
 RP_DIR
+DX_DIR
 LIBOBJS
 LTLIBOBJS'
@@ -4753 +4754 @@
 done
 
+
+
 fi
 { echo "$as_me:$LINENO: result: ${RP_DIR}/include" >&5
@@ -4758 +4761 @@
 
 
+
+{ echo "$as_me:$LINENO: checking for DX installation" >&5
+echo $ECHO_N "checking for DX installation... $ECHO_C" >&6; }
+DX_DIR=""
+for dir in \
+ /apps/rappture \
+ /usr/dx \
+ /usr
+do
+  if test -r "${dir}/include/dx/dx.h" ; then
+    DX_DIR="$dir"
+    break
+  fi
+done
+if test "x${DX_DIR}" = "x" ; then
+  { { echo "$as_me:$LINENO: error: can't find OpenDX installation" >&5
+echo "$as_me: error: can't find OpenDX installation" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test "${DX_DIR}" = "/usr" ; then
+  DX_DIR=""
+fi
+
+{ echo "$as_me:$LINENO: result: ${DX_DIR}" >&5
+echo "${ECHO_T}${DX_DIR}" >&6; }
 
 
@@ -5464 +5492 @@
 RP2_INCL_DIR!$RP2_INCL_DIR$ac_delim
 RP_DIR!$RP_DIR$ac_delim
+DX_DIR!$DX_DIR$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
     break
   elif $ac_last_try; then

trunk/vizservers/configure.in

@@ -173 +173 @@
     AC_CHECK_HEADERS([rappture.h], [],
            [AC_MSG_ERROR([cannot find rappture.h, try using --with-rappture])])
+
+
 fi
 AC_MSG_RESULT([${RP_DIR}/include])
 AC_SUBST(RP2_INCL_DIR)
 AC_SUBST(RP_DIR)
+
+AC_CHECK_HEADER([GL/glui.h])
+AC_CHECK_HEADER([glui.h])
+AC_CHECK_HEADER([GL/glut.h])
+
+AC_MSG_CHECKING([for DX installation])
+DX_DIR=""
+for dir in \
+ /apps/rappture \
+ /usr/dx \
+ /usr
+do
+  if test -r "${dir}/include/dx/dx.h" ; then
+    DX_DIR="$dir"
+    break
+  fi
+done
+if test "x${DX_DIR}" = "x" ; then
+  AC_MSG_ERROR([can't find OpenDX installation])
+fi
+if test "${DX_DIR}" = "/usr" ; then
+  DX_DIR=""
+fi
+AC_SUBST(DX_DIR)
+AC_MSG_RESULT([${DX_DIR}])
 
 dnl AC_MSG_CHECKING(tcl library version)

trunk/vizservers/nanovis/Makefile.in

@@ -27 +27 @@
 AUXSRC          = config.h define.h global.h
 
-DX_DIR          = /usr/lib/dx
+DX_DIR          = @DX_DIR@
 DX_INC_SPEC     = -I$(DX_DIR)/include
 DX_LIB_SPEC     = -L$(DX_DIR)/lib_linux -lDXcallm -lm

trunk/vizservers/nanovis/transfer-function/ColorGradientGLUTWindow.h

@@ -19 +19 @@
 
 
-#include "glui.h"
+#include <glui.h>
 #include "ColorGradient.h"
 #include "ControlPoint.h"

trunk/vizservers/nanovis/transfer-function/TransferFunctionMain.h

@@ -1 @@
-#include "GL/glut.h"
-#include "glui.h"
+
+#include <GL/glut.h>
+#include <glui.h>
 
 #ifndef __TF_MAIN_H__