| 1 |
remi 08/05/09 17:09:34 |
| 2 |
|
| 3 |
Added: totem-2.22.2-fix-python-and-libtool-2.2.patch |
| 4 |
Log: |
| 5 |
media-video/totem: Add a patch for python detection (and libtool 2.2) and clean up the ebuild |
| 6 |
(Portage version: 2.1.5_rc7) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-video/totem/files/totem-2.22.2-fix-python-and-libtool-2.2.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/totem/files/totem-2.22.2-fix-python-and-libtool-2.2.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/totem/files/totem-2.22.2-fix-python-and-libtool-2.2.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: totem-2.22.2-fix-python-and-libtool-2.2.patch |
| 15 |
=================================================================== |
| 16 |
Index: configure.in |
| 17 |
=================================================================== |
| 18 |
--- configure.in (revision 5399) |
| 19 |
+++ configure.in (working copy) |
| 20 |
@@ -24,7 +24,10 @@ |
| 21 |
|
| 22 |
AC_PROG_CXX |
| 23 |
AM_PROG_CC_C_O |
| 24 |
-AC_PROG_LIBTOOL() |
| 25 |
+ |
| 26 |
+AC_PROG_LIBTOOL |
| 27 |
+m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) |
| 28 |
+ |
| 29 |
PKG_PROG_PKG_CONFIG |
| 30 |
|
| 31 |
AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal]) |
| 32 |
@@ -266,23 +269,14 @@ |
| 33 |
[enable_python=autodetect have_python=yes]) |
| 34 |
AC_MSG_RESULT([$enable_python]) |
| 35 |
|
| 36 |
-if test "x$have_python" != "xyes"; then |
| 37 |
- if test "x$enable_python" = "xyes"; then |
| 38 |
- AC_MSG_ERROR([Python not found]) |
| 39 |
- elif test "x$enable_python" = "xautodetect"; then |
| 40 |
- enable_python=no |
| 41 |
- AC_MSG_WARN([Python not found, disabling python support]) |
| 42 |
- fi |
| 43 |
-fi |
| 44 |
- |
| 45 |
-if test "x$have_python" != "xno"; then |
| 46 |
+if test "x$enable_python" != "xno"; then |
| 47 |
AM_PATH_PYTHON([2.3],[],[have_python=no]) |
| 48 |
if test "x$PYTHON" = "x:"; then |
| 49 |
have_python=no |
| 50 |
fi |
| 51 |
fi |
| 52 |
|
| 53 |
-if test "x$have_python" != "xno"; then |
| 54 |
+if test "x$enable_python" != "xno"; then |
| 55 |
PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'` |
| 56 |
PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'` |
| 57 |
PYTHON_LIBS="-lpython$PYTHON_VERSION" |
| 58 |
@@ -329,6 +323,15 @@ |
| 59 |
AC_MSG_RESULT([$result]) |
| 60 |
fi |
| 61 |
|
| 62 |
+if test "x$have_python" != "xyes"; then |
| 63 |
+ if test "x$enable_python" = "xyes"; then |
| 64 |
+ AC_MSG_ERROR([Python not found]) |
| 65 |
+ elif test "x$enable_python" = "xautodetect"; then |
| 66 |
+ enable_python=no |
| 67 |
+ AC_MSG_WARN([Python not found, disabling python support]) |
| 68 |
+ fi |
| 69 |
+fi |
| 70 |
+ |
| 71 |
if test "x$have_python" != "xno"; then |
| 72 |
PYGTK_REQUIRED=2.12.0 |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
-- |
| 78 |
gentoo-commits@l.g.o mailing list |
Archives