From 3ba73731337d58b107045b7c7c62bed728a082db Mon Sep 17 00:00:00 2001
From: Bruno Coudoin <bcoudoin@src.gnome.org>
Date: Tue, 24 Oct 2006 19:26:20 +0000
Subject: 	=== WARNING THIS PATCH SET HAS BEEN REVERTED ===

	autotools croos compilation with mingw32
	use glib headers instead of glibc (g_mkdir, g_unlink, g_stat)
	NEED MORE WORK. cvs maybe broken now.

	* Makefile.am:
	* acinclude.m4:
	* configure.in:
	* cross-configure.sh: script to run configure. Look variables.
	* po/Makefile.in.in:
	* src/boards/Makefile.am:
	* src/boards/gtans.c:
	* src/boards/gtans_support.c: (check_file_exists):
	* src/boards/py-mod-gcompris.c: (py_gcompris_child_watch_add),
	(py_gcompris_spawn_async):
	* src/gcompris/Makefile.am:
	* src/gcompris/binreloc.c: (_br_find_exe):
	* src/gcompris/board.c:
	* src/gcompris/board.h:
	* src/gcompris/file_selector.c: (parse_doc):
	* src/gcompris/gameutil.c: (gc_util_create_rootdir):
	* src/gcompris/gcompris.c: (activation_done), (gc_init):
	* src/gcompris/gcompris_db.c: (gc_db_init):
	* src/gcompris/images_selector.c: (parse_doc):
	* src/gcompris/menu.c: (gc_menu_load):
	* src/gcompris/properties.c: (gc_prop_new):
	* src/gcompris/sdlplayer.c: (errorv):
	* src/gcompris/soundutil.c:
---
(limited to 'acinclude.m4')

diff --git a/acinclude.m4 b/acinclude.m4
index 9ea0a8e..a351e4d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -43,25 +43,18 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
 [AC_REQUIRE([AM_PATH_PYTHON])
 AC_MSG_CHECKING(for headers required to compile python extensions)
 dnl deduce PYTHON_CFLAGS
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_CFLAGS="-I${py_prefix}/include/python${PYTHON_VERSION}"
 
-if test  "x$PYTHON_CFLAGS" = "x"  ; then
-   py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-   py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+python_link=`$PYTHON -c "import distutils.sysconfig ; print distutils.sysconfig.get_config_var(\"LIBRARY\")" | sed -e "s%lib\(.*\)\.[[a-zA-Z]]*$%-l\1%"`
 
-   PYTHON_CFLAGS="-I${py_prefix}/include/python${PYTHON_VERSION}"
+python_libdir=`$PYTHON -c "import distutils.sysconfig ; print distutils.sysconfig.get_config_var(\"LIBDIR\")"`
 
+PYTHON_LIBS="-L${python_libdir} ${python_link}"
 
-   if test "$py_prefix" != "$py_exec_prefix"; then
-      PYTHON_CFLAGS="$PYTHON_CFLAGS -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-   fi
-fi
-
-if test  "x$PYTHON_LIBS" = "x" ; then
-   python_link=`$PYTHON -c "import distutils.sysconfig ; print distutils.sysconfig.get_config_var(\"LIBRARY\")" | sed -e "s%lib\(.*\)\.[[a-zA-Z]]*$%-l\1%"`
-
-   python_libdir=`$PYTHON -c "import distutils.sysconfig ; print distutils.sysconfig.get_config_var(\"LIBDIR\")"`
-
-   PYTHON_LIBS="-L${python_libdir} ${python_link}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+  PYTHON_CFLAGS="$PYTHON_CFLAGS -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
 fi
 
 AC_SUBST(PYTHON_CFLAGS)
--
cgit v0.9.1