[xiph-cvs] cvs commit: vorbis-tools/vorbiscomment Makefile.am

[Jack Moffitt]

jack        00/11/04 01:22:38

  Modified:    .        acinclude.m4 configure.in
               ogg123   Makefile.am
               oggenc   Makefile.am
               vorbiscomment Makefile.am
  Log:
  Revamped teh vorbis-tools build system.  I must have forgotten to do the
  AM_PATH_OGG and AM_PATH_VORBIS fixes.  evreything builds except for
  oggenc, which Michael needs to get using libvorbisenc

Revision  Changes    Path
1.3       +8 -2      vorbis-tools/acinclude.m4

Index: acinclude.m4
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/acinclude.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- acinclude.m4	2000/11/01 02:17:32	1.2
+++ acinclude.m4	2000/11/04 09:22:37	1.3
@@ -221,10 +221,12 @@
   if test x$vorbis_prefix != x ; then
     vorbis_args="$vorbis_args --prefix=$vorbis_prefix"
     VORBIS_CFLAGS="-I$vorbis_prefix/include"
-    VORBIS_LIBS="-L$vorbis_prefix/lib"
+    VORBIS_LIBDIR="-L$vorbis_prefix/lib"
   fi
 
-  VORBIS_LIBS="$VORBIS_LIBS -lvorbisfile -lvorbis -lm"
+  VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm"
+  VORBISFILE_LIBS="-lvorbisfile"
+  VORBISENC_LIBS="-lvorbisenc"
 
   AC_MSG_CHECKING(for Vorbis)
   no_vorbis=""
@@ -288,9 +290,13 @@
      fi
      VORBIS_CFLAGS=""
      VORBIS_LIBS=""
+     VORBISFILE_LIBS=""
+     VORBISENC_LIBS=""
      ifelse([$2], , :, [$2])
   fi
   AC_SUBST(VORBIS_CFLAGS)
   AC_SUBST(VORBIS_LIBS)
+  AC_SUBST(VORBISFILE_LIBS)
+  AC_SUBST(VORBISENC_LIBS)
   rm -f conf.vorbistest
 ])

1.10      +2 -12     vorbis-tools/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure.in	2000/11/01 02:17:32	1.9
+++ configure.in	2000/11/04 09:22:37	1.10
@@ -48,18 +48,8 @@
 dnl Check for libraries
 dnl --------------------------------------------------
 
-dnl Check for libogg
-if test -n $with_ogg; then
-	CFLAGS="$CFLAGS -I$with_ogg/include -L$with_ogg/lib"
-fi 
-AC_CHECK_LIB(ogg, oggpack_read, LIBS="$LIBS -logg", AC_MSG_ERROR([You must have libogg to compile vorbis!!!]))
-
-dnl Check for libvorbis
-if test -n $with_vorbis; then
-	CFLAGS="$CFLAGS -I$with_vorbis/include -L$with_vorbis/lib"
-fi
-AC_CHECK_LIB(vorbis, vorbis_info_init, LIBS="$LIBS -lvorbis", AC_MSG_ERROR([You must have libvorbis to compile vorbis-tools!!!]))
-
+AM_PATH_OGG(,AC_MSG_ERROR(Ogg needed!))
+AM_PATH_VORBIS(,AC_MSG_ERROR(Vorbis needed!))
 AM_PATH_AO(0.5.0,,AC_MSG_ERROR(libao needed!))
 
 dnl --------------------------------------------------

1.3       +2 -2      vorbis-tools/ogg123/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	2000/10/30 04:53:52	1.2
+++ Makefile.am	2000/11/04 09:22:37	1.3
@@ -5,9 +5,9 @@
 bin_PROGRAMS = ogg123
 man_MANS = ogg123.1
 
-INCLUDES = @AO_CFLAGS@
+INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@
 
-ogg123_LDFLAGS = -lvorbisfile @AO_LIBS@
+ogg123_LDFLAGS = @OGG_LIBS@ @VORBIS_LIBS@ @VORBISFILE_LIBS@ @AO_LIBS@
 
 ogg123_SOURCES = ogg123.c
 

1.4       +1 -0      vorbis-tools/oggenc/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/oggenc/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	2000/10/30 04:53:52	1.3
+++ Makefile.am	2000/11/04 09:22:38	1.4
@@ -6,6 +6,7 @@
 
 bin_PROGRAMS = oggenc
 
+oggenc_LDFLAGS = @VORBISENC_LIBS@
 oggenc_SOURCES = oggenc.c audio.c encode.c oe_unix.c getopt.c getopt1.c\
                 oe_win32.c\
                 audio.h encode.h platform.h getopt.h

1.3       +3 -0      vorbis-tools/vorbiscomment/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/vorbiscomment/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	2000/10/03 02:28:52	1.2
+++ Makefile.am	2000/11/04 09:22:38	1.3
@@ -4,6 +4,9 @@
 
 bin_PROGRAMS = vorbiscomment
 
+INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@
+
+vorbiscomment_LDFLAGS = @OGG_LIBS@ @VORBIS_LIBS@
 vorbiscomment_SOURCES = vorbiscomment.c
 
 debug:

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.