Changeset 4917 for branches

Timestamp:

Jan 3, 2015 9:40:53 AM (9 years ago)

Author:

gah

Message:

 

Location:

branches/r9

Files:

• configure (modified) (9 diffs)
• configure.in (modified) (6 diffs)
• pkgs/configure (modified) (1 diff)
• pkgs/configure.in (modified) (1 diff)
• rapptureConfig.sh.in (modified) (1 diff)

branches/r9/configure

@@ -643 +643 @@
 X_LIBRARIES
 X_INCLUDES
-STATSDIR
-XSUBPP
-VTK_VERSION
-VTK_TCL_DIR
 TK_VERSION
 TK_XLIBSW
@@ -664 +660 @@
 SIZEOF_INT
 SHLIB_LDFLAGS
-RP_BASE
 SVN_VERSION
 MAKE
@@ -670 +665 @@
 INSTALL_PREFIX
 HAVE_INTTYPES_H
-ENABLE_VTK_DICOM
-ENABLE_VTK
-ENABLE_GUI
-ENABLE_LANG
 LDFLAGS_DEFAULT
 CFLAGS_DEFAULT
@@ -778 +769 @@
 with_install
 with_vtk
-enable_vtkdicom
 with_x
 enable_64bit
@@ -1415 +1405 @@
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-vtkdicom       Use vtkDICOM package [default=no]
   --enable-64bit          enable 64bit support (where applicable)
   --enable-64bit-vis      enable 64bit Sparc VIS support
@@ -2729 +2718 @@
 RAPPTURE_VERSION=1.5
 
-VTK_VERSION=6.0
 WITH_R=yes
 WITH_JAVA=yes
@@ -2856 +2844 @@
 else
   WITH_VTK=no
-fi
-
-
-# Check whether --enable-vtkdicom was given.
-if test "${enable_vtkdicom+set}" = set; then :
-  enableval=$enable_vtkdicom;
-else
-  enable_vtkdicom=no
 fi
 
@@ -6134 +6114 @@
   as_fn_error $? "Requires GNU make. You can specify a version with \$MAKE" "$LINENO" 5
 fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vtkDICOM" >&5
-$as_echo_n "checking for vtkDICOM... " >&6; }
-ENABLE_VTK_DICOM=
-if test "$enable_vtkdicom" != "no" ; then
-    ENABLE_VTK_DICOM="yes"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vtkdicom" >&5
-$as_echo "$enable_vtkdicom" >&6; }
-
-RP_BASE=`pwd`
 
 #--------------------------------------------------------------------
@@ -8021 +7990 @@
 
 
-
-
-
-
 MAKE=${make_command}
-
-
-
-
-
 
 

branches/r9/configure.in

@@ -13 +13 @@
 RAPPTURE_VERSION=Version
 
-VTK_VERSION=6.0
 WITH_R=yes
 WITH_JAVA=yes
@@ -118 +117 @@
     [WITH_VTK=${withval}],
     [WITH_VTK=no])
-
-AC_ARG_ENABLE(
-    [vtkdicom],
-    [AS_HELP_STRING([--enable-vtkdicom],
-        [Use vtkDICOM package @<:@default=no@:>@])],
-    [], 
-    [enable_vtkdicom=no])
 
 #------------------------------------------------------------------------
@@ -251 +243 @@
 fi
 
-AC_MSG_CHECKING([for vtkDICOM])
-ENABLE_VTK_DICOM=
-if test "$enable_vtkdicom" != "no" ; then
-    ENABLE_VTK_DICOM="yes"
-fi
-AC_MSG_RESULT([$enable_vtkdicom])
-
-RP_BASE=`pwd`
-
 #--------------------------------------------------------------------
 # Set the default compiler switches based on the --enable-symbols
@@ -270 +253 @@
 AC_SUBST(CFLAGS_DEBUG)
 AC_SUBST(CFLAGS_OPTIMIZE)
-AC_SUBST(ENABLE_LANG)
-AC_SUBST(ENABLE_GUI)
-AC_SUBST(ENABLE_VTK)
-AC_SUBST(ENABLE_VTK_DICOM)
 AC_SUBST(HAVE_INTTYPES_H)
 AC_SUBST(INSTALL_PREFIX)
@@ -279 +258 @@
 AC_SUBST(MAKE, ${make_command})
 AC_SUBST(SVN_VERSION)
-AC_SUBST(RP_BASE)
 AC_SUBST(SHLIB_CFLAGS)
 AC_SUBST(SHLIB_LD)
@@ -306 +284 @@
 AC_SUBST(TK_XLIBSW)
 AC_SUBST(TK_VERSION)
-AC_SUBST(VTK_TCL_DIR)
-AC_SUBST(VTK_VERSION)
-AC_SUBST(XSUBPP)
-AC_SUBST(STATSDIR)
 AC_SUBST(X_INCLUDES)
 AC_SUBST(X_LIBRARIES)

branches/r9/pkgs/configure

@@ -5964 +5964 @@
 fi
 
+VTK_VERSION=0.0
+
 . ${exec_prefix}/lib/rapptureConfig.sh
 . ${exec_prefix}/lib/tclConfig.sh
 . ${exec_prefix}/lib/tkConfig.sh
-
-echo RAPPTURE_VERSION=$RAPPTURE_VERSION
+. ${exec_prefix}/lib/vtkConfig.sh
 
 #--------------------------------------------------------------------

branches/r9/pkgs/configure.in

@@ -105 +105 @@
 fi
 
+VTK_VERSION=0.0
+
 . ${exec_prefix}/lib/rapptureConfig.sh
 . ${exec_prefix}/lib/tclConfig.sh
 . ${exec_prefix}/lib/tkConfig.sh
-
-echo RAPPTURE_VERSION=$RAPPTURE_VERSION
-    
+. ${exec_prefix}/lib/vtkConfig.sh
+
 #--------------------------------------------------------------------
 # Set the default compiler switches based on the --enable-symbols

branches/r9/rapptureConfig.sh.in

@@ -28 +28 @@
 WITH_TCL=@WITH_TCL@
 WITH_VTK=@WITH_VTK@
-VTK_VERSION=@VTK_VERSION@