Changeset 1059 for trunk


Ignore:
Timestamp:
Jun 23, 2008 8:25:29 PM (16 years ago)
Author:
gah
Message:
 
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure

    r1058 r1059  
    18821882
    18831883
    1884 set -e
    1885 
    18861884#------------------------------------------------------------------------
    18871885# Handle the --prefix=... option
    … …  
    85698567MEXEXT=""
    85708568if test "$with_matlab" != "no" ; then
    8571   { $as_echo "$as_me:$LINENO: checking for MATLAB MEX compiler" >&5
    8572 $as_echo_n "checking for MATLAB MEX compiler... " >&6; }
    85738569  if test "$with_matlab" = "yes" ; then
    85748570    # Extract the first word of "mex", so it can be a program name with args.
    … …  
    86138609
    86148610  else
     8611    { $as_echo "$as_me:$LINENO: checking for matlab mex compiler" >&5
     8612$as_echo_n "checking for matlab mex compiler... " >&6; }
    86158613    for i in "${with_matlab}/bin/mex" "${with_matlab}" ; do
    86168614      if test -x "$i" ; then
    … …  
    86238621      fi
    86248622    done
     8623    { $as_echo "$as_me:$LINENO: result: ${MEX}" >&5
     8624$as_echo "${MEX}" >&6; }
    86258625  fi
    8626   { $as_echo "$as_me:$LINENO: result: ${MEX}" >&5
    8627 $as_echo "${MEX}" >&6; }
    86288626fi
    86298627
    … …  
    86438641MKOCTFILE=
    86448642if test "$with_octave" != "no" ; then
    8645   { $as_echo "$as_me:$LINENO: checking for mkoctfile" >&5
    8646 $as_echo_n "checking for mkoctfile... " >&6; }
    86478643  if test "$with_octave" = "yes" ; then
    86488644    # Extract the first word of "mkoctfile", so it can be a program name with args.
    … …  
    86878683
    86888684  else
     8685    { $as_echo "$as_me:$LINENO: checking for mkoctfile" >&5
     8686$as_echo_n "checking for mkoctfile... " >&6; }
    86898687    for i in "${with_octave}/bin/mkoctfile" "${with_octave}" ; do
    86908688      if test -x "$i" ; then
    … …  
    86978695      fi
    86988696    done
     8697    { $as_echo "$as_me:$LINENO: result: ${MKOCTFILE}" >&5
     8698$as_echo "${MKOCTFILE}" >&6; }
    86998699  fi
    8700   { $as_echo "$as_me:$LINENO: result: ${MKOCTFILE}" >&5
    8701 $as_echo "${MKOCTFILE}" >&6; }
    87028700fi
    87038701

  • trunk/configure.in

    r1058 r1059  
    11AC_INIT([Rappture], [1.1], [rappture@nanohub.org])
    2 
    3 set -e
    42
    53#------------------------------------------------------------------------
    … …  
    124122MEXEXT=""
    125123if test "$with_matlab" != "no" ; then
    126   AC_MSG_CHECKING([for MATLAB MEX compiler])
    127124  if test "$with_matlab" = "yes" ; then
    128125    AC_PATH_PROG(MEX, mex)
    129126  else
     127    AC_MSG_CHECKING([for matlab mex compiler])
    130128    for i in "${with_matlab}/bin/mex" "${with_matlab}" ; do
    131129      if test -x "$i" ; then
    … …  
    136134      fi
    137135    done
    138   fi
    139   AC_MSG_RESULT([${MEX}])
     136    AC_MSG_RESULT([${MEX}])
     137  fi
    140138fi
    141139
    … …  
    153151MKOCTFILE=
    154152if test "$with_octave" != "no" ; then
    155   AC_MSG_CHECKING([for mkoctfile])
    156153  if test "$with_octave" = "yes" ; then
    157154    AC_PATH_PROG(MKOCTFILE, mkoctfile)
    158155  else
     156    AC_MSG_CHECKING([for mkoctfile])
    159157    for i in "${with_octave}/bin/mkoctfile" "${with_octave}" ; do
    160158      if test -x "$i" ; then
    … …  
    165163      fi
    166164    done
    167   fi
    168   AC_MSG_RESULT([${MKOCTFILE}])
     165    AC_MSG_RESULT([${MKOCTFILE}])
     166  fi
    169167fi
    170168AC_SUBST(MKOCTFILE)

  • trunk/examples/Makefile.in

    r1055 r1059  
    1010destdir         = $(prefix)/examples/3D
    1111
     12SHELL           = @SHELL@
    1213INSTALL         = @INSTALL@
    13 INSTALL_DATA    = @INSTALL_DATA@
    1414
    1515destdir         = $(prefix)/examples
    … …  
    3232
    3333build:
    34         for i in $(SUBDIRS); do \
     34        for i in $(SUBDIRS) ; do \
    3535            $(MAKE) -C $$i all || exit 1 ; \
    3636        done

  • trunk/lang/Makefile.in

    r1055 r1059  
    1111INSTALL         = @INSTALL@
    1212
    13 F77 =           @F77@
    14 CC =            @CC@
    15 CXX =           @CXX@
    16 RUBY =          @RUBY@
    17 PERL =          @PERL@
    18 TCLSH =         @TCLSH@
    19 PYTHON_DISTUTILS =      @PYTHON_DISTUTILS@
    20 PYTHON =        @PYTHON@
    21 MEX =           @MEX@
    22 MKOCTFILE =     @MKOCTFILE@
     13SHELL           = @SHELL@
     14F77             = @F77@
     15CC              = @CC@
     16CXX             = @CXX@
     17RUBY            = @RUBY@
     18PERL            = @PERL@
     19TCLSH           = @TCLSH@
     20PYTHON_DISTUTILS= @PYTHON_DISTUTILS@
     21PYTHON          = @PYTHON@
     22MEX             = @MEX@
     23MKOCTFILE       = @MKOCTFILE@
    2324
    24 # Rappture requires we always build a Tcl language API.
     25# Rappture requires it. We always build a Tcl language API.
    2526LANGS = tcl
    2627

  • trunk/src/core/Makefile.in

    r1055 r1059  
    1414
    1515CXX             = @CXX@
    16 CC              = @CC@
     16# This hack is because the tcl.m4 file generates the line
     17# SHLIB_LD = ${CC} ...
     18# We need to link with g++ on MacOS 10.4
     19CC              = $(CXX)
     20CCC             = @CC@
    1721CFLAGS_DEBUG    = @CFLAGS_DEBUG@ -Wall
    1822CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
    … …  
    167171        $(CXX) $(CXX_SWITCHES) -c $?
    168172.c.o:
    169         $(CC) $(CC_SWITCHES)-c $?
     173        $(CCC) $(CC_SWITCHES)-c $?
    170174
    171175clean:
Note: See TracChangeset for help on using the changeset viewer.