Changeset 708 for trunk/configure.in


Ignore:
Timestamp:
May 7, 2007 11:07:32 AM (14 years ago)
Author:
dkearney
Message:

updateing build system for rappture and language bindings.
librappture now includes a static version of libscew.
this means librappture needs to be linked directly against libexpat.
removed references to libscew from language bindings' makefiles.
corrected matlab and octave makefiles to only compile when dependencies are updated.
added --libdir flag so you can install platform dependent files into lib64 on 64-bit systems.
adjusted the rappture.env file to add lib64 directories to search paths incase they exist.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.in

    r634 r708  
    1414fi
    1515
    16 # AC_PROG_INSTALL
     16if test "${libdir}" != "${prefix}/lib"; then
     17    LIB_SEARCH_DIRS="-L ${prefix}/lib -L ${libdir}"
     18else
     19    LIB_SEARCH_DIRS="-L ${libdir}"
     20fi
     21
     22AC_PROG_INSTALL
    1723AC_PROG_MAKE_SET
    1824
     
    3743AC_ARG_WITH(matlab, [  --with-matlab[=DIR]         Build Matlab bindings if MEX compiler is found])
    3844AC_ARG_WITH(matlab_arch, [  --with-matlab-arch[=ARCH]         Build Matlab bindings for ARCH architecture])
     45AC_ARG_WITH(mexext, [  --with-mexext[=ARCH]         Suggest an extension for building mex files])
    3946dnl AC_CHECK_PROG(MEX, mex, mex, false)
    4047MEX=
    4148MEX_ARCH=
     49MEXEXT=
    4250if test "$with_matlab" != "no" ; then
    4351    dnl WITH_MATLAB = "yes"
    4452    if test -x "$with_matlab/bin/mex"
    4553    then
    46         echo Found matlab in $with_matlab/bin/mex
     54        echo Found mex in $with_matlab/bin/mex
    4755        MEX="$with_matlab/bin/mex"
    4856    else
     
    5563        fi
    5664    fi
     65    if test "x$MEX" != "x" ; then
     66        mexext_fxn=`dirname $MEX`/mexext
     67        if test "x$mexext_fxn" != "x"; then
     68            MEXEXT=`$mexext_fxn`
     69            if test "x${MEXEXT}" = "x" ; then
     70                MEXEXT="mexglx"
     71            fi
     72            echo Using extension $MEXEXT
     73        fi
     74    fi
    5775fi
    5876if test "x$with_matlab_arch" != "x" ; then
    5977    MEX_ARCH="-arch=$with_matlab_arch"
    6078fi
     79
    6180dnl AM_CONDITIONAL(WITH_MATLAB, test x$MEX != x)
    6281
     
    93112PERL=
    94113PERL_INCLUDES=
     114PERL_SITE_PACKAGES=
    95115if test "$with_perl" != "no" ; then
    96116    if test -x "$with_perl/bin/perl"
     
    107127        fi
    108128    fi
     129    PERL_SITE_PACKAGES='$(libdir)/perl5'
    109130fi
    110131dnl AM_CONDITIONAL(WITH_PERL, test x$PERL != x)
     
    131152            PYTHON="$with_python"
    132153        else
    133             AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
     154            AC_PATH_PROG(PYTHON, python python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
    134155        fi
    135156    fi
     
    180201AC_SUBST(MEX)
    181202AC_SUBST(MEX_ARCH)
     203AC_SUBST(MEXEXT)
    182204AC_SUBST(MKOCTFILE)
    183205AC_SUBST(PERL)
    184206AC_SUBST(PERL_INCLUDES)
     207AC_SUBST(PERL_SITE_PACKAGES)
    185208AC_SUBST(PYTHON)
    186209AC_SUBST(PYTHON_VERSION)
    187210AC_SUBST(PYTHON_INCLUDES)
    188211AC_SUBST(PYTHON_SITE_PACKAGES)
     212AC_SUBST(LIB_SEARCH_DIRS)
    189213
    190214AC_SUBST(VERSION)
Note: See TracChangeset for help on using the changeset viewer.