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

[Jeff Squyres]

jsquyres    01/02/27 18:36:50

  Modified:    .        acinclude.m4
  Log:
  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.7       +12 -0     vorbis-tools/acinclude.m4

Index: acinclude.m4
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/acinclude.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- acinclude.m4	2001/02/27 23:06:36	1.6
+++ acinclude.m4	2001/02/28 02:36:50	1.7
@@ -17,6 +17,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"
@@ -110,6 +114,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"
@@ -208,6 +216,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

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