[Adonthell-commits] CVS: adonthell README.BeOS,1.5,1.6 acinclude.m4,1.16,1.17 autogen.sh,1.7,1.8 configure.in,1.77,1.78

[Kai Sterker <address@hidden>]

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

Modified Files:
        README.BeOS acinclude.m4 autogen.sh configure.in 
Log Message:
FIXED compilation for BeOS (still crashing during initial dialogue though)
FIXED the business with libtool and sed on Debian/Unstable (I hope!)
REPLACED float with double for whatever good that does


Index: README.BeOS
===================================================================
RCS file: /cvsroot/adonthell/adonthell/README.BeOS,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** README.BeOS 5 Feb 2002 13:29:24 -0000       1.5
--- README.BeOS 4 Dec 2002 17:09:47 -0000       1.6
***************
*** 39,61 ****
  before running the usual 'configure', 'make' and 'make install'. 
  
! The next library, libogg (1.0rc2) didn't compile out of the box. 
! Search for the part that reads
! 
!     #elif defined(__BEOS__) 
!     #  include <inttypes.h>
! 
! in <oggdir>/include/ogg/os_types.h and add 
!     
!     #  include <ogg/config_types.h> 
! 
! after the first #include.
! 
! To compile libvorbis, I had to pass the location of libogg to the
! configure script, as it wasn't detected automatically:
   
!     $ configure --with-ogg-prefix=/path/to/libogg/directory
      
! Apart from that, it's the usual procedure. Afterwards you are ready 
! to compile Adonthell.
  
  
--- 39,54 ----
  before running the usual 'configure', 'make' and 'make install'. 
  
! The next two libraries, libogg 1.0 and libvorbis 1.0 compile out
! of the box. Just make sure to install them to /boot/develop/tools/gnupro
! by passing proper prefix to configure:
   
!     $ configure --prefix=/boot/develop/tools/gnupro
!     
! From then on it's the usual procedure:
      
!     $ make
!     $ make install
! 
! If all went well you are ready to compile Adonthell.
  
  
***************
*** 65,69 ****
  That's as easy as
        
!       $ configure
        $ make
        $ make install
--- 58,63 ----
  That's as easy as
        
!       $ configure --disable-nls --disable-vorbistest \
!               --prefix=/boot/develop/tools/gnupro
        $ make
        $ make install
***************
*** 77,94 ****
  not. Espacially those depending on GTK+ might cause trouble. However,
  for playing Adonthell, you won't need them, so it's no big loss.
- 
- 
- Restrictions:
- =============
- 
- In contrast to other Operating Systems, BeOS seems to be unable to
- display resolutions lower than 640x480 (possibly depending on the 
- graphic driver?), specifically not 320x240. Therefore you will 
- experience a black border around the screen in fullscreen mode.
- There are no plans to change this, as the next version will use a
- higher resolution anyway. 
- 
- However, if BeOS provides a workaround I am not aware of, feel 
- free to contact me:
  
  
--- 71,74 ----

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/adonthell/adonthell/acinclude.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** acinclude.m4        19 Sep 2002 15:05:58 -0000      1.16
--- acinclude.m4        4 Dec 2002 17:09:47 -0000       1.17
***************
*** 12,4506 ****
  # PARTICULAR PURPOSE.
  
! # aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
  
  # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
  # Free Software Foundation, Inc.
! # This file is free software; the Free Software Foundation
! # gives unlimited permission to copy and/or distribute it,
! # with or without modifications, as long as this notice is preserved.
  
[...9111 lines suppressed...]
+ # -------------------
+ # Run COMMAND, save the exit status in ac_status, and log it.
+ # (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+ AC_DEFUN([AM_RUN_LOG],
+ [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+    ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+    ac_status=$?
+    echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+    (exit $ac_status); }])
+ 
  # Configure paths for GTK+
  # Owen Taylor     97-11-3
***************
*** 6912,6916 ****
    rm -f conf.gtktest
  ])
- 
- 
  
--- 7047,7049 ----

Index: autogen.sh
===================================================================
RCS file: /cvsroot/adonthell/adonthell/autogen.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** autogen.sh  15 Sep 2002 15:52:25 -0000      1.7
--- autogen.sh  4 Dec 2002 17:09:47 -0000       1.8
***************
*** 9,16 ****
  
  # Regenerate everything
! aclocal -I .
! libtoolize --force --copy
  autoheader
! automake --add-missing --gnu --copy
  autoconf 
  
--- 9,34 ----
  
  # Regenerate everything
! 
! #
! # use aclocal v1.6 if available
! #
! if test "x`which aclocal-1.6`" = "x" ; then
!   aclocal -I .
! else
!   aclocal-1.6 -I .
! fi
! 
! libtoolize --automake --force --copy
  autoheader
! 
! #
! # use Autmake v1.6 if available
! #
! if test "x`which automake-1.6`" = "x" ; then
!   automake --add-missing --gnu --copy
! else
!   automake-1.6 --add-missing --gnu --copy
! fi
! 
  autoconf 
  

Index: configure.in
===================================================================
RCS file: /cvsroot/adonthell/adonthell/configure.in,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -r1.77 -r1.78
*** configure.in        12 Oct 2002 18:51:33 -0000      1.77
--- configure.in        4 Dec 2002 17:09:47 -0000       1.78
***************
*** 133,137 ****
          OGG_VORBIS="yes"
          ogg_music="enabled"
!         OGG_LIBS="$VORBIS_LIBS $VORBISFILE_LIBS"
          OGG_DEFS="-DOGG_MUSIC"
          OGG_CFLAGS="$VORBIS_CFLAGS",
--- 133,137 ----
          OGG_VORBIS="yes"
          ogg_music="enabled"
!         OGG_LIBS="$VORBISFILE_LIBS $VORBIS_LIBS"
          OGG_DEFS="-DOGG_MUSIC"
          OGG_CFLAGS="$VORBIS_CFLAGS",