SOURCES: libopensync-py-m4.patch - fixed display

glen glen at pld-linux.org
Fri Sep 15 16:44:32 CEST 2006


Author: glen                         Date: Fri Sep 15 14:44:32 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed display

---- Files affected:
SOURCES:
   libopensync-py-m4.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/libopensync-py-m4.patch
diff -u SOURCES/libopensync-py-m4.patch:1.2 SOURCES/libopensync-py-m4.patch:1.3
--- SOURCES/libopensync-py-m4.patch:1.2	Fri Sep 15 16:38:57 2006
+++ SOURCES/libopensync-py-m4.patch	Fri Sep 15 16:44:27 2006
@@ -1,6 +1,7 @@
---- libopensync-0.18/acinclude.m4	2006-09-15 17:31:19.643489125 +0300
-+++ libopensync-0.18/acinclude.m4	2006-09-15 17:36:47.410884025 +0300
-@@ -1109,44 +1109,29 @@
+--- libopensync-0.18/acinclude.m4~	2006-09-15 17:42:35.758740828 +0300
++++ libopensync-0.18/acinclude.m4	2006-09-15 17:42:39.048815023 +0300
+@@ -1108,45 +1108,32 @@
+ 
  	# Check for Python include path
  	AC_MSG_CHECKING([for Python include path])
 -	python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
@@ -18,11 +19,11 @@
 +	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])
+ 	AC_SUBST([PYTHON_CPPFLAGS],[-I$python_path])
  
  	# Check for Python library path
--	AC_MSG_CHECKING([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"`
@@ -49,13 +50,13 @@
  	#
  	# libraries which must be linked in when embedding
  	#
-+	# same as ldflags, but unused here
  	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)`
-+	PYTHON_EXTRA_LIBS=$python_ldflags
++	# same as ldflags, but unused here
++	PYTHON_EXTRA_LIBS="$python_ldflags"
 +	AC_MSG_RESULT($PYTHON_EXTRA_LIBS)
  	AC_SUBST(PYTHON_EXTRA_LIBS)
  ])
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/libopensync-py-m4.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list