Changeset 5681 for trunk/configure.in
- Timestamp:
- Jun 10, 2015, 8:54:05 AM (9 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/1.3 merged: 5676,5678,5680 /branches/uq merged: 5411-5417,5530-5534,5554-5555,5570,5627,5677
- Property svn:mergeinfo changed
-
trunk/configure.in
r5175 r5681 43 43 AC_PROG_MAKE_SET 44 44 45 # Check for C, C++, and FORTRAN 45 # Check for C, C++, and FORTRAN 46 46 AC_PROG_CC 47 47 AC_PROG_CXX 48 # Avoid g95 48 # Avoid g95 49 49 AC_PROG_F77([g77 gfortran f77 fort77 f90 xlf xlf90 fl32]) 50 50 … … 147 147 for dir in \ 148 148 ${exec_prefix} \ 149 ${exec_prefix}/lib ; do 149 ${exec_prefix}/lib ; do 150 150 tclconfig="${dir}/tclConfig.sh" 151 151 if test -f "$tclconfig" ; then … … 172 172 if test "${with_tclsh}" != "no" ; then 173 173 tclsh="tclsh${TCL_VERSION}" 174 if test "${with_tclsh}" = "yes" ; then 174 if test "${with_tclsh}" = "yes" ; then 175 175 AC_PATH_PROG(TCLSH, ${tclsh}, [], [${exec_prefix}/bin:${PATH}]) 176 else 176 else 177 177 AC_PATH_PROG(TCLSH, ${tclsh}, [], [${with_tclsh}/bin:${with_tclsh}]) 178 178 fi … … 189 189 [AS_HELP_STRING([--with-vtk[=version]], 190 190 [VTK library version @<:@default=6.2@:>@])], 191 [], 191 [], 192 192 [with_vtk=yes]) 193 193 … … 231 231 [AS_HELP_STRING([--enable-vtkdicom], 232 232 [Use vtkDICOM package @<:@default=no@:>@])], 233 [], 233 [], 234 234 [enable_vtkdicom=no]) 235 235 … … 297 297 #-------------------------------------------------------------------- 298 298 if test "${with_ffmpeg}" != "no" ; then 299 if test "${with_ffmpeg}" = "yes" ; then 299 if test "${with_ffmpeg}" = "yes" ; then 300 300 AC_PATH_PROG(FFMPEG, ffmpeg, [], $PATH) 301 else 301 else 302 302 AC_PATH_PROG(FFMPEG, ffmpeg, [], [${with_ffmpeg}/bin:${with_ffmpeg}]) 303 fi 303 fi 304 304 if test "${FFMPEG}x" != "x" ; then 305 305 AC_DEFINE(HAVE_FFMPEG, 1, [Render servers can use ffmpeg])
Note: See TracChangeset
for help on using the changeset viewer.