summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Moffitt <jack@xiph.org>2000-10-22 03:12:44 +0000
committerJack Moffitt <jack@xiph.org>2000-10-22 03:12:44 +0000
commit1b40e5ddc21b84138910a49acc32d0b9da4936a0 (patch)
tree3c1a5d8d20e781ac1a677727f50d919bb6a289b8
parent86e1f8ba8a2e2d7da70c882ff7b1d2555a0a666d (diff)
downloadlibvorbis-git-1b40e5ddc21b84138910a49acc32d0b9da4936a0.tar.gz
vorbis now uses the ogg.m4 for ogg detection
svn path=/branches/branch_beta3/vorbis/; revision=749
-rw-r--r--configure.in12
1 files changed, 1 insertions, 11 deletions
diff --git a/configure.in b/configure.in
index 0096de4d..f05346e9 100644
--- a/configure.in
+++ b/configure.in
@@ -34,12 +34,6 @@ CFLAGS="$cflags_save"
AM_PROG_LIBTOOL
-dnl --------------------------------------------------
-dnl Additional arguments
-dnl --------------------------------------------------
-
-AC_ARG_WITH(ogg, [ --with-ogg=DIR Set where the Ogg library is located])
-
dnl --------------------------------------------------
dnl Set build flags based on environment
dnl --------------------------------------------------
@@ -149,11 +143,7 @@ dnl --------------------------------------------------
AC_CHECK_LIB(m, cos, LIBS="-lm", LIBS="")
AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)
-dnl Check for libogg
-if test -n $with_ogg; then
- CFLAGS="$CFLAGS -I$with_ogg/include -L$with_ogg/lib"
-fi
-AC_CHECK_LIB(ogg, oggpack_read, LIBS="$LIBS -logg", AC_MSG_ERROR([You must have libogg to compile vorbis!!!]))
+AM_PATH_OGG(1.0.0, have_ogg=yes, have_ogg=no)
dnl --------------------------------------------------
dnl Check for library functions