[Phission-cvs] phission/m4 ac_ph_python_devel.m4,1.4,1.5
Brought to you by:
pthoren
From: Philip T. <pt...@us...> - 2005-06-30 19:00:41
|
Update of /cvsroot/phission/phission/m4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21803/m4 Modified Files: ac_ph_python_devel.m4 Log Message: Kareem came to me because he was having problems installing Phission. Found a few problems with the python checking that created bad variable values that messed up the compilation. Fixed those problems and python checking won't occur and all variables will be reset when any of the python stuff fails. Index: ac_ph_python_devel.m4 =================================================================== RCS file: /cvsroot/phission/phission/m4/ac_ph_python_devel.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ac_ph_python_devel.m4 22 Mar 2005 18:19:21 -0000 1.4 --- ac_ph_python_devel.m4 30 Jun 2005 19:00:31 -0000 1.5 *************** *** 44,48 **** $1 fi ! AC_SUBST([PYTHON_CXXFLAGS],[-I$inc_python_path]) dnl ------------------------------------------------------------------ --- 44,52 ---- $1 fi ! ! if test -n "$inc_python_path"; then ! PYTHON_CXXFLAGS="-I$inc_python_path" ! fi ! AC_SUBST([PYTHON_CXXFLAGS]) dnl ------------------------------------------------------------------ *************** *** 84,88 **** fi ! AC_SUBST([PYTHON_LDFLAGS],["-L$lib_python_path -lpython$PYTHON_VERSION"]) dnl ------------------------------------------------------------------ --- 88,98 ---- fi ! if test -n "$lib_python_path"; then ! PYTHON_LDFLAGS="$PYTHON_LDFLAGS -L$lib_python_path" ! fi ! if test -n "$PYTHON_VERSION"; then ! PYTHON_LDFLAGS="$PYTHON_LDFLAGS -lpython$PYTHON_VERSION" ! fi ! AC_SUBST([PYTHON_LDFLAGS]) dnl ------------------------------------------------------------------ |