Changeset 3425 for trunk/packages/vizservers/configure.in

Timestamp:

Mar 3, 2013 5:49:46 PM (11 years ago)

Author:

ldelgass

Message:

Remove OpenDX checks from configure, it is no longer supported/required as a
dependency

File:

• trunk/packages/vizservers/configure.in (modified) (3 diffs)

trunk/packages/vizservers/configure.in

@@ -108 +108 @@
 #       GL headers and library
 #       GLuT headers and library
-#       GLui header and library
 #       GLEW header and library
 #       Cg headers and library
 #       CgGL headers and library
 #       pthread library
-#       DX headers and library (done, sort of)
 #       ffmpeg headers and library (started)
 #
@@ -208 +206 @@
 
 AC_CHECK_FUNCS([accept4])
-
-AC_MSG_CHECKING([for OpenDX headers])
-DX_INC_DIR=""
-for dir in \
- /apps/rappture/include \
- /usr/dx/include \
- /usr/include
-do
-  if test -r "${dir}/dx/dx.h" ; then
-    DX_INC_DIR="$dir"
-    break
-  fi
-done
-if test "x${DX_INC_DIR}" = "x" ; then
-  AC_MSG_WARN([cannot find OpenDX include files])
-  DX_INC_SPEC=""
-elif test "${DX_INC_DIR}" = "/usr/include" ; then
-  DX_INC_SPEC=""
-else 
-  DX_INC_SPEC="-I{DX_INC_DIR}"
-fi
-
-AC_MSG_RESULT([${DX_INC_DIR}])
-save_CPPFLAGS=${CPPFLAGS}
-CPPFLAGS="$DX_INC_SPEC $CPPFLAGS"
-AC_CHECK_HEADERS(dx/dx.h)
-CPPFLAGS=${save_CPPFLAGS}
-
-DX_LIB_DIR=""
-for dir in \
- /usr/lib \
- /usr/lib64 \
- /usr/dx/lib_linux \
- /usr/lib/dx/lib_linux \
- /usr/lib64/dx/lib_linux \
- /apps/rappture/lib 
-do
-  saveLDFLAGS=$LDFLAGS
-  LDFLAGS="-L$dir $LDFLAGS"
-  unset ac_cv_lib_DXcallm_DXGetComponentValue
-  AC_CHECK_LIB([DXcallm], [DXGetComponentValue], [found=yes], [found=no], [-lX11])
-  LDFLAGS=$saveLDFLAGS
-  if test "$found" = "yes" ; then
-    DX_LIB_DIR="$dir"
-    break
-  fi
-done
-if test "x${DX_LIB_DIR}" = "x" ; then
-  AC_MSG_WARN([cannot find OpenDX libraries])
-fi
-
-AC_MSG_CHECKING([for libDXcallm library])
-if test "x${DX_LIB_DIR}" = "x" -o "${DX_LIB_DIR}" = "/usr/lib" -o "${DX_LIB_DIR}" = "/usr/lib64"; then
-  DX_LIB_SPEC=""
-else
-  DX_LIB_SPEC="-L${DX_LIB_DIR} -lDXcallm"
-fi
-AC_MSG_RESULT([$DX_LIB_SPEC])
 
 save_CPPFLAGS=$CPPFLAGS
@@ -392 +332 @@
 AC_SUBST(CG_INC_SPEC)
 AC_SUBST(CG_LIB_SPEC)
-AC_SUBST(DX_INC_SPEC)
-AC_SUBST(DX_LIB_SPEC)
 AC_SUBST(FF_INC_SPEC)
 AC_SUBST(LD_RPATH)