Use XIPH_ as our autoconf macro prefix, rather than borrowing the AM_ namespace

as was common when these were first written.

svn path=/trunk/vorbis/; revision=3557

diff --git a/acinclude.m4 b/acinclude.m4
index 2b98134..7330563 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -5,10 +5,10 @@
 # Jack Moffitt <jack@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

diff --git a/configure.in b/configure.in
index 512cdd1..f64b552 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -163,7 +163,7 @@ dnl --------------------------------------------------
 AC_CHECK_LIB(m, cos, LIBS="-lm", LIBS="")
 AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)
 
-AM_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
+XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
 
 dnl --------------------------------------------------
 dnl Check for library functions

diff --git a/vorbis.m4 b/vorbis.m4
index 73e3b43..98fa5d9 100644 (file)
--- a/vorbis.m4
+++ b/vorbis.m4
@@ -3,10 +3,10 @@
 # Shamelessly stolen from Owen Taylor and Manish Singh
 # thomasvs added check for vorbis_bitrate_addblock which is new in rc3
 
-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