totem r5554 - trunk

[hadess svn gnome org]

Author: hadess
Date: Thu Aug 14 13:17:05 2008
New Revision: 5554
URL: http://svn.gnome.org/viewvc/totem?rev=5554&view=rev

Log:
2008-08-14  Bastien Nocera  <hadess hadess net>

	* configure.in: Support libtool 2.2, don't try to check for
	presence of Python through compiling against it, as libtool is
	required to compile against it, and libtool isn't available yet
	during configure
	Adapted from patches by RÃmi Cardona and Patryk Zawadzki
	(Closes: #532591)
	Also fix the message telling us whether Vala is enabled



Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Aug 14 13:17:05 2008
@@ -24,7 +24,9 @@
 
 AC_PROG_CXX
 AM_PROG_CC_C_O
-AC_PROG_LIBTOOL()
+AC_PROG_LIBTOOL
+m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+
 PKG_PROG_PKG_CONFIG
 
 AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal])
@@ -363,33 +365,6 @@
 	AC_SUBST([PYTHON_CFLAGS])
 	AC_SUBST([PYTHON_EXTRA_LIBS])
 
-	dnl FIXME: do we really need this test?
-	AC_MSG_CHECKING([whether we can build a shared library depending on libpython])
-	rm -rf testpython
-	mkdir testpython
-	cd testpython
-	cat > testpython.c <<EOF
-#include <Python.h>
-int testpython (void)
-{
-Py_Exit (0);
-}
-EOF
-
-	if /bin/sh ../libtool --mode=compile ${CC} $PYTHON_CFLAGS -c testpython.c >/dev/null 2>&1 && \
-		/bin/sh ../libtool --mode=link ${CC} -o testpython.la -rpath `pwd` -module -avoid-version $PYTHON_LIB_LOC testpython.lo $PYTHON_LIBS $PYTHON_EXTRA_LIBS >/dev/null 2>&1 && \
-		grep 'dlname.*testpython' testpython.la >/dev/null 2>&1; then
-		result=yes
-	else
-		result=no
-		have_python=no
-	fi
-	cd ..
-	rm -rf testpython
-	AC_MSG_RESULT([$result])
-fi
-
-if test "x$have_python" != "xno"; then
 	PYGTK_REQUIRED=2.12.0
 
 	PKG_CHECK_MODULES([PYGTK], [
@@ -925,7 +900,7 @@
 else
 	AC_MSG_NOTICE([   Python binding support disabled])
 fi
-if test x$enable_vala = xyes ; then
+if test x$with_vala = xyes ; then
 	AC_MSG_NOTICE([** Vala binding support enabled])
 else
 	AC_MSG_NOTICE([   Vala binding support disabled])