diff -urN opencascade-6.8.0.orig/adm/lin/amk/Makefile.am opencascade-6.8.0/adm/lin/amk/Makefile.am --- opencascade-6.8.0.orig/adm/lin/amk/Makefile.am 2014-11-07 16:27:48.000000000 +0100 +++ opencascade-6.8.0/adm/lin/amk/Makefile.am 2014-11-07 16:27:26.000000000 +0100 @@ -24,7 +24,10 @@ ModelingAlgorithms_DIRS = endif -Visualization_PKGS = TKService TKV3d TKOpenGl TKMeshVS TKNIS TKVoxel TKIVtk +Visualization_PKGS = TKService TKV3d TKOpenGl TKMeshVS TKNIS TKVoxel +if HAVE_VTK + Visualization_PKGS += TKIVtk +endif if ENABLE_VIS Visualization_DIRS = $(Visualization_PKGS) @@ -48,7 +51,10 @@ DataExchange_DIRS = endif -Draw_PKGS = TKDraw TKTopTest TKIVtkDraw TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw DRAWEXE +Draw_PKGS = TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw DRAWEXE +if HAVE_VTK + Draw_PKGS += TKIVtkDraw +endif if ENABLE_DRAW Draw_DIRS = $(Draw_PKGS) diff -urN opencascade-6.8.0.orig/configure.ac opencascade-6.8.0/configure.ac --- opencascade-6.8.0.orig/configure.ac 2014-11-10 14:18:45.000000000 +0100 +++ opencascade-6.8.0/configure.ac 2014-11-10 13:56:26.000000000 +0100 @@ -779,20 +779,24 @@ if test "xno$vtk_inc" = "xno"; then # user specified --without-vtk-lib - HAVE_VTK=no HAVE_VTK_INC=no - DISABLE_VTK_REASON_INC="(--with-vtk-include=DIR option was not defined)" + DISABLE_VTK_REASON="(--with-vtk-include=DIR option was not defined)" else CSF_VTK_INCLUDES="" AC_LANG([C++]) HAVE_VTK_INC=yes if test ! -d $vtk_inc; then - DISABLE_VTK_REASON_INC="($vtk_inc directory does not exists)" + DISABLE_VTK_REASON="($vtk_inc directory does not exists)" AC_MSG_ERROR([$vtk_inc directory does not exists]) + elif test ! -f $vtk_inc/vtkVersion.h; then + DISABLE_VTK_REASON="(vtk headers are not found in $vtk_inc)" + AC_MSG_ERROR([vtk headers are not found in $vtk_inc]) elif test "x$vtk_inc" != "x"; then CPPFLAGS="-I$vtk_inc $CPPFLAGS"; else - AC_MSG_NOTICE("--with-vtk-include key is not defined") + HAVE_VTK_INC=no + DISABLE_VTK_REASON="(--with-vtk-include=DIR option was not defined)" + AC_MSG_NOTICE("--with-vtk-include=DIR option was not defined") fi fi @@ -1017,7 +1021,9 @@ if test "xno" = "xno$vtk_lib"; then # user specified --without-vtk HAVE_VTK=no - DISABLE_VTK_REASON_LIB="(--with-vtk-library=DIR option was not defined)" + if test "x$DISABLE_VTK_REASON" = "x" ; then + DISABLE_VTK_REASON="(--with-vtk-library=DIR option was not defined)" + fi else CSF_VTK_LIB="" HAVE_VTK=yes @@ -1025,39 +1031,25 @@ #CPP_FLAGS="-I$vtk $CPPFLAGS" #AC_CHECK_HEADER( [Vtk/vtkConfigure.h], [HAVE_VTK_INC=yes], [HAVE_VTK_INC=no] ) if test "x$HAVE_VTK_INC" = "xyes"; then - if test ! -d $vtk; then - DISABLE_VTK_REASON_LIB="($vtk_lib directory does not exist)" + if test ! -d $vtk_lib; then + DISABLE_VTK_REASON="($vtk_lib directory does not exist)" AC_MSG_ERROR([$vtk_lib directory does not exist]) - elif test "x$vtk_lib" != "x"; then - LDFLAGS="-L$vtk_lib $LDFLAGS" - fi - else - HAVE_VTK=no - fi - - if test "x$HAVE_VTK" = "xyes"; then - if test "x$vtk_inc" != "x"; then - CSF_VTK_INCLUDES="" - CSF_OPT_INCLUDES="${CSF_OPT_INCLUDES} -I$vtk_inc -DHAVE_VTK" - else - HAVE_VTK=no - fi - if test "x$vtk_lib" != "x"; then + elif test ! -f $vtk_lib/libvtkCommonCore-6.1.so; then + DISABLE_VTK_REASON="(vtk libraries are not found in $vtk_lib)" + AC_MSG_ERROR([vtk libraries are not found in $vtk_lib]) + elif test "x$vtk_lib" != "x" -a "x$vtk_inc" != "x"; then CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore-6.1 -lvtkCommonDataModel-6.1 -lvtkCommonExecutionModel-6.1 -lvtkCommonMath-6.1 -lvtkCommonTransforms-6.1 " CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore-6.1 -lvtkRenderingOpenGL-6.1 -lvtkFiltersGeneral-6.1 -lvtkIOCore-6.1 -lvtkIOImage-6.1 -lvtkImagingCore-6.1 -lvtkInteractionStyle-6.1 " - else - HAVE_VTK=no - fi - - if test "x$HAVE_VTK" = "xyes"; then CSF_OPT_INC="$vtk_inc:${CSF_OPT_INC}" CSF_OPT_LIB="$vtk_lib:${CSF_OPT_LIB}" + CSF_OPT_INCLUDES="${CSF_OPT_INCLUDES} -I$vtk_inc -DHAVE_VTK" else - DISABLE_VTK_REASON="(VTK was not found)" + HAVE_VTK=no + AC_MSG_NOTICE("--with-vtk-library=DIR option was not defined") + DISABLE_VTK_REASON="(--with-vtk-library=DIR option was not defined)" fi else - AC_MSG_NOTICE("Specify --with-vtk-library to enable VTK support") - DISABLE_VTK_REASON_LIB="(VTK libraries were not found)" + HAVE_VTK=no fi fi @@ -1161,11 +1153,11 @@ DISABLE_VIS_REASON="(FREETYPE not found)" ENABLE_VIS=no fi - if test "xyes" = "x$ENABLE_VIS" -a "xyes" != "x$HAVE_VTK"; then - AC_MSG_NOTICE([Disabling Visualization: VTK not found]) - DISABLE_VIS_REASON="(VTK not found)" - ENABLE_VIS=no - fi +# if test "xyes" = "x$ENABLE_VIS" -a "xyes" != "x$HAVE_VTK"; then +# AC_MSG_NOTICE([Disabling Visualization: VTK not found]) +# DISABLE_VIS_REASON="(VTK not found)" +# ENABLE_VIS=no +# fi else DISABLE_VIS_REASON="(Disabled)" fi