[Bitcollider-commits] CVS: bitcollider Makefile.am,1.9,1.10 configure.in,1.10,1.11

[Robert K. <may...@us...>]

Update of /cvsroot/bitcollider/bitcollider
In directory usw-pr-cvs1:/tmp/cvs-serv9352

Modified Files:
	Makefile.am configure.in 
Log Message:
Vorbis no longer gets compiled if the vorbis headers were not found.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/bitcollider/bitcollider/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Makefile.am	2001/07/09 21:19:52	1.9
--- Makefile.am	2001/09/10 23:52:47	1.10
***************
*** 7,11 ****
  AUTOMAKE_OPTIONS = foreign
  
! SUBDIRS = libltdl lib src vorbis wav image 
  
  cvsclean: distclean
--- 7,11 ----
  AUTOMAKE_OPTIONS = foreign
  
! SUBDIRS = libltdl lib src @VORBIS_SUB@ wav image 
  
  cvsclean: distclean

Index: configure.in
===================================================================
RCS file: /cvsroot/bitcollider/bitcollider/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** configure.in	2001/07/09 21:19:52	1.10
--- configure.in	2001/09/10 23:52:47	1.11
***************
*** 5,9 ****
  dnl $Id$
  AC_INIT(src/bitcollider.c)
! VERSION="0.3.1"
  AM_INIT_AUTOMAKE(bitcollider, "$VERSION")
  dnl AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
--- 5,9 ----
  dnl $Id$
  AC_INIT(src/bitcollider.c)
! VERSION="0.3.3"
  AM_INIT_AUTOMAKE(bitcollider, "$VERSION")
  dnl AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
***************
*** 34,45 ****
--- 34,48 ----
               -lvorbis -logg)
  
+ VORBIS_SUB=""
  if test "$have_ogg" = "yes"; then
    if test "$have_vorbis" = "yes"; then
       AC_DEFINE(USE_VORBIS)
       VORBIS_LIBS="-lvorbisfile -lvorbis -logg"
+      VORBIS_SUB="vorbis"
       AC_SUBST(VORBIS_LIBS)
       AC_MSG_RESULT([compiling ogg/vorbis support])
    fi
  fi
+ AC_SUBST(VORBIS_SUB)
  
  if test "${prefix}" = "NONE"; then