Commit 17a20fb2 authored by Ralph Giles's avatar Ralph Giles

Propagate new XIPH_ autoconf macro prefix.

svn path=/trunk/vorbis-tools/; revision=3558
parent 0939b81b
......@@ -2,10 +2,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
......@@ -106,10 +106,10 @@ int main ()
# Jack Moffitt <jack@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 @@ int main ()
# Jack Moffitt <jack@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
......
......@@ -92,8 +92,8 @@ dnl --------------------------------------------------
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 @@ dnl --------------------------------------------------
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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment