diff options
Diffstat (limited to 'libopensync-py-m4.patch')
| -rw-r--r-- | libopensync-py-m4.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/libopensync-py-m4.patch b/libopensync-py-m4.patch deleted file mode 100644 index 1fa699a..0000000 --- a/libopensync-py-m4.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- libopensync-0.19/acinclude.m4~ 2006-09-15 17:42:35.758740828 +0300 -+++ libopensync-0.19/acinclude.m4 2006-10-24 12:03:48.143737907 +0300 -@@ -1112,46 +1112,32 @@ - - # Check for Python include path - AC_MSG_CHECKING([for Python include path]) -- python_path=`echo $PYTHON | sed "s,/bin.*$,,"` -- for i in "$python_path/include/python$PYTHON_VERSION/" "$python_path/include/python/" "$python_path/" ; do -- python_path=`find $i -type f -name Python.h -print | sed "1q"` -- if test -n "$python_path" ; then -- break -- fi -- done -- python_path=`echo $python_path | sed "s,/Python.h$,,"` -- AC_MSG_RESULT([$python_path]) -- if test -z "$python_path" ; then -+ python_includes=`python-config --includes` -+ AC_MSG_RESULT([$python_includes]) -+ if test -z "$python_includes" ; then - AC_MSG_ERROR([cannot find Python include path]) - fi -- AC_SUBST([PYTHON_CPPFLAGS],[-I$python_path]) -+ AC_SUBST([PYTHON_CPPFLAGS],[-I$python_includes]) - - # Check for Python library path - AC_MSG_CHECKING([for Python library path]) -- python_path=`echo $PYTHON | sed "s,/bin.*$,,"` -- for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do -- python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"` -- if test -n "$python_path" ; then -- break -- fi -- done -- python_path=`echo $python_path | sed "s,/libpython.*$,,"` -- AC_MSG_RESULT([$python_path]) -- if test -z "$python_path" ; then -+ python_ldflags=`python-config --ldflags` -+ AC_MSG_RESULT([$python_ldflags]) -+ if test -z "$python_ldflags" ; then - AC_MSG_ERROR([cannot find Python library path]) - fi -- AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -lpython$PYTHON_VERSION"]) -- # -- python_site=`echo $python_path | sed "s/config/site-packages/"` -+ AC_SUBST([PYTHON_LDFLAGS],[$python_ldflags]) -+ -+ # unused here -+ python_site="" - AC_SUBST([PYTHON_SITE_PKG],[$python_site]) - # - # libraries which must be linked in when embedding - # - AC_MSG_CHECKING(python extra libraries) -- PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ -- conf = distutils.sysconfig.get_config_var; \ -- print conf('LOCALMODLIBS')+' '+conf('LIBS')" -- AC_MSG_RESULT($PYTHON_EXTRA_LIBS)` -+ # same as ldflags, but unused here -+ PYTHON_EXTRA_LIBS="$python_ldflags" -+ AC_MSG_RESULT($PYTHON_EXTRA_LIBS) - AC_SUBST(PYTHON_EXTRA_LIBS) - ]) - dnl as-ac-expand.m4 0.2.0 |