gnumeric r16272 - branches/gnumeric-1-8

[mortenw svn gnome org]

Author: mortenw
Date: Mon Jan 14 19:10:28 2008
New Revision: 16272
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16272&view=rev

Log:
2008-01-14  Morten Welinder  <terra gnome org>

	* configure.in (GNM_PY_LDFLAGS): Fix assumptions about directory
	layout.  [#509023]  [508988]



Modified:
   branches/gnumeric-1-8/ChangeLog
   branches/gnumeric-1-8/NEWS
   branches/gnumeric-1-8/configure.in

Modified: branches/gnumeric-1-8/NEWS
==============================================================================
--- branches/gnumeric-1-8/NEWS	(original)
+++ branches/gnumeric-1-8/NEWS	Mon Jan 14 19:10:28 2008
@@ -3,6 +3,7 @@
 
 Morten:
 	* Fix NPV doc problem.  [#506160]
+	* Fix python compilation problem.  [#509023]  [508988]
 
 --------------------------------------------------------------------------
 Gnumeric 1.8.0

Modified: branches/gnumeric-1-8/configure.in
==============================================================================
--- branches/gnumeric-1-8/configure.in	(original)
+++ branches/gnumeric-1-8/configure.in	Mon Jan 14 19:10:28 2008
@@ -926,7 +926,7 @@
 	if test "x$with_win32" = "xyes" ; then
 	    PY_INCLUDE_DIR="$PY_PREFIX/include"
 	else
-	    PY_INCLUDE_DIR="$PY_PREFIX/include/python$PY_VERSION"
+	    PY_INCLUDE_DIR=`$PYTHON -c 'import sys ; import distutils.sysconfig ; sys.stdout.write(distutils.sysconfig.get_python_inc())'`
 	fi
     fi
 
@@ -951,12 +951,12 @@
 	if test "x$with_win32" = "xyes" ; then
 	    PY_LIB_DIR="$PY_PREFIX/libs"
 	else
-	    PY_LIB_DIR="$PY_PREFIX/lib"
+	    PY_LIB_DIR=`$PYTHON -c 'import sys ; import distutils.sysconfig ; sys.stdout.write(distutils.sysconfig.get_config_var("LIBPL"))'`
 	fi
     fi
 
-    GNM_PY_CFLAGS="-I $PY_INCLUDE_DIR $PYGOBJECT_CFLAGS"
-    GNM_PY_LDFLAGS="-L $PY_LIB_DIR -lpython$PY_VERSION $PYGOBJECT_LDFLAGS"
+    GNM_PY_CFLAGS="-I$PY_INCLUDE_DIR $PYGOBJECT_CFLAGS"
+    GNM_PY_LDFLAGS="-L$PY_LIB_DIR -lpython$PY_VERSION $PYGOBJECT_LIBS"
     python_msg="yes (using $PYTHON)"
 fi
 AC_SUBST(GNM_PY_CFLAGS)