Changeset b6b695f1884564441499b817246a1c0536c23225

Show
Ignore:
Timestamp:
05/21/08 19:48:11 (4 months ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1211392091 +0300
git-parent:

[c5e0f9db280c579c65845614fda229f5363d94d1]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1211392091 +0300
Message:

Remove internal Python build support

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Makefile.am

    rb26f5a2 rb6b695f  
    1010BASE_SUBDIRS = po src modules share doc test 
    1111EXTRA_SUBDIRS = m4 extras/package/ipkg \ 
    12     bindings/python \ 
    1312    libs/loader libs/srtp \ 
    1413    projects/mozilla projects/activex 
    …… 
    2827if BUILD_ACTIVEX 
    2928SUBDIRS += projects/activex 
    30 endif 
    31 if BUILD_PYTHON 
    32 SUBDIRS += bindings/python 
    3329endif 
    3430 

  • bindings/python/setup.py

    r84d0f81 rb6b695f  
    33 
    44# Get build variables (buildir, srcdir) 
    5 try: 
    6     top_builddir=os.environ['top_builddir'] 
    7 except KeyError: 
    8     # Note: do not initialize here, so that we get 
    9     # a correct default value if the env. var is 
    10     # defined but empty 
    11     top_builddir=None 
    12 if not top_builddir: 
    13     top_builddir = os.path.join( '..', '..' ) 
    14     os.environ['top_builddir'] = top_builddir 
     5top_builddir = os.path.join( '..', '..' ) 
     6os.environ['top_builddir'] = top_builddir 
    157 
    168# Determine the extra link args. Normally, vlc-config should take care 
    …… 
    3123 
    3224# For out-of-tree compilations 
    33 try: 
    34     srcdir=os.environ['srcdir'] 
    35 except KeyError: 
    36     # Note: same as above 
    37     srcdir=None 
    38 if not srcdir: 
    39     srcdir = '.' 
     25srcdir = '.' 
    4026 
    4127def get_vlcconfig(): 

  • configure.ac

    rc5e0f9d rb6b695f  
    2929    [enable_maintainer_mode="yes"]) 
    3030AM_MAINTAINER_MODE 
     31 
     32dnl 
     33dnl  Deprecated options 
     34dnl  to notify packagers that stuff has changed 
     35dnl 
     36AC_ARG_ENABLE(python-bindings, 
     37  [  --enable-python-bindings Always fails for historical reasons)],, 
     38  [enable_python_bindings="no"]) 
     39AS_IF([test "${enable_python_bindings}" != "no"], [ 
     40  AC_MSG_ERROR([Python bindings are now built from a separate source package]) 
     41]) 
     42 
     43AC_ARG_ENABLE(java-bindings, 
     44  [  --enable-java-bindings  Always fails for historical reasons],, 
     45  [enable_java_bindings="no"]) 
     46AS_IF([test "${enable_java_bindings}" != "no"], [ 
     47  AC_MSG_ERROR([Java bindings are now built from a separate source package]) 
     48]) 
    3149 
    3250dnl 
    …… 
    61476165 
    61486166dnl 
    6149 dnl  Mediacontrol Python bindings 
    6150 dnl 
    6151 AC_ARG_ENABLE(python-bindings, 
    6152   [  --enable-python-bindings Enable Python bindings (default disabled)]) 
    6153  
    6154 if test "${enable_python_bindings}" = "yes"; then 
    6155   AC_PATH_PROG(PYTHON_CONFIG, python-config, no) 
    6156   CFLAGS="${CFLAGS_save} `${PYTHON_CONFIG} --cflags`" 
    6157   AC_CHECK_HEADER([Python.h], 
    6158     PLUGINS_BINDINGS="${PLUGINS_BINDINGS} python", 
    6159     AC_MSG_ERROR([You have to install python-dev to build the bindings]), 
    6160     [] 
    6161   ) 
    6162   CFLAGS="${CFLAGS_save}" 
    6163 fi 
    6164 AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"]) 
    6165  
    6166 dnl 
    6167 dnl  Java bindings 
    6168 dnl 
    6169 AC_ARG_ENABLE(java-bindings, 
    6170   [  --enable-java-bindings  Always fail for historical reasons],, 
    6171   [enable_java_bindings="no"]) 
    6172 AS_IF([test "${enable_java_bindings}" != "no"], [ 
    6173   AC_MSG_ERROR([Java bindings are now built from a separate source package]) 
    6174 ]) 
    6175  
    6176 dnl 
    61776167dnl  test plugins 
    61786168dnl 
    …… 
    62486238    VLC_ADD_LDFLAGS([qte_main],[${LDFLAGS_qte} ${LDFLAGS_qt_video}]) 
    62496239fi 
    6250  
    62516240 
    62526241dnl