Changeset 833 for trunk/configure.in

Timestamp:

Dec 26, 2007, 5:19:28 PM (17 years ago)

Author:

dkearney

Message:

updated configure to allow user to compile with or without perl, python, octave, matlab
updated makefiles in examples dir to keep it quiet during compilation.

File:

• trunk/configure.in (modified) (7 diffs)

trunk/configure.in

@@ -1 @@
-AC_INIT(rappture, 1.1, rappture@nanohub.org)
+AC_INIT(Rappture Core and Bindings, 1.1, rappture@nanohub.org)
 
 VERSION=0.0.1
@@ -90 +90 @@
 MEXEXT=
 dnl if test "$enable_matlab" != "no" ; then
-    AC_MSG_CHECKING([for mex])
+if test "$with_matlab" != "no" ; then
+    AC_MSG_CHECKING([for matlab's mex])
     if test "$with_matlab" != "no" ; then
         dnl WITH_MATLAB = "yes"
         if test -x "$with_matlab/bin/mex"
         then
-            echo Found mex in $with_matlab/bin/mex
+            dnl # echo Found mex in $with_matlab/bin/mex
             MEX="$with_matlab/bin/mex"
         else
             if test -x "$with_matlab"
             then
-                echo Found mex in $with_matlab
+                dnl # echo Found mex in $with_matlab
                 MEX="$with_matlab"
             else
                 AC_PATH_PROG(MEX, mex)
             fi
+        fi
+        matlab_path=`dirname $MEX`/matlab
+        if test -x "$matlab_path"
+        then
+            MEX=${MEX}
+        else
+            MEX=
         fi
         AC_MSG_RESULT([${MEX}])
@@ -137 +145 @@
             AC_MSG_RESULT([${MEXEXT}])
         else
+            dnl we shouldn't bother the user if we dont find matlab
+            dnl just put out the message and don't compile matlab bindings
             echo "can't find the matlab compiler \"mex\""
             echo "use --with-matlab=DIR to specify the location of a matlab installation"
-            exit 1
-        fi
-    fi
-dnl fi
+            dnl # exit 1
+        fi
+    fi
+fi
 AC_SUBST(MEX)
 AC_SUBST(MEX_ARCH)
@@ -166 +176 @@
 MKOCTFILE=
 dnl if test "$enable_octave" != "no" ; then
+if test "$with_octave" != "no" ; then
     AC_MSG_CHECKING([for mkoctfile])
     if test "$with_octave" != "no" ; then
         if test -x "$with_octave/bin/mkoctfile"
         then
-            echo Found octave in $with_octave/bin/mkoctfile
+            dnl echo Found octave in $with_octave/bin/mkoctfile
             MKOCTFILE="$with_octave/bin/mkoctfile"
         else
@@ -179 +190 @@
             else
                 AC_PATH_PROG(MKOCTFILE, mkoctfile)
+                if test "x$MKOCTFILE" == "x" ; then
+                    dnl we shouldn't bother the user if we dont find mkoctfile
+                    dnl just put out the message and don't compile octave bindings
+                    echo "can't find the matlab compiler \"mkoctfile\""
+                    echo "use --with-octave=DIR to specify the location of a mkoctfile installation"
+                    dnl # exit 1
+                fi
             fi
         fi
     fi
     AC_MSG_RESULT([${MKOCTFILE}])
-dnl fi
+fi
 AC_SUBST(MKOCTFILE)
 
 
-dnl perl and python check borrowed from 
+dnl perl and python check borrowed from
 dnl http://www.opensource.apple.com/darwinsource/Current/libxslt-8.1/libxslt/configure.in
 dnl
@@ -211 +229 @@
 PERL_INCLUDES=
 PERL_SITE_PACKAGES=
-AC_MSG_CHECKING([for mkoctfile])
 if test "$with_perl" != "no" ; then
+    AC_MSG_CHECKING([for perl])
     if test -x "$with_perl/bin/perl"
     then
@@ -258 +276 @@
 
 if test "$with_python" != "no" ; then
+    AC_MSG_CHECKING([for python])
     if test -x "$with_python/bin/python"
     then