[Adonthell-commits] CVS: adonthell config.status,1.11,1.12 configure.in,1.63,1.64

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell
In directory subversions:/tmp/cvs-serv21785

Modified Files:
        config.status configure.in 
Log Message:
FIXED configure so it finds a python library that is actually installed in 
<prefix>/lib. - Thanks Jakub (mick3y) Mikusek

Index: config.status
===================================================================
RCS file: /cvsroot/adonthell/adonthell/Attic/config.status,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** config.status       27 Apr 2002 10:33:31 -0000      1.11
--- config.status       5 May 2002 09:44:47 -0000       1.12
***************
*** 282,286 ****
  adonthell config.status 0.3.3pre1
  configured by ./configure, generated by GNU Autoconf 2.53,
!   with options \"'--enable-tools' '--enable-py-debug'\"
  
  Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
--- 282,286 ----
  adonthell config.status 0.3.3pre1
  configured by ./configure, generated by GNU Autoconf 2.53,
!   with options \"'--enable-tools' '-enable-py-debug'\"
  
  Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
***************
*** 312,317 ****
    # Handling of the options.
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     echo "running /bin/sh ./configure " '--enable-tools' '--enable-py-debug' 
" --no-create --no-recursion"
!     exec /bin/sh ./configure '--enable-tools' '--enable-py-debug' --no-create 
--no-recursion ;;
    --version | --vers* | -V )
      echo "$ac_cs_version"; exit 0 ;;
--- 312,317 ----
    # Handling of the options.
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     echo "running /bin/sh ./configure " '--enable-tools' '-enable-py-debug' " 
--no-create --no-recursion"
!     exec /bin/sh ./configure '--enable-tools' '-enable-py-debug' --no-create 
--no-recursion ;;
    --version | --vers* | -V )
      echo "$ac_cs_version"; exit 0 ;;
***************
*** 561,565 ****
  s,@OGG_DEFS@,-DOGG_MUSIC,;t t
  s,@PY_CFLAGS@,-I/usr/local/include/python2.1 -DPY_DEBUG,;t t
! s,@PY_LIBS@,-Wl,-E -L/usr/local/lib/python2.1/config -lpython2.1   -lpthread 
-ldl -lutil,;t t
  s,@gamedatadir@,${prefix}/share/adonthell,;t t
  CEOF
--- 561,565 ----
  s,@OGG_DEFS@,-DOGG_MUSIC,;t t
  s,@PY_CFLAGS@,-I/usr/local/include/python2.1 -DPY_DEBUG,;t t
! s,@PY_LIBS@,-Wl,-E -L/usr/local/lib/python2.1/config -lpython2.1.a   
-lpthread -ldl -lutil,;t t
  s,@gamedatadir@,${prefix}/share/adonthell,;t t
  CEOF

Index: configure.in
===================================================================
RCS file: /cvsroot/adonthell/adonthell/configure.in,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -r1.63 -r1.64
*** configure.in        28 Apr 2002 18:03:18 -0000      1.63
--- configure.in        5 May 2002 09:44:47 -0000       1.64
***************
*** 156,160 ****
     if test $PYTHON_VERSION -lt 15; then
        echo "Sorry, you need to have Python 1.5+ installed - update your 
version!"
!       AC_MSG_ERROR([Python 1.5 or better required])
     fi
  
--- 156,160 ----
     if test $PYTHON_VERSION -lt 15; then
        echo "Sorry, you need to have Python 1.5+ installed - update your 
version!"
!       AC_MSG_ERROR([*** Python 1.5 or better required])
     fi
  
***************
*** 177,201 ****
  
     AC_MSG_CHECKING(for Python library)
     changequote(<<, >>)
!    PYLIB=`$PYPACKAGE -c 'import sys; print "%s/lib/python%s/config" % 
(sys.prefix, sys.version[:3])'`
     PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version[:3]'`
     changequote([, ])
  
! 
     dnl Try for specific version first, then the generic version, then panic
  
!    if test -r "$PYLIB/libpython$PYLIBVER.so"; then
!        PY_LIBS="-L$PYLIB -lpython$PYLIBVER $PY_LIBS"
!    elif test -r "$PYLIB/libpython$PYLIBVER.a"; then
!        PY_LIBS="-L$PYLIB -lpython$PYLIBVER $PY_LIBS"
!    elif test -r "$PYLIB/libpython.so"; then
!        PY_LIBS="-L$PYLIB -lpython $PY_LIBS"
!    elif test -r "$PYLIB/libpython.a"; then
!        PY_LIBS="-L$PYLIB -lpython $PY_LIBS"
     else
!        AC_MSG_ERROR([Python library not found in $PYLIB])
     fi
-    AC_MSG_RESULT(found)
- 
  
     dnl Get the libraries that python depends on
--- 177,206 ----
  
     AC_MSG_CHECKING(for Python library)
+    PYLIB=""
     changequote(<<, >>)
!    PYPREFIX=`$PYPACKAGE -c 'import sys; print sys.prefix'`
     PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version[:3]'`
     changequote([, ])
  
!    py_paths="$PYPREFIX/lib/python$PYLIBVER/config $PYPREFIX/lib"
!    py_suffix="$PYLIBVER.so $PYLIBVER.a .so .a"
!    
     dnl Try for specific version first, then the generic version, then panic
  
!    for ppath in $py_paths ; do
!      for psuffix in $py_suffix ; do
!         if test -r "$ppath/libpython$psuffix" ; then
!             PYLIB="-L$ppath -lpython$psuffix"
!             break 2
!         fi
!      done
!    done
! 
!    if test "x$PYLIB" != x ; then
!       PY_LIBS="$PYLIB $PY_LIBS"
!       AC_MSG_RESULT(found)
     else
!       AC_MSG_ERROR([*** Python library not found])
     fi
  
     dnl Get the libraries that python depends on
***************
*** 223,227 ****
     AC_MSG_RESULT($PY_DEPS)
  
!    dnl only GNU ld seems to knows -E flag
     if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
         PY_LIBS="-Wl,-E $PY_LIBS $PY_DEPS"
--- 228,232 ----
     AC_MSG_RESULT($PY_DEPS)
  
!    dnl only GNU ld seems to know -E flag
     if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
         PY_LIBS="-Wl,-E $PY_LIBS $PY_DEPS"
***************
*** 230,242 ****
     fi
  
-    dnl See whether we should enable python debugging
- 
-    AC_MSG_CHECKING(whether to enable Python debugging)
-    if test x$pydebug = xno; then
-       AC_MSG_RESULT(no)
-    else
-         PY_CFLAGS="$PY_CFLAGS -DPY_DEBUG"
-       AC_MSG_RESULT(yes)
-    fi
  else
     PY_CFLAGS=${pycflags}
--- 235,238 ----
***************
*** 247,250 ****
--- 243,256 ----
     AC_MSG_RESULT($PY_LIBS)
     PY_VERSION="Manually specified"   
+ fi
+ 
+ dnl See whether we should enable python debugging
+ 
+ AC_MSG_CHECKING(whether to enable Python debugging)
+ if test x$pydebug = xno; then
+     AC_MSG_RESULT(no)
+ else
+     PY_CFLAGS="$PY_CFLAGS -DPY_DEBUG"
+     AC_MSG_RESULT(yes)
  fi