[Adonthell-commits] CVS: adonthell README,1.25,1.26 config.status,1.12,1.13 configure.in,1.64,1.65

[Kai Sterker <address@hidden>]

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

Modified Files:
        README config.status configure.in 
Log Message:
ADDED quick-load feature

Index: README
===================================================================
RCS file: /cvsroot/adonthell/adonthell/README,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** README      27 Apr 2002 20:52:04 -0000      1.25
--- README      26 May 2002 09:27:27 -0000      1.26
***************
*** 62,65 ****
--- 62,70 ----
    chose here, otherwise you'll get the default (i.e. English) text.
  
+ - Quick-load
+   Whether the last game should be automatically continued at
+   startup. Only works if at least one saved game exists.
+   0 = disable, 1 = enable
+ 
  - Audio-channels
    Whether sound should be mono or stereo

Index: config.status
===================================================================
RCS file: /cvsroot/adonthell/adonthell/Attic/config.status,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** config.status       5 May 2002 09:44:47 -0000       1.12
--- config.status       26 May 2002 09:27:27 -0000      1.13
***************
*** 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 \"\"
  
  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 "  " --no-create --no-recursion"
!     exec /bin/sh ./configure  --no-create --no-recursion ;;
    --version | --vers* | -V )
      echo "$ac_cs_version"; exit 0 ;;
***************
*** 543,553 ****
  s,@haveldd@,/usr/bin/ldd,;t t
  s,@P_SWIG@,/usr/local/bin/swig,;t t
! s,@BUILD_TOOLS_TRUE@,,;t t
! s,@BUILD_TOOLS_FALSE@,#,;t t
! s,@GTK_CONFIG@,/usr/bin/gtk-config,;t t
! s,@GTK_CFLAGS@,-I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 
-I/usr/lib/glib/include -I/usr/X11R6/include,;t t
! s,@GTK_LIBS@,-L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule 
-lglib -ldl -lXi -lXext -lX11 -lm,;t t
  s,@HAVE_GTK_TRUE@,,;t t
! s,@HAVE_GTK_FALSE@,#,;t t
  s,@BUILD_DOC_TRUE@,#,;t t
  s,@BUILD_DOC_FALSE@,,;t t
--- 543,553 ----
  s,@haveldd@,/usr/bin/ldd,;t t
  s,@P_SWIG@,/usr/local/bin/swig,;t t
! s,@BUILD_TOOLS_TRUE@,#,;t t
! s,@BUILD_TOOLS_FALSE@,,;t t
! s,@GTK_CONFIG@,,;t t
! s,@GTK_CFLAGS@,,;t t
! s,@GTK_LIBS@,,;t t
  s,@HAVE_GTK_TRUE@,,;t t
! s,@HAVE_GTK_FALSE@,,;t t
  s,@BUILD_DOC_TRUE@,#,;t t
  s,@BUILD_DOC_FALSE@,,;t t
***************
*** 560,565 ****
  s,@OGG_LIBS@, -lvorbis -lm -lvorbisfile,;t t
  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
--- 560,565 ----
  s,@OGG_LIBS@, -lvorbis -lm -lvorbisfile,;t t
  s,@OGG_DEFS@,-DOGG_MUSIC,;t t
! s,@PY_CFLAGS@,-I/usr/local/include/python2.1,;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

Index: configure.in
===================================================================
RCS file: /cvsroot/adonthell/adonthell/configure.in,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** configure.in        5 May 2002 09:44:47 -0000       1.64
--- configure.in        26 May 2002 09:27:27 -0000      1.65
***************
*** 189,198 ****
  
     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
  
--- 189,202 ----
  
     for ppath in $py_paths ; do
!      if test -r "$ppath/libpython$PYLIBVER.so" -o \
!            -r "$ppath/libpython$PYLIBVER.a"; then
!         PYLIB="-L$ppath -lpython$PYLIBVER"
!         break
!      fi
!      if test -r "$ppath/libpython.so" -o \
!              -r "$ppath/libpython.a"; then
!         PYLIB="-L$ppath -lpython"
!         break
!      fi
     done