Changeset 4917 for branches


Ignore:
Timestamp:
Jan 3, 2015 9:40:53 AM (6 years ago)
Author:
gah
Message:
 
Location:
branches/r9
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/r9/configure

    r4916 r4917  
    643643X_LIBRARIES
    644644X_INCLUDES
    645 STATSDIR
    646 XSUBPP
    647 VTK_VERSION
    648 VTK_TCL_DIR
    649645TK_VERSION
    650646TK_XLIBSW
     
    664660SIZEOF_INT
    665661SHLIB_LDFLAGS
    666 RP_BASE
    667662SVN_VERSION
    668663MAKE
     
    670665INSTALL_PREFIX
    671666HAVE_INTTYPES_H
    672 ENABLE_VTK_DICOM
    673 ENABLE_VTK
    674 ENABLE_GUI
    675 ENABLE_LANG
    676667LDFLAGS_DEFAULT
    677668CFLAGS_DEFAULT
     
    778769with_install
    779770with_vtk
    780 enable_vtkdicom
    781771with_x
    782772enable_64bit
     
    14151405  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    14161406  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    1417   --enable-vtkdicom       Use vtkDICOM package [default=no]
    14181407  --enable-64bit          enable 64bit support (where applicable)
    14191408  --enable-64bit-vis      enable 64bit Sparc VIS support
     
    27292718RAPPTURE_VERSION=1.5
    27302719
    2731 VTK_VERSION=6.0
    27322720WITH_R=yes
    27332721WITH_JAVA=yes
     
    28562844else
    28572845  WITH_VTK=no
    2858 fi
    2859 
    2860 
    2861 # Check whether --enable-vtkdicom was given.
    2862 if test "${enable_vtkdicom+set}" = set; then :
    2863   enableval=$enable_vtkdicom;
    2864 else
    2865   enable_vtkdicom=no
    28662846fi
    28672847
     
    61346114  as_fn_error $? "Requires GNU make. You can specify a version with \$MAKE" "$LINENO" 5
    61356115fi
    6136 
    6137 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vtkDICOM" >&5
    6138 $as_echo_n "checking for vtkDICOM... " >&6; }
    6139 ENABLE_VTK_DICOM=
    6140 if test "$enable_vtkdicom" != "no" ; then
    6141     ENABLE_VTK_DICOM="yes"
    6142 fi
    6143 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vtkdicom" >&5
    6144 $as_echo "$enable_vtkdicom" >&6; }
    6145 
    6146 RP_BASE=`pwd`
    61476116
    61486117#--------------------------------------------------------------------
     
    80217990
    80227991
    8023 
    8024 
    8025 
    8026 
    80277992MAKE=${make_command}
    8028 
    8029 
    8030 
    8031 
    8032 
    80337993
    80347994
  • branches/r9/configure.in

    r4916 r4917  
    1313RAPPTURE_VERSION=Version
    1414
    15 VTK_VERSION=6.0
    1615WITH_R=yes
    1716WITH_JAVA=yes
     
    118117    [WITH_VTK=${withval}],
    119118    [WITH_VTK=no])
    120 
    121 AC_ARG_ENABLE(
    122     [vtkdicom],
    123     [AS_HELP_STRING([--enable-vtkdicom],
    124         [Use vtkDICOM package @<:@default=no@:>@])],
    125     [],
    126     [enable_vtkdicom=no])
    127119
    128120#------------------------------------------------------------------------
     
    251243fi
    252244
    253 AC_MSG_CHECKING([for vtkDICOM])
    254 ENABLE_VTK_DICOM=
    255 if test "$enable_vtkdicom" != "no" ; then
    256     ENABLE_VTK_DICOM="yes"
    257 fi
    258 AC_MSG_RESULT([$enable_vtkdicom])
    259 
    260 RP_BASE=`pwd`
    261 
    262245#--------------------------------------------------------------------
    263246# Set the default compiler switches based on the --enable-symbols
     
    270253AC_SUBST(CFLAGS_DEBUG)
    271254AC_SUBST(CFLAGS_OPTIMIZE)
    272 AC_SUBST(ENABLE_LANG)
    273 AC_SUBST(ENABLE_GUI)
    274 AC_SUBST(ENABLE_VTK)
    275 AC_SUBST(ENABLE_VTK_DICOM)
    276255AC_SUBST(HAVE_INTTYPES_H)
    277256AC_SUBST(INSTALL_PREFIX)
     
    279258AC_SUBST(MAKE, ${make_command})
    280259AC_SUBST(SVN_VERSION)
    281 AC_SUBST(RP_BASE)
    282260AC_SUBST(SHLIB_CFLAGS)
    283261AC_SUBST(SHLIB_LD)
     
    306284AC_SUBST(TK_XLIBSW)
    307285AC_SUBST(TK_VERSION)
    308 AC_SUBST(VTK_TCL_DIR)
    309 AC_SUBST(VTK_VERSION)
    310 AC_SUBST(XSUBPP)
    311 AC_SUBST(STATSDIR)
    312286AC_SUBST(X_INCLUDES)
    313287AC_SUBST(X_LIBRARIES)
  • branches/r9/pkgs/configure

    r4916 r4917  
    59645964fi
    59655965
     5966VTK_VERSION=0.0
     5967
    59665968. ${exec_prefix}/lib/rapptureConfig.sh
    59675969. ${exec_prefix}/lib/tclConfig.sh
    59685970. ${exec_prefix}/lib/tkConfig.sh
    5969 
    5970 echo RAPPTURE_VERSION=$RAPPTURE_VERSION
     5971. ${exec_prefix}/lib/vtkConfig.sh
    59715972
    59725973#--------------------------------------------------------------------
  • branches/r9/pkgs/configure.in

    r4916 r4917  
    105105fi
    106106
     107VTK_VERSION=0.0
     108
    107109. ${exec_prefix}/lib/rapptureConfig.sh
    108110. ${exec_prefix}/lib/tclConfig.sh
    109111. ${exec_prefix}/lib/tkConfig.sh
    110 
    111 echo RAPPTURE_VERSION=$RAPPTURE_VERSION
    112    
     112. ${exec_prefix}/lib/vtkConfig.sh
     113
    113114#--------------------------------------------------------------------
    114115# Set the default compiler switches based on the --enable-symbols
  • branches/r9/rapptureConfig.sh.in

    r4916 r4917  
    2828WITH_TCL=@WITH_TCL@
    2929WITH_VTK=@WITH_VTK@
    30 VTK_VERSION=@VTK_VERSION@
    3130
Note: See TracChangeset for help on using the changeset viewer.