Commit 6d588c6b authored by fogal1's avatar fogal1
Browse files

Add autoconfery to disable Tuvok.

The user can use --enable-tuvok (or --disable-tuvok) to control
Tuvok.  The environment variable TUVOK_ENABLE may also be used,
but is overridden by either of the command line options.

* src/ac/tuvok.m4: new macro
* src/acinclude.m4: add include line for a new macro.
* src/aclocal.m4: regenerated
* src/configure: regenerated
* src/configure.in: get rid of the minimal autoconf settings,
                    moved to macro.  call the new macro.
* src/include/visit-config.h.in: regenerated.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@5878 18c085ea-50e0-402c-830e-de6fd14e8384
parent 9dd77c5b
dnl Copyright 2000 - 2008
dnl The Regents of the University of California.
dnl All rights reserved.
dnl
dnl This work was produced at the University of California, Lawrence Livermore
dnl National Laboratory (UC LLNL) under contract no. W-7405-ENG-48 (Contract
dnl 48) between the U.S. Department of Energy (DOE) and The Regents of the
dnl University of California (University) for the operation of UC LLNL.
dnl Copyright is reserved to the University for purposes of controlled
dnl dissemination, commercialization through formal licensing, or other
dnl disposition under terms of Contract 48; DOE policies, regulations and
dnl orders; and U.S. statutes. The rights of the Federal Government are
dnl reserved under Contract 48 subject to the restrictions agreed upon by DOE
dnl and University.
dnl
dnl DISCLAIMER
dnl
dnl This software was prepared as an account of work sponsored by an agency of
dnl the United States Government. Neither the United States Government nor the
dnl University of California nor any of their employees, makes any warranty,
dnl express or implied, or assumes any liability or responsiblity for the
dnl accuracy, completeness, or usefullness of any information, apparatus,
dnl product, or process disclosed, or represents that its use would not
dnl infringe privately owned rights. Reference herein to any specific
dnl commercial products, process, or service by trade name, trademark,
dnl manufacturer, or otherwise, does not necessarily constitute or imply its
dnl endorsement, recommendation, or favoring by the United States Government
dnl or the University of California. The views and opinions of authors
dnl expressed herein do not necessarily state or reflect those of the United
dnl States Government or the University of California, and shall not be used
dnl for advertising or product endorsement purposes.
dnl
dnl Macros related to the Tuvok volume rendering library.
dnl provide an --enable-tuvok option and an environment variable to enable
dnl Tuvok. If Tuvok is enabled:
dnl . subst TUVOK_LIB to the appropriate linker options,
dnl . subst TUVOK_INCLUDE to the appropriate CPPFLAGS,
dnl . subst BUILD_TUVOK to "Tuvok",
dnl . define USE_TUVOK in the configuration file.
AC_DEFUN([AX_TUVOK], [
AC_MSG_CHECKING([if Tuvok should be used])
# Use the option if given on the configure line, else use TUVOK_ENABLE in
# the environment (should it be set).
AC_ARG_ENABLE([tuvok],
[AS_HELP_STRING([--enable-tuvok],
[Enable Tuvok-based volume renderers.])],
[],
[AS_IF([test -n "${TUVOK_ENABLE}"],
[enable_tuvok="${TUVOK_ENABLE}"],
[enable_tuvok="no"])
]
)
BUILD_TUVOK=
TUVOK_LIB=
TUVOK_INCLUDE=
AS_IF([test "x${enable_tuvok}" != "xno"],
[
AC_SUBST([BUILD_TUVOK], ["Tuvok"])
AC_SUBST([TUVOK_LIB], ["-lTuvok"])
AC_SUBST([TUVOK_INCLUDE], ["-I$""(TOPDIR)/include/Tuvok"])
AC_DEFINE([USE_TUVOK], [1], [Define to enable Tuvok-based code])
report_tuvok="yes"
],
[report_tuvok="no"]
)
AC_MSG_RESULT([$report_tuvok])
])
m4_sinclude([ac/icet.m4])
m4_sinclude([ac/with3rd.m4])
m4_sinclude([ac/tuvok.m4])
# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......
......@@ -310,7 +310,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
 
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TOPDIR PLATFORM_CPPFLAGS CMAKE CXXFLAGS EGREP CXX LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT PARALLEL PARALLEL_CPPFLAGS MPI_LIBS MPI_CC MPI_CXX LIBSTATICPAR LIBSHAREDPAR LIBSHAREDPAR_UPDATEONLY PARDEP BUILD_COGNOMEN LIBCOGNOMEN MESA_DIR MESA_INCLUDE MESA_LIBS VIEWER_MESA_STUB_CPPFLAGS VIEWER_MESA_LIBS BUILD_MESA_STUB CC CFLAGS ac_ct_CC GL_LIBS VTK_DIR VTK_INCLUDES VTK_LIBS VTK_LIGHTWEIGHT_LIBS AVTPREP_SER AVTPREP_PAR CONVERT_SER CONVERT_PAR MAKEMILI_SER MAKEMILI_PAR ENGINE_SER ENGINE_PAR ENGINELIBSER ENGINELIBPAR METADATA_SERVER MDSERVERLIB MDSERVEROBJ VISITPY SCRIPTINGLIB SCRIPTINGOBJ PY_BUILD_VISITMODULE VIEWER VISWINDOW VIEWERLIB VIEWEROBJ VIEWERLIB_SRC VIEWEREXE_SRC GUI GUILIB GUIOBJ GUIFRAMEWORKS ANNOTATION_FLAGS JAVAC JAVA_TARGET JAR JAVAFLAGS JAVAPLUGINFLAGS BUILD_SLIVR SLIVR_INCLUDE SLIVR_LIBS TEEM_CMAKE_C_FLAGS SLIVR_CMAKE_SHARED_LINKER_FLAGS SLIVR_GUI_IMPL SLIVR_GUI_HDR HELP PLOT_BUILD_DIRS OPERATOR_BUILD_DIRS DB_BUILD_DIRS BUILD_GLEW GLEW_INCLUDE GLEW_LIBS BUILD_BILIB VISITWRAPPER_RPATH CXXCPP CPP F77 FFLAGS ac_ct_F77 SET_MAKE RANLIB ac_ct_RANLIB MAKEDEPEND BUILD_FORTRAN OS_RULE BUILD_TUVOK TUVOK_INCLUDE TUVOK_LIB BUILD_ZLIB ZLIB_LIB HDF5_INCLUDE HDF5_LIB HDF5_TARGET SILO_INCLUDE SILO_LIB SILO_TARGET EXODUS EXODUS_LIB EXODUS_LIBS EXODUS_FLAGS PDB_INCLUDE PDB_LIB PDB_TARGET MILI MILI_FLAGS MILI_LIBS MILI_DIR TCMALLOC_LIB TCMALLOC_DIR CREATE_TCMALLOC_LINK HDF4 HDF4_FLAGS HDF4_LIBS HDF4_LIBDIR BOXLIB2D BOXLIB2D_INCLUDE BOXLIB2D_LIBS BOXLIB2D_LIBDIR BOXLIB3D BOXLIB3D_INCLUDE BOXLIB3D_LIBS BOXLIB3D_LIBDIR H5PART H5PART_INCLUDE H5PART_LIB H5PART_LIBDIR VISUS VISUS_INCLUDE VISUS_LIB NETCDF NETCDF_INCLUDE NETCDF_LIB NETCDF_CXX_LIB CGNS CGNS_INCLUDE CGNS_LIB GDAL GDAL_INCLUDE GDAL_LIB GDAL_LIBS CFITSIO CFITSIO_INCLUDE CFITSIO_LIB CFITSIO_LIBDIR ITAPS_C_INCLUDE ITAPS_C_LIB ITAPS_C0_INCLUDE ITAPS_C0_LIB ITAPS_C1_INCLUDE ITAPS_C1_LIB ITAPS_C2_INCLUDE ITAPS_C2_LIB ITAPS_C3_INCLUDE ITAPS_C3_LIB ITAPS_C4_INCLUDE ITAPS_C4_LIB ITAPS_C CCMIO CCMIO_INCLUDE CCMIO_LIBS CCMIO_LIBDIR SIMULATION EXPORT_DYNAMIC ENGINE_CPPFLAGS PREPROCESSOR_CPPFLAGS PREPROCESSOR_PARALLEL_SRC COMPONENT_CPPFLAGS VISIT_VTK_CPPFLAGS VISIT_VTK_LDFLAGS VIEWER_CPPFLAGS QT_BIN QT_INCLUDE QT_LIB QT_LDFLAGS QT_LIBS QT_CORE QT_CORE_LIB QT_DESIGNER QT_DESIGNER_LIB QT_GUI QT_GUI_LIB QT_HELP QT_HELP_LIB QT_CLUCENE QT_CLUCENE_LIB QT_NETWORK QT_NETWORK_LIB QT_OPENGL QT_OPENGL_LIB QT_SCRIPT QT_SCRIPT_LIB QT_SQL QT_SQL_LIB QT_SVG QT_SVG_LIB QT_TEST QT_TEST_LIB QT_XML QT_XML_LIB QT_QUI QT_QUI_LIB QT_CXXFLAGS QT_MOC VTKQT_CPPFLAGS VTKQT VTKQT_LIBS X_LIBS PTHREAD_LIB PTHREAD_CXXFLAGS ICET_CXXFLAGS ICET_LDFLAGS ICET_LIBS ICET_ENG_MAIN_OBJ PYDIR PYVERSION PY_INCLUDEDIR PY_CXXFLAGS PY_LDFLAGS PY_LIB PY_CLI_LIB EXE_LDFLAGS PLUGIN_LDFLAGS DATA_EXE_LDFLAGS SHLIB_CREATEPROG SHLIB_LIBS SHLIB_SERLIBS SHLIB_PARLIBS SHLIB_MPI_LIBS SHLIB_ILIBS SHLIB_GLIBS SHLIB_VLIBS SHLIB_MLIBS SHLIB_ESERLIBS SHLIB_EPARLIBS SHLIB_SLIBS SHLIB_POSTPROCESS_ILIBS SHLIB_POSTPROCESS_GLIBS SHLIB_POSTPROCESS_VLIBS SHLIB_POSTPROCESS_MLIBS SHLIB_POSTPROCESS_ESERLIBS SHLIB_POSTPROCESS_EPARLIBS SHLIB_POSTPROCESS_SLIBS SHLIB_SOEXT SHLIB_LIBEXT SHLIB_POSTPROCESS SHLIB_POSTPROCESS_SER SHLIB_POSTPROCESS_PAR SHLIB_TMPDIR PREBIND_LIBS ENGINEWRAPSER ENGINEWRAPPAR CREATE_MILI_LINK CREATE_HDF4_LINK CREATE_NETCDF_LINK CREATE_CGNS_LINK CREATE_GDAL_LINK CREATE_EXODUS_LINK CREATE_BOXLIB2D_LINK CREATE_BOXLIB3D_LINK CREATE_CFITSIO_LINK CREATE_H5PART_LINK CREATE_CCMIO_LINK VAC_CV_LIBDIR_CREATE_LINKS VAC_CV_LIBDIR_DESTROY_LINKS MG tmpbin tmpinc tmplib plotplugindir operatorplugindir databaseplugindir DATA_REL_VISIT_PATH LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TOPDIR PLATFORM_CPPFLAGS CMAKE CXXFLAGS EGREP CXX LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT PARALLEL PARALLEL_CPPFLAGS MPI_LIBS MPI_CC MPI_CXX LIBSTATICPAR LIBSHAREDPAR LIBSHAREDPAR_UPDATEONLY PARDEP BUILD_COGNOMEN LIBCOGNOMEN MESA_DIR MESA_INCLUDE MESA_LIBS VIEWER_MESA_STUB_CPPFLAGS VIEWER_MESA_LIBS BUILD_MESA_STUB CC CFLAGS ac_ct_CC GL_LIBS VTK_DIR VTK_INCLUDES VTK_LIBS VTK_LIGHTWEIGHT_LIBS AVTPREP_SER AVTPREP_PAR CONVERT_SER CONVERT_PAR MAKEMILI_SER MAKEMILI_PAR ENGINE_SER ENGINE_PAR ENGINELIBSER ENGINELIBPAR METADATA_SERVER MDSERVERLIB MDSERVEROBJ VISITPY SCRIPTINGLIB SCRIPTINGOBJ PY_BUILD_VISITMODULE VIEWER VISWINDOW VIEWERLIB VIEWEROBJ VIEWERLIB_SRC VIEWEREXE_SRC GUI GUILIB GUIOBJ GUIFRAMEWORKS ANNOTATION_FLAGS JAVAC JAVA_TARGET JAR JAVAFLAGS JAVAPLUGINFLAGS BUILD_SLIVR SLIVR_INCLUDE SLIVR_LIBS TEEM_CMAKE_C_FLAGS SLIVR_CMAKE_SHARED_LINKER_FLAGS SLIVR_GUI_IMPL SLIVR_GUI_HDR HELP PLOT_BUILD_DIRS OPERATOR_BUILD_DIRS DB_BUILD_DIRS BUILD_GLEW GLEW_INCLUDE GLEW_LIBS BUILD_BILIB VISITWRAPPER_RPATH CXXCPP CPP F77 FFLAGS ac_ct_F77 SET_MAKE RANLIB ac_ct_RANLIB MAKEDEPEND BUILD_FORTRAN OS_RULE BUILD_TUVOK TUVOK_LIB TUVOK_INCLUDE BUILD_ZLIB ZLIB_LIB HDF5_INCLUDE HDF5_LIB HDF5_TARGET SILO_INCLUDE SILO_LIB SILO_TARGET EXODUS EXODUS_LIB EXODUS_LIBS EXODUS_FLAGS PDB_INCLUDE PDB_LIB PDB_TARGET MILI MILI_FLAGS MILI_LIBS MILI_DIR TCMALLOC_LIB TCMALLOC_DIR CREATE_TCMALLOC_LINK HDF4 HDF4_FLAGS HDF4_LIBS HDF4_LIBDIR BOXLIB2D BOXLIB2D_INCLUDE BOXLIB2D_LIBS BOXLIB2D_LIBDIR BOXLIB3D BOXLIB3D_INCLUDE BOXLIB3D_LIBS BOXLIB3D_LIBDIR H5PART H5PART_INCLUDE H5PART_LIB H5PART_LIBDIR VISUS VISUS_INCLUDE VISUS_LIB NETCDF NETCDF_INCLUDE NETCDF_LIB NETCDF_CXX_LIB CGNS CGNS_INCLUDE CGNS_LIB GDAL GDAL_INCLUDE GDAL_LIB GDAL_LIBS CFITSIO CFITSIO_INCLUDE CFITSIO_LIB CFITSIO_LIBDIR ITAPS_C_INCLUDE ITAPS_C_LIB ITAPS_C0_INCLUDE ITAPS_C0_LIB ITAPS_C1_INCLUDE ITAPS_C1_LIB ITAPS_C2_INCLUDE ITAPS_C2_LIB ITAPS_C3_INCLUDE ITAPS_C3_LIB ITAPS_C4_INCLUDE ITAPS_C4_LIB ITAPS_C CCMIO CCMIO_INCLUDE CCMIO_LIBS CCMIO_LIBDIR SIMULATION EXPORT_DYNAMIC ENGINE_CPPFLAGS PREPROCESSOR_CPPFLAGS PREPROCESSOR_PARALLEL_SRC COMPONENT_CPPFLAGS VISIT_VTK_CPPFLAGS VISIT_VTK_LDFLAGS VIEWER_CPPFLAGS QT_BIN QT_INCLUDE QT_LIB QT_LDFLAGS QT_LIBS QT_CORE QT_CORE_LIB QT_DESIGNER QT_DESIGNER_LIB QT_GUI QT_GUI_LIB QT_HELP QT_HELP_LIB QT_CLUCENE QT_CLUCENE_LIB QT_NETWORK QT_NETWORK_LIB QT_OPENGL QT_OPENGL_LIB QT_SCRIPT QT_SCRIPT_LIB QT_SQL QT_SQL_LIB QT_SVG QT_SVG_LIB QT_TEST QT_TEST_LIB QT_XML QT_XML_LIB QT_QUI QT_QUI_LIB QT_CXXFLAGS QT_MOC VTKQT_CPPFLAGS VTKQT VTKQT_LIBS X_LIBS PTHREAD_LIB PTHREAD_CXXFLAGS ICET_CXXFLAGS ICET_LDFLAGS ICET_LIBS ICET_ENG_MAIN_OBJ PYDIR PYVERSION PY_INCLUDEDIR PY_CXXFLAGS PY_LDFLAGS PY_LIB PY_CLI_LIB EXE_LDFLAGS PLUGIN_LDFLAGS DATA_EXE_LDFLAGS SHLIB_CREATEPROG SHLIB_LIBS SHLIB_SERLIBS SHLIB_PARLIBS SHLIB_MPI_LIBS SHLIB_ILIBS SHLIB_GLIBS SHLIB_VLIBS SHLIB_MLIBS SHLIB_ESERLIBS SHLIB_EPARLIBS SHLIB_SLIBS SHLIB_POSTPROCESS_ILIBS SHLIB_POSTPROCESS_GLIBS SHLIB_POSTPROCESS_VLIBS SHLIB_POSTPROCESS_MLIBS SHLIB_POSTPROCESS_ESERLIBS SHLIB_POSTPROCESS_EPARLIBS SHLIB_POSTPROCESS_SLIBS SHLIB_SOEXT SHLIB_LIBEXT SHLIB_POSTPROCESS SHLIB_POSTPROCESS_SER SHLIB_POSTPROCESS_PAR SHLIB_TMPDIR PREBIND_LIBS ENGINEWRAPSER ENGINEWRAPPAR CREATE_MILI_LINK CREATE_HDF4_LINK CREATE_NETCDF_LINK CREATE_CGNS_LINK CREATE_GDAL_LINK CREATE_EXODUS_LINK CREATE_BOXLIB2D_LINK CREATE_BOXLIB3D_LINK CREATE_CFITSIO_LINK CREATE_H5PART_LINK CREATE_CCMIO_LINK VAC_CV_LIBDIR_CREATE_LINKS VAC_CV_LIBDIR_DESTROY_LINKS MG tmpbin tmpinc tmplib plotplugindir operatorplugindir databaseplugindir DATA_REL_VISIT_PATH LIBOBJS LTLIBOBJS'
ac_subst_files='VARIABLES TARGETS DIRTARGETS LIBTARGETS PARLIBTARGETS SOURCE_DEPENDENCIES'
 
# Initialize some variables set by options.
......@@ -881,6 +881,7 @@ Optional Features:
--disable-glew do not build or use glew library -- disables
detection of OpenGL extensions
--disable-bilib do not use boost interval template library -- disables adaptive CSG discretization
--enable-tuvok Enable Tuvok-based volume renderers.
--enable-icet Use the ICE-T parallel image compositor
 
 
......@@ -5609,7 +5610,7 @@ fi
 
 
# Provide some information about the compiler.
echo "$as_me:5612:" \
echo "$as_me:5613:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
......@@ -6855,15 +6856,57 @@ _ACEOF
fi
 
 
# Handle Tuvok
#
BUILD_TUVOK="Tuvok"
TUVOK_LIB="-lTuvok"
TUVOK_INCLUDE = "-I$""(TOPDIR)/include/Tuvok"
# not sure if the following is necessary
# Check if the user wants to use Tuvok
#
 
echo "$as_me:$LINENO: checking if Tuvok should be used" >&5
echo $ECHO_N "checking if Tuvok should be used... $ECHO_C" >&6
# Use the option if given on the configure line, else use TUVOK_ENABLE in
# the environment (should it be set).
# Check whether --enable-tuvok or --disable-tuvok was given.
if test "${enable_tuvok+set}" = set; then
enableval="$enable_tuvok"
else
if test -n "${TUVOK_ENABLE}"; then
enable_tuvok="${TUVOK_ENABLE}"
else
enable_tuvok="no"
fi
fi;
BUILD_TUVOK=
TUVOK_LIB=
TUVOK_INCLUDE=
if test "x${enable_tuvok}" != "xno"; then
BUILD_TUVOK="Tuvok"
TUVOK_LIB="-lTuvok"
TUVOK_INCLUDE="-I$""(TOPDIR)/include/Tuvok"
cat >>confdefs.h <<\_ACEOF
#define USE_TUVOK 1
_ACEOF
report_tuvok="yes"
else
report_tuvok="no"
fi
echo "$as_me:$LINENO: result: $report_tuvok" >&5
echo "${ECHO_T}$report_tuvok" >&6
 
# primarily for mac pre-binding
 
#
# Handle zlib. By default, we try to find a zlib because VisIt can
......@@ -20565,8 +20608,8 @@ s,@MAKEDEPEND@,$MAKEDEPEND,;t t
s,@BUILD_FORTRAN@,$BUILD_FORTRAN,;t t
s,@OS_RULE@,$OS_RULE,;t t
s,@BUILD_TUVOK@,$BUILD_TUVOK,;t t
s,@TUVOK_INCLUDE@,$TUVOK_INCLUDE,;t t
s,@TUVOK_LIB@,$TUVOK_LIB,;t t
s,@TUVOK_INCLUDE@,$TUVOK_INCLUDE,;t t
s,@BUILD_ZLIB@,$BUILD_ZLIB,;t t
s,@ZLIB_LIB@,$ZLIB_LIB,;t t
s,@HDF5_INCLUDE@,$HDF5_INCLUDE,;t t
......
......@@ -2010,15 +2010,10 @@ AC_TRY_COMPILE([#include <sys/types.h>
#
AC_CHECK_LIB(m, main)
# Handle Tuvok
#
BUILD_TUVOK="Tuvok"
TUVOK_LIB="-lTuvok"
TUVOK_INCLUDE = "-I$""(TOPDIR)/include/Tuvok"
# not sure if the following is necessary
AC_SUBST(BUILD_TUVOK)
AC_SUBST(TUVOK_INCLUDE)
AC_SUBST(TUVOK_LIB) # primarily for mac pre-binding
#
# Check if the user wants to use Tuvok
#
AX_TUVOK
#
# Handle zlib. By default, we try to find a zlib because VisIt can
......
......@@ -220,6 +220,9 @@
/* Define USE_PTY if we want to use PTYs. */
#undef USE_PTY
/* Define to enable Tuvok-based code */
#undef USE_TUVOK
/* VisIt version */
#undef VERSION
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment