[xiph-cvs] cvs commit: vorbis vorbis.m4

[Jeff Squyres]

jsquyres    01/02/27 19:24:19

  Modified:    .        ao.m4
               .        ogg.m4
               .        vorbis.m4
  Log:
  Missed these ones the first time through: apply the same patch that has
  been put in all the relevant acinclude.m4 files to the .m4 files that
  get installed with the libraries.
  
  Another patch for lazy people (like me).
  
  Make AM_PATH_OGG, AM_PATH_VORBIS, and AM_PATH_AO each a bit smarter.
  Each of the three will now also check the $prefix for the location
  of their respective libraries/header files.  This means that if you're
  compiling all 4 things (ao, ogg, vorbis, vorbis-tools) all with the
  same $prefix (which is a pretty common case), you don't have to specify
  "--with-ao-prefix=this --with-ogg-prefix=really --with-vorbis-prefix=sucks",
  you can just specify a single --prefix argument and ditch all the
  --with-*-prefix arguments.
  
  However, if you do specify any of the three --with arguments, those are
  searched *first* -- the $prefix is searched second.

Revision  Changes    Path
1.5       +4 -0      ao/ao.m4

Index: ao.m4
===================================================================
RCS file: /usr/local/cvsroot/ao/ao.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ao.m4	2001/02/27 23:09:53	1.4
+++ ao.m4	2001/02/28 03:24:17	1.5
@@ -17,6 +17,10 @@
     ao_args="$ao_args --prefix=$ao_prefix"
     AO_CFLAGS="-I$ao_prefix/include"
     AO_LIBS="-L$ao_prefix/lib"
+  elif test "$prefix" != ""; then
+    ao_args="$ao_args --prefix=$prefix"
+    AO_CFLAGS="-I$prefix/include"
+    AO_LIBS="-L$prefix/lib"
   fi
 
   # see where dl* and friends live

1.3       +4 -0      ogg/ogg.m4

Index: ogg.m4
===================================================================
RCS file: /usr/local/cvsroot/ogg/ogg.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ogg.m4	2000/10/30 06:52:02	1.2
+++ ogg.m4	2001/02/28 03:24:18	1.3
@@ -16,6 +16,10 @@
     ogg_args="$ogg_args --prefix=$ogg_prefix"
     OGG_CFLAGS="-I$ogg_prefix/include"
     OGG_LIBS="-L$ogg_prefix/lib"
+  elif test "$prefix" != ""; then
+    ogg_args="$ogg_args --prefix=$prefix"
+    OGG_CFLAGS="-I$prefix/include"
+    OGG_LIBS="-L$prefix/lib"
   fi
 
   OGG_LIBS="$OGG_LIBS -logg"

1.3       +4 -0      vorbis/vorbis.m4

Index: vorbis.m4
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vorbis.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vorbis.m4	2000/11/06 00:06:45	1.2
+++ vorbis.m4	2001/02/28 03:24:18	1.3
@@ -16,6 +16,10 @@
     vorbis_args="$vorbis_args --prefix=$vorbis_prefix"
     VORBIS_CFLAGS="-I$vorbis_prefix/include"
     VORBIS_LIBDIR="-L$vorbis_prefix/lib"
+  elif test "$prefix" != ""; then
+    vorbis_args="$vorbis_args --prefix=$prefix"
+    VORBIS_CFLAGS="-I$prefix/include"
+    VORBIS_LIBDIR="-L$prefix/lib"
   fi
 
   VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm"

--- >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.