Changeset 1881 for branches/blt4/configure.in
- Timestamp:
- Aug 25, 2010, 7:05:07 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/blt4/configure.in
r1874 r1881 249 249 AC_SUBST(MEXEXT) 250 250 251 # Standard octave search (use the installed version of octave) 251 252 AC_ARG_WITH( 252 253 [octave], … … 257 258 258 259 OCTAVE= 260 OCTAVE2= 261 OCTAVE3= 259 262 OCTAVE_VERSION= 260 263 OCTAVE_VERSION_MAJOR= 261 264 MKOCTFILE= 265 MKOCTFILE2= 266 MKOCTFILE3= 262 267 if test "$with_octave" != "no" ; then 263 268 AC_MSG_CHECKING([for octave and mkoctfile]) … … 266 271 AC_PATH_PROG(MKOCTFILE, mkoctfile) 267 272 else 268 AC_PATH_PROG(OCTAVE, octave, [], [$ with_octave/bin:$with_octave])273 AC_PATH_PROG(OCTAVE, octave, [], [${with_octave}/bin:${with_octave}]) 269 274 AC_PATH_PROG(MKOCTFILE, mkoctfile, [], 270 275 [${with_octave}/bin:${with_octave}]) … … 273 278 OCTAVE_VERSION=`${OCTAVE} -v | grep version | cut -d' ' -f4` 274 279 OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1` 275 fi 276 fi 280 if test "${OCTAVE_VERSION_MAJOR}" == "3" ; then 281 OCTAVE3=$OCTAVE 282 MKOCTFILE3=$MKOCTFILE 283 fi 284 if test "${OCTAVE_VERSION_MAJOR}" == "2" ; then 285 OCTAVE2=$OCTAVE 286 MKOCTFILE2=$MKOCTFILE 287 fi 288 fi 289 fi 290 291 # Check if octave2 was designated *in addition* to the installed version. 292 AC_ARG_WITH( 293 [octave2], 294 [AS_HELP_STRING([--with-octave2[=DIR]], 295 [location of octave compiler MKOCTFILE @<:@default=no@:>@])], 296 [with_octave2=$withval], 297 [with_octave2=no]) 298 299 if test "$with_octave2" != "no" ; then 300 AC_MSG_CHECKING([for octave and mkoctfile]) 301 AC_PATH_PROG(octave2, octave, [], [${with_octave2}/bin:${with_octave2}]) 302 AC_PATH_PROG(mkoctfile2, mkoctfile, [], 303 [${with_octave2}/bin:${with_octave2}]) 304 if test "x${octave2}" != "x" ; then 305 version=`${octave2} -v | grep version | cut -d' ' -f4` 306 version_major=`echo ${version} | cut -d'.' -f1` 307 if test "$version_major" = "2" ; then 308 OCTAVE2=$octave2 309 MKOCTFILE2=$mkoctfile2 310 fi 311 fi 312 fi 313 # Check if octave3 was designated *in addition* to the installed version. 314 AC_ARG_WITH( 315 [octave3], 316 [AS_HELP_STRING([--with-octave3[=DIR]], 317 [location of octave compiler MKOCTFILE @<:@default=no@:>@])], 318 [with_octave3=$withval], 319 [with_octave3=no]) 320 if test "$with_octave3" != "no" ; then 321 AC_MSG_CHECKING([for octave and mkoctfile]) 322 AC_PATH_PROG(octave3, octave, [], [${with_octave3}/bin:${with_octave3}]) 323 AC_PATH_PROG(mkoctfile3, mkoctfile, [], 324 [${with_octave3}/bin:${with_octave3}]) 325 if test "x${octave3}" != "x" ; then 326 version=`${octave3} -v | grep version | cut -d' ' -f4` 327 version_major=`echo ${version} | cut -d'.' -f1` 328 if test "$version_major" = "3" ; then 329 OCTAVE3=$with_octave3 330 MKOCTFILE3=$mkoctfile3 331 fi 332 fi 333 fi 334 335 AC_SUBST(OCTAVE2) 336 AC_SUBST(OCTAVE3) 277 337 AC_SUBST(OCTAVE) 278 338 AC_SUBST(OCTAVE_VERSION) 279 339 AC_SUBST(OCTAVE_VERSION_MAJOR) 280 340 AC_SUBST(MKOCTFILE) 281 282 AC_ARG_WITH( 283 [perl], 284 [AS_HELP_STRING([--with-perl[=DIR]], [location of perl @<:@default=yes@:>@])], 285 [], 286 [with_perl=yes]) 341 AC_SUBST(MKOCTFILE2) 342 AC_SUBST(MKOCTFILE3) 287 343 288 344 PERL=
Note: See TracChangeset
for help on using the changeset viewer.