[Adonthell-commits] CVS: adonthell FULLSCREEN.howto,1.1,1.2 INSTALL,1.25,1.26 NEWBIE,1.17,1.18 acinclude.m4,1.14,1.15 configure.in,1.72,1.73

[Kai Sterker <address@hidden>]

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

Modified Files:
        FULLSCREEN.howto INSTALL NEWBIE acinclude.m4 configure.in 
Log Message:
UPDATE for libvorbis 1.0
ADDED all .m4 macros to acinclude.m4


Index: FULLSCREEN.howto
===================================================================
RCS file: /cvsroot/adonthell/adonthell/FULLSCREEN.howto,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FULLSCREEN.howto    17 Sep 2002 15:46:22 -0000      1.1
--- FULLSCREEN.howto    19 Sep 2002 14:00:55 -0000      1.2
***************
*** 26,30 ****
  
  If you have a slow box, you may want to run Adonthell in 320x240 to
! improve the performance. After changing the $HOME/.adonthell/adonthellrc 
configuration file accordingly, Adonthell will attempt to run in X11 
  Fullscreen mode. However, unless you have configured X for the low 
  resolution Adonthell needs, you'll get a quite small game window with 
--- 26,31 ----
  
  If you have a slow box, you may want to run Adonthell in 320x240 to
! improve the performance. After changing the $HOME/.adonthell/adonthellrc 
! configuration file accordingly, Adonthell will attempt to run in X11 
  Fullscreen mode. However, unless you have configured X for the low 
  resolution Adonthell needs, you'll get a quite small game window with 

Index: INSTALL
===================================================================
RCS file: /cvsroot/adonthell/adonthell/INSTALL,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** INSTALL     17 Sep 2002 15:46:22 -0000      1.25
--- INSTALL     19 Sep 2002 14:00:55 -0000      1.26
***************
*** 29,37 ****
  
  
! 3. Ogg Vorbis, version 1.0rc1 or later
  
     For convenience, the SDL_mixer library is included with the source code;
! it will be replaced by a custom mixer anyway. However, you'll need OggVorbis
! 1.0rc1 or later to enjoy the music.
  
     See http://www.xiph.org/ogg/vorbis/download/
--- 29,37 ----
  
  
! 3. Ogg Vorbis, version 1.0rc3 or later
  
     For convenience, the SDL_mixer library is included with the source code;
! it will be replaced by a custom mixer anyway. However, you'll need Ogg Vorbis
! 1.0rc3 or later to enjoy the music.
  
     See http://www.xiph.org/ogg/vorbis/download/

Index: NEWBIE
===================================================================
RCS file: /cvsroot/adonthell/adonthell/NEWBIE,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** NEWBIE      17 Sep 2002 15:50:09 -0000      1.17
--- NEWBIE      19 Sep 2002 14:00:55 -0000      1.18
***************
*** 120,124 ****
  and install another library:
  
! 3. Ogg Vorbis, Version 1.0rc1 or later
  
      http://www.xiph.org/ogg/vorbis/download/
--- 120,124 ----
  and install another library:
  
! 3. Ogg Vorbis, Version 1.0rc3 or later
  
      http://www.xiph.org/ogg/vorbis/download/

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/adonthell/adonthell/acinclude.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** acinclude.m4        7 Apr 2002 09:51:27 -0000       1.14
--- acinclude.m4        19 Sep 2002 14:00:55 -0000      1.15
***************
*** 1,2 ****
--- 1,28 ----
+ # 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.
+ 
+ # This program is distributed in the hope that it will be useful,
[...3463 lines suppressed...]
+           echo "***"
+           echo "***    rpm --erase --nodeps gtk gtk-devel" ],
+         [ echo "*** The test program failed to compile or link. See the file 
config.log for the"
+           echo "*** exact error that occured. This usually means GTK was 
incorrectly installed"
+           echo "*** or that you have moved GTK since it was installed. In the 
latter case, you"
+           echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
+           CFLAGS="$ac_save_CFLAGS"
+           LIBS="$ac_save_LIBS"
+        fi
+      fi
+      GTK_CFLAGS=""
+      GTK_LIBS=""
+      ifelse([$3], , :, [$3])
+   fi
+   AC_SUBST(GTK_CFLAGS)
+   AC_SUBST(GTK_LIBS)
+   rm -f conf.gtktest
+ ])
+ 
+ 

Index: configure.in
===================================================================
RCS file: /cvsroot/adonthell/adonthell/configure.in,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -r1.72 -r1.73
*** configure.in        15 Sep 2002 19:58:52 -0000      1.72
--- configure.in        19 Sep 2002 14:00:55 -0000      1.73
***************
*** 130,134 ****
  
  OGG_VORBIS=no
! AM_PATH_VORBIS(
          OGG_VORBIS="yes"
          ogg_music="enabled"
--- 130,134 ----
  
  OGG_VORBIS=no
! XIPH_PATH_VORBIS(
          OGG_VORBIS="yes"
          ogg_music="enabled"