Changeset 563 for trunk

Timestamp:

Dec 17, 2006, 8:11:46 PM (18 years ago)

Author:

dkearney

Message:

small adjustments to gauge.tcl to fix errors in number and units recognition.
adjusted configure.in and makefiles to allow user to specify the architecture
they would like to use for compiling matlab bindings. also adjusted the main
makefile not to try to compile bindings for languages it cannot find on the system.

Location:

trunk

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (6 diffs)
• configure.in (modified) (3 diffs)
• gui/scripts/gauge.tcl (modified) (1 diff)
• src/matlab/Makefile.in (modified) (1 diff)

trunk/Makefile.in

@@ -70 +70 @@
 # matlab bindings
 build_matlab:
-        cd src/matlab; make clean; make RpMatlab; cd -
+        if test "x@MEX@" != "x" ; then \
+                cd src/matlab; make clean; make RpMatlab; cd -; \
+        fi
 
 install_matlab: build_matlab
-        cd src/matlab; make install; cd -
+        if test "x@MEX@" != "x" ; then \
+                cd src/matlab; make install; cd -; \
+        fi
 
 # octave bindings
 build_octave:
-        cd src/octave; make clean; make RpOctave; cd -
+        if test "x@MKOCTFILE@" != "x" ; then \
+                cd src/octave; make clean; make RpOctave; cd -; \
+        fi
 
 install_octave: build_octave
-        cd src/octave; make install; cd -
+        if test "x@MKOCTFILE@" != "x" ; then \
+                cd src/octave; make install; cd -; \
+        fi
 
 build_python:
-        set -x;
-        cd python; \
-        @PYTHON@ setup.py \
-                build_ext \
-                --library-dirs=@prefix@/lib \
-                --include-dirs=@prefix@/include \
-                build
+        if test "x@PYTHON@" != "x" ; then \
+                set -x; \
+                cd python; \
+                @PYTHON@ setup.py \
+                        build_ext \
+                        --library-dirs=@prefix@/lib \
+                        --include-dirs=@prefix@/include \
+                        build; \
+        fi
 
 install_python: build_python
-        set -x;
-        cd python; \
-        @PYTHON@ setup.py install --prefix=@prefix@
+        if test "x@PYTHON@" != "x" ; then \
+                set -x; \
+                cd python; \
+                @PYTHON@ setup.py install --prefix=@prefix@; \
+        fi
 
 build_perl:
-        set -x;
-        cd perl; \
-        @PERL@ Makefile.PL INSTALLSITELIB=@prefix@/lib/perl5 INSTALLSITEMAN3DIR=@prefix@/man/man3; \
-        make; make test;
+        if test "x@PERL@" != "x" ; then \
+                set -x; \
+                cd perl; \
+                @PERL@ Makefile.PL INSTALLSITELIB=@prefix@/lib/perl5 INSTALLSITEMAN3DIR=@prefix@/man/man3; \
+                make; make test; \
+        fi
 
 install_perl: build_perl
-        set -x;
-        cd perl; make install;
+        if test "x@PERL@" != "x" ; then \
+                set -x; \
+                cd perl; make install; \
+        fi
 
 build_pkgs:

trunk/configure

@@ -675 +675 @@
 PYTHON
 pythondir
+MEX_ARCH
 PERL_INCLUDES
 PYTHON_VERSION
@@ -1272 +1273 @@
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-matlab=DIR         Build Matlab bindings if MEX compiler is found
+  --with-matlab-arch=ARCH         Build Matlab bindings for ARCH architecture
   --with-octave=DIR         Build Octave bindings if MKOCTFILE compiler is found
   --with-perl=DIR         Build Perl bindings if found
@@ -4949 +4951 @@
 fi
 
+
+# Check whether --with-matlab_arch was given.
+if test "${with_matlab_arch+set}" = set; then
+  withval=$with_matlab_arch;
+fi
+
 MEX=
+MEX_ARCH=
 if test "$with_matlab" != "no" ; then
         if test -x "$with_matlab/bin/mex"
@@ -5003 +5012 @@
         fi
     fi
+fi
+if test "x$with_matlab_arch" != "x" ; then
+    MEX_ARCH="-arch=$with_matlab_arch"
 fi
 
@@ -5992 +6004 @@
 PYTHON!$PYTHON$ac_delim
 pythondir!$pythondir$ac_delim
+MEX_ARCH!$MEX_ARCH$ac_delim
 PERL_INCLUDES!$PERL_INCLUDES$ac_delim
 PYTHON_VERSION!$PYTHON_VERSION$ac_delim
@@ -6003 +6016 @@
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 69; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then
     break
   elif $ac_last_try; then

trunk/configure.in

@@ -36 +36 @@
 
 AC_ARG_WITH(matlab, [  --with-matlab[=DIR]         Build Matlab bindings if MEX compiler is found])
+AC_ARG_WITH(matlab_arch, [  --with-matlab-arch[=ARCH]         Build Matlab bindings for ARCH architecture])
 dnl AC_CHECK_PROG(MEX, mex, mex, false)
 MEX=
+MEX_ARCH=
 if test "$with_matlab" != "no" ; then
     dnl WITH_MATLAB = "yes"
@@ -54 +56 @@
     fi
 fi
+if test "x$with_matlab_arch" != "x" ; then
+    MEX_ARCH="-arch=$with_matlab_arch"
+fi
+dnl AC_CHECK_PROG(MEX, mex, mex, false)
 dnl AM_CONDITIONAL(WITH_MATLAB, test x$MEX != x)
 
@@ -170 +176 @@
 dnl AM_CONDITIONAL(WITH_PYTHON, test x$PYTHON != x)
 
-dnl AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
-dnl if test "$PYTHON_INCLUDES" != ""
-dnl then
-dnl     PYTHON_SUBDIR=python
-dnl else
-dnl     PYTHON_SUBDIR=
-dnl fi
-
 AC_SUBST(pythondir)
 dnl AC_SUBST(PYTHON_SUBDIR)
 
 AC_SUBST(MEX)
+AC_SUBST(MEX_ARCH)
 AC_SUBST(MKOCTFILE)
 AC_SUBST(PERL)

trunk/gui/scripts/gauge.tcl

@@ -218 +218 @@
         set newval [set nv [lindex $args 0]]
         set units $itk_option(-units)
-        if {$units != ""} {
-            set nvUnits [Rappture::Units::Search::for $nv]
+        if {"" != $units} {
+            set newval [Rappture::Units::convert $newval \
+                -context $units]
+            set nvUnits [Rappture::Units::Search::for $newval]
             if { "" == $nvUnits} {
                 set msg [Rappture::Units::description $units]
-                error "Unrecognized units: $nv\n$mesg"
-            }
-            set newval [Rappture::Units::convert $newval \
-                -context $units]
+                error "Unrecognized units: $newval\nEnter value with units $msg"
+            }
             set nv [Rappture::Units::convert $nv \
                 -context $units -to $units -units off]

trunk/src/matlab/Makefile.in

@@ -14 +14 @@
 # define our compiling environment
 #
-MEX             = @MEX@
+MEX             = @MEX@ @MEX_ARCH@
 
 # define our directories