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

[Ralph Giles]

giles       02/07/09 06:19:39

  Modified:    .        acinclude.m4 configure.in
  Log:
  Propagate new XIPH_ autoconf macro prefix.

Revision  Changes    Path
1.19      +6 -6      vorbis-tools/acinclude.m4

Index: acinclude.m4
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/acinclude.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- acinclude.m4	2002/07/07 21:24:11	1.18
+++ acinclude.m4	2002/07/09 13:19:39	1.19
@@ -2,10 +2,10 @@
 # Jack Moffitt <jack at icecast.org> 10-21-2000
 # Shamelessly stolen from Owen Taylor and Manish Singh
 
-dnl AM_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
 dnl
-AC_DEFUN(AM_PATH_OGG,
+AC_DEFUN(XIPH_PATH_OGG,
 [dnl 
 dnl Get the cflags and libraries
 dnl
@@ -106,10 +106,10 @@
 # Jack Moffitt <jack at icecast.org> 10-21-2000
 # Shamelessly stolen from Owen Taylor and Manish Singh
 
-dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
 dnl
-AC_DEFUN(AM_PATH_VORBIS,
+AC_DEFUN(XIPH_PATH_VORBIS,
 [dnl 
 dnl Get the cflags and libraries
 dnl
@@ -217,10 +217,10 @@
 # Jack Moffitt <jack at icecast.org> 10-21-2000
 # Shamelessly stolen from Owen Taylor and Manish Singh
 
-dnl AM_PATH_AO([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl XIPH_PATH_AO([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Test for libao, and define AO_CFLAGS and AO_LIBS
 dnl
-AC_DEFUN(AM_PATH_AO,
+AC_DEFUN(XIPH_PATH_AO,
 [dnl 
 dnl Get the cflags and libraries
 dnl

<p><p>1.43      +3 -3      vorbis-tools/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/configure.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- configure.in	2002/07/06 05:11:21	1.42
+++ configure.in	2002/07/09 13:19:39	1.43
@@ -92,8 +92,8 @@
 dnl Check for generally needed libraries
 dnl --------------------------------------------------
 
-AM_PATH_OGG(,AC_MSG_ERROR(Ogg needed!))
-AM_PATH_VORBIS(,AC_MSG_ERROR(Vorbis needed!))
+XIPH_PATH_OGG(,AC_MSG_ERROR(Ogg needed!))
+XIPH_PATH_VORBIS(,AC_MSG_ERROR(Vorbis needed!))
 
 SHARE_LIBS='$(top_builddir)/share/libutf8.a $(top_builddir)/share/libgetopt.a'
 SHARE_CFLAGS='-I$(top_srcdir)/include'
@@ -111,7 +111,7 @@
 
 if test "x$build_ogg123" = xyes; then
   AC_MSG_RESULT([checking for ogg123 requirements])
-  AM_PATH_AO(,build_ogg123=no; AC_MSG_WARN(libao missing))
+  XIPH_PATH_AO(,build_ogg123=no; AC_MSG_WARN(libao missing))
   AM_PATH_CURL(,build_ogg123=no; AC_MSG_WARN(libcurl missing))
 
   ACX_PTHREAD(,build_ogg123=no; AC_MSG_WARN(POSIX threads missing))

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