[Swig-cvs] SWIG configure.in,1.118,1.119

[William F. <wsf...@us...>]

Update of /cvsroot/swig/SWIG
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2301

Modified Files:
	configure.in 
Log Message:
Ben Reser patch to detect the Python lib directory on 64 bit systems

Index: configure.in
===================================================================
RCS file: /cvsroot/swig/SWIG/configure.in,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** configure.in	23 Jul 2004 21:37:10 -0000	1.118
--- configure.in	12 Aug 2004 20:51:59 -0000	1.119
***************
*** 564,576 ****
      AC_MSG_RESULT($PYVERSION)
  
      # Set the include directory
  
      AC_MSG_CHECKING(for Python header files)
      if test -r $PYPREFIX/include/$PYVERSION/Python.h; then
!         PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/lib/$PYVERSION/config"
      fi
      if test -z "$PYINCLUDE"; then
          if test -r $PYPREFIX/include/Py/Python.h; then
!             PYINCLUDE="-I$PYPREFIX/include/Py -I$PYEPREFIX/lib/python/lib"
          fi
      fi
--- 564,586 ----
      AC_MSG_RESULT($PYVERSION)
  
+     # Find the directory for libraries this is necessary to deal with
+     # platforms that can have apps built for multiple archs: e.g. x86_64
+     AC_MSG_CHECKING(for Python lib dir)
+     PYLIBDIR=`($PYTHON -c "import sys; print sys.lib") 2>/dev/null`
+     if test -z "$PYLIBDIR"; then
+       # older versions don't have sys.lib  so the best we can do is assume lib
+       PYLIBDIR="lib" 
+     fi
+     AC_MSG_RESULT($PYLIBDIR)
+     
      # Set the include directory
  
      AC_MSG_CHECKING(for Python header files)
      if test -r $PYPREFIX/include/$PYVERSION/Python.h; then
!         PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/$PYLIBDIR/$PYVERSION/config"
      fi
      if test -z "$PYINCLUDE"; then
          if test -r $PYPREFIX/include/Py/Python.h; then
!             PYINCLUDE="-I$PYPREFIX/include/Py -I$PYEPREFIX/$PYLIBDIR/python/lib"
          fi
      fi
***************
*** 579,586 ****
      # Set the library directory blindly.   This probably won't work with older versions
      AC_MSG_CHECKING(for Python library)
!     dirs="$PYVERSION/config $PYVERSION/lib python/lib"
      for i in $dirs; do
!         if test -d $PYEPREFIX/lib/$i; then
!            PYLIB="$PYEPREFIX/lib/$i"
             break
          fi
--- 589,596 ----
      # Set the library directory blindly.   This probably won't work with older versions
      AC_MSG_CHECKING(for Python library)
!     dirs="$PYVERSION/config $PYVERSION/$PYLIBDIR python/$PYLIBDIR"
      for i in $dirs; do
!         if test -d $PYEPREFIX/$PYLIBDIR/$i; then
!            PYLIB="$PYEPREFIX/$PYLIBDIR/$i"
             break
          fi