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

[Stan Seibert]

volsung     01/10/27 19:50:51

  Modified:    .        ao.m4
  Log:
  Updated m4 macro to have similar options to ogg and vorbis macros.

Revision  Changes    Path
1.8       +15 -6     ao/ao.m4

Index: ao.m4
===================================================================
RCS file: /usr/local/cvsroot/ao/ao.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ao.m4	2001/08/20 21:11:38	1.7
+++ ao.m4	2001/10/28 02:50:51	1.8
@@ -10,17 +10,26 @@
 [dnl 
 dnl Get the cflags and libraries
 dnl
-AC_ARG_WITH(ao-prefix,[  --with-ao-prefix=PFX   Prefix where libao is installed (optional)], ao_prefix="$withval", ao_prefix="")
+AC_ARG_WITH(ao,[  --with-ao=PFX   Prefix where libao is installed (optional)], ao_prefix="$withval", ao_prefix="")
+AC_ARG_WITH(ao-libraries,[  --with-ao-libraries=DIR   Directory where libao library is installed (optional)], ao_libraries="$withval", ao_libraries="")
+AC_ARG_WITH(ao-includes,[  --with-ao-includes=DIR   Directory where libao header files are installed (optional)], ao_includes="$withval", ao_includes="")
 AC_ARG_ENABLE(aotest, [  --disable-aotest       Do not try to compile and run a test ao program],, enable_aotest=yes)
 
-  if test "x$ao_prefix" != "x"; then
-    ao_args="$ao_args --prefix=$ao_prefix"
-    AO_CFLAGS="-I$ao_prefix/include"
+
+  if test "x$ao_libraries" != "x" ; then
+    AO_LIBS="-L$ao_libraries"
+  elif test "x$ao_prefix" != "x"; then
     AO_LIBS="-L$ao_prefix/lib"
   elif test "x$prefix" != "xNONE"; then
-    ao_args="$ao_args --prefix=$prefix"
-    AO_CFLAGS="-I$prefix/include"
     AO_LIBS="-L$prefix/lib"
+  fi
+
+  if test "x$ao_includes" != "x" ; then
+    AO_CFLAGS="-I$ao_includes"
+  elif test "x$ao_prefix" != "x"; then
+    AO_CFLAGS="-I$ao_prefix/include"
+  elif test "x$prefix" != "xNONE"; then
+    AO_CFLAGS="-I$prefix/include"
   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.