Changeset 1088

Show
Ignore:
Timestamp:
11/06/06 11:27:42
Author:
pvanhoof
Message:

Moved some functionality of the build system to macro files

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/configure.ac

    r1024 r1088  
    302302dnl ### tinymail-python, the python language bindings ## 
    303303if test x$build_pytinymail = xtrue; then 
    304   AM_PATH_PYTHON(2.3) 
    305   AC_PATH_PROG(PYTHON, python, no) 
    306   if test x$PYTHON = xno; then 
    307        AC_MSG_ERROR(Please install python) 
    308   fi 
    309   PYGTK_CODEGENDIR="`$PKG_CONFIG --variable=codegendir pygtk-2.0`" 
    310  
    311   changequote(<<, >>)dnl 
    312   PY_VER=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_vars("VERSION")[0];'` 
    313   PY_LIB=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1);'` 
    314   PY_INC=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_vars("INCLUDEPY")[0];'` 
    315   PY_PREFIX=`$PYTHON -c 'import sys; print sys.prefix'` 
    316   PY_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix'` 
    317   changequote([, ])dnl 
    318   if test -f $PY_INC/Python.h; then 
    319     PYTHON_LIBS="-L$PY_LIB/config -lpython$PY_VER -lpthread -lutil" 
    320     PYTHON_CFLAGS="-I$PY_INC" 
    321   else 
    322     AC_MSG_ERROR([Can't find Python.h]) 
    323   fi 
    324  
    325   AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no) 
    326   if test "x$PYGTK_CODEGEN" = xno; then 
    327         AC_MSG_ERROR(could not find pygtk-codegen-2.0 script) 
    328   fi 
    329   AC_MSG_CHECKING(for pygtk defs) 
    330   PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` 
    331    
    332   AC_SUBST(PYGTK_DEFSDIR) 
    333   AC_MSG_RESULT($PYGTK_DEFSDIR) 
    334  
    335   PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= 2.8) 
    336   PKG_CHECK_MODULES(TINYMAIL_PYTHON, pygobject-2.0 pygtk-2.0) 
    337   TINYMAIL_PYTHON_CFLAGS="$TINYMAIL_PYTHON_CFLAGS $PYTHON_CFLAGS" 
    338   TINYMAIL_PYTHON_LIBS="$TINYMAIL_PYTHON_LIBS $PYTHON_LIBS" 
     304  AC_TNY_PYTHON_BINDING_CHECK 
    339305else 
    340306  TINYMAIL_PYTHON_CFLAGS= 
  • trunk/libtinymail-camel/camel-lite/configure.ac

    r1081 r1088  
    244244fi 
    245245 
     246AC_SUBST(msg_smime) 
     247AC_SUBST(msg_ssl) 
    246248AC_SUBST(SSL_LIBS) 
    247249AC_MSG_CHECKING(Support for SSL)