Changeset 1057
 Timestamp:
 Jun 23, 2008, 1:49:38 PM (16 years ago)
 Location:
 trunk
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

trunk/configure
r1055 r1057 8577 8577 MEXEXT="" 8578 8578 if test "$with_matlab" != "no" ; then 8579 8579 { $as_echo "$as_me:$LINENO: checking for MATLAB MEX compiler" >&5 8580 8580 $as_echo_n "checking for MATLAB MEX compiler... " >&6; } 8581 if test "$with_matlab" != "no" ; then 8582 if test x "$with_matlab/bin/mex" 8583 then 8584 MEX="$with_matlab/bin/mex" 8585 else 8586 if test x "$with_matlab" 8587 then 8588 MEX="$with_matlab" 8589 else 8590 # Extract the first word of "mex", so it can be a program name with args. 8581 if test "$with_matlab" = "yes" ; then 8582 # Extract the first word of "mex", so it can be a program name with args. 8591 8583 set dummy mex; ac_word=$2 8592 8584 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 … … 8628 8620 8629 8621 8630 fi 8631 fi 8632 matlab_path=`dirname $MEX`/matlab 8633 if test x "$matlab_path" 8634 then 8635 MEX=${MEX} 8636 else 8637 MEX= 8638 fi 8639 { $as_echo "$as_me:$LINENO: result: ${MEX}" >&5 8622 else 8623 for i in "${with_matlab}/bin/mex" "${with_matlab}" ; do 8624 if test x "$i" ; then 8625 MEX="$i"; break 8626 fi 8627 if test "x${MEX}" = "x" ; then 8628 { { $as_echo "$as_me:$LINENO: error: cannot find mex in $with_matlab" >&5 8629 $as_echo "$as_me: error: cannot find mex in $with_matlab" >&2;} 8630 { (exit 1); exit 1; }; } 8631 fi 8632 done 8633 fi 8634 { $as_echo "$as_me:$LINENO: result: ${MEX}" >&5 8640 8635 $as_echo "${MEX}" >&6; } 8641 if test "$with_matlab_arch" = "check" ; then 8642 with_matlab_arch="" 8643 fi 8644 if test "x$with_matlab_arch" != "x" ; then 8645 echo "using matlab architecture \"$with_matlab_arch\"" 8646 MEX_ARCH="arch=$with_matlab_arch" 8647 fi 8648 if test "x$MEX" != "x" ; then 8649 mexext_fxn=`dirname $MEX`/mexext 8650 if test x "$mexext_fxn" ; then 8651 MEXEXT=`$mexext_fxn` 8652 if test "x${MEXEXT}" = "x" ; then 8653 if test "$with_mexext" != "check" ; then 8654 MEXEXT="mexglx" 8655 fi 8656 fi 8657 else 8658 if test "$with_mexext" != "check" ; then 8659 MEXEXT="mexglx" 8660 fi 8661 fi 8662 echo "Using mex file extension \"$MEXEXT\"" 8663 { $as_echo "$as_me:$LINENO: result: ${MEXEXT}" >&5 8664 $as_echo "${MEXEXT}" >&6; } 8665 else 8666 echo "can't find the matlab compiler \"mex\"" 8667 echo "use withmatlab=DIR to specify the location of a matlab installation" 8668 fi 8669 fi 8670 fi 8671 8636 fi 8672 8637 8673 8638 … … 8686 8651 MKOCTFILE= 8687 8652 if test "$with_octave" != "no" ; then 8688 8653 { $as_echo "$as_me:$LINENO: checking for mkoctfile" >&5 8689 8654 $as_echo_n "checking for mkoctfile... " >&6; } 8690 if test "$with_octave" != "no" ; then 8691 if test x "$with_octave/bin/mkoctfile" 8692 then 8693 MKOCTFILE="$with_octave/bin/mkoctfile" 8694 else 8695 if test x "$with_octave" 8696 then 8697 echo Found mkoctfile in $with_octave 8698 MKOCTFILE="$with_octave" 8699 else 8700 # Extract the first word of "mkoctfile", so it can be a program name with args. 8655 if test "$with_octave" = "yes" ; then 8656 # Extract the first word of "mkoctfile", so it can be a program name with args. 8701 8657 set dummy mkoctfile; ac_word=$2 8702 8658 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 … … 8738 8694 8739 8695 8740 if test "x$MKOCTFILE" == "x" ; then 8741 echo "can't find the matlab compiler \"mkoctfile\"" 8742 echo "use withoctave=DIR to specify the location of a mkoctfile installation" 8743 fi 8744 fi 8745 fi 8746 fi 8747 { $as_echo "$as_me:$LINENO: result: ${MKOCTFILE}" >&5 8696 else 8697 for i in "${with_octave}/bin/mkoctfile" "${with_octave}" ; do 8698 if test x "$i" ; then 8699 MEX="$i"; break 8700 fi 8701 if test "x${MEX}" = "x" ; then 8702 { { $as_echo "$as_me:$LINENO: error: cannot find mkoctfile in $with_octave" >&5 8703 $as_echo "$as_me: error: cannot find mkoctfile in $with_octave" >&2;} 8704 { (exit 1); exit 1; }; } 8705 fi 8706 done 8707 fi 8708 { $as_echo "$as_me:$LINENO: result: ${MKOCTFILE}" >&5 8748 8709 $as_echo "${MKOCTFILE}" >&6; } 8749 8710 fi 
trunk/configure.in
r1055 r1057 132 132 MEX_ARCH="" 133 133 MEXEXT="" 134 dnl if test "$enable_matlab" != "no" ; then135 134 if test "$with_matlab" != "no" ; then 136 AC_MSG_CHECKING([for MATLAB MEX compiler]) 137 if test "$with_matlab" != "no" ; then 138 dnl WITH_MATLAB = "yes" 139 if test x "$with_matlab/bin/mex" 140 then 141 dnl # echo Found mex in $with_matlab/bin/mex 142 MEX="$with_matlab/bin/mex" 143 else 144 if test x "$with_matlab" 145 then 146 dnl # echo Found mex in $with_matlab 147 MEX="$with_matlab" 148 else 149 AC_PATH_PROG(MEX, mex) 150 fi 151 fi 152 matlab_path=`dirname $MEX`/matlab 153 if test x "$matlab_path" 154 then 155 MEX=${MEX} 156 else 157 MEX= 158 fi 159 AC_MSG_RESULT([${MEX}]) 160 if test "$with_matlab_arch" = "check" ; then 161 dnl still need to write the code to check the arch type 162 with_matlab_arch="" 163 fi 164 if test "x$with_matlab_arch" != "x" ; then 165 echo "using matlab architecture \"$with_matlab_arch\"" 166 MEX_ARCH="arch=$with_matlab_arch" 167 dnl else 168 dnl # if $with_matlab_arch is blank, get the os name from uname 169 fi 170 if test "x$MEX" != "x" ; then 171 mexext_fxn=`dirname $MEX`/mexext 172 if test x "$mexext_fxn" ; then 173 MEXEXT=`$mexext_fxn` 174 if test "x${MEXEXT}" = "x" ; then 175 dnl not even mexext can figure out what extension to use.... 176 dnl # we should be doing an os type check instead of default mexglx 177 dnl # use $with_matlab_arch 178 if test "$with_mexext" != "check" ; then 179 MEXEXT="mexglx" 180 fi 181 fi 182 else 183 if test "$with_mexext" != "check" ; then 184 MEXEXT="mexglx" 185 fi 186 fi 187 echo "Using mex file extension \"$MEXEXT\"" 188 AC_MSG_RESULT([${MEXEXT}]) 189 else 190 dnl we shouldn't bother the user if we dont find matlab 191 dnl just put out the message and don't compile matlab bindings 192 echo "can't find the matlab compiler \"mex\"" 193 echo "use withmatlab=DIR to specify the location of a matlab installation" 194 dnl # exit 1 195 fi 196 fi 197 fi 135 AC_MSG_CHECKING([for MATLAB MEX compiler]) 136 if test "$with_matlab" = "yes" ; then 137 AC_PATH_PROG(MEX, mex) 138 else 139 for i in "${with_matlab}/bin/mex" "${with_matlab}" ; do 140 if test x "$i" ; then 141 MEX="$i"; break 142 fi 143 if test "x${MEX}" = "x" ; then 144 AC_ERROR([cannot find mex in $with_matlab]) 145 fi 146 done 147 fi 148 AC_MSG_RESULT([${MEX}]) 149 fi 150 198 151 AC_SUBST(MEX) 199 152 AC_SUBST(MEX_ARCH) 200 153 AC_SUBST(MEXEXT) 201 154 202 dnl AC_ARG_ENABLE(203 dnl [octave],204 dnl [AS_HELP_STRING([enableoctave], [build octave bindings @<:@default=check@:>@])],205 dnl [],206 dnl [enable_octave=check])207 dnl BUILD_OCTAVE=yes208 dnl AC_SUBST(BUILD_OCTAVE)209 210 211 155 AC_ARG_WITH( 212 156 [octave], … … 217 161 218 162 MKOCTFILE= 219 dnl if test "$enable_octave" != "no" ; then220 163 if test "$with_octave" != "no" ; then 221 AC_MSG_CHECKING([for mkoctfile]) 222 if test "$with_octave" != "no" ; then 223 if test x "$with_octave/bin/mkoctfile" 224 then 225 dnl echo Found octave in $with_octave/bin/mkoctfile 226 MKOCTFILE="$with_octave/bin/mkoctfile" 227 else 228 if test x "$with_octave" 229 then 230 echo Found mkoctfile in $with_octave 231 MKOCTFILE="$with_octave" 232 else 233 AC_PATH_PROG(MKOCTFILE, mkoctfile) 234 if test "x$MKOCTFILE" == "x" ; then 235 dnl we shouldn't bother the user if we dont find mkoctfile 236 dnl just put out the message and don't compile octave bindings 237 echo "can't find the matlab compiler \"mkoctfile\"" 238 echo "use withoctave=DIR to specify the location of a mkoctfile installation" 239 dnl # exit 1 240 fi 241 fi 242 fi 243 fi 244 AC_MSG_RESULT([${MKOCTFILE}]) 164 AC_MSG_CHECKING([for mkoctfile]) 165 if test "$with_octave" = "yes" ; then 166 AC_PATH_PROG(MKOCTFILE, mkoctfile) 167 else 168 for i in "${with_octave}/bin/mkoctfile" "${with_octave}" ; do 169 if test x "$i" ; then 170 MEX="$i"; break 171 fi 172 if test "x${MEX}" = "x" ; then 173 AC_ERROR([cannot find mkoctfile in $with_octave]) 174 fi 175 done 176 fi 177 AC_MSG_RESULT([${MKOCTFILE}]) 245 178 fi 246 179 AC_SUBST(MKOCTFILE)
Note: See TracChangeset
for help on using the changeset viewer.