dnl ------------------------------------------------
-AC_INIT([libvorbis],[1.2.1svn],[vorbis-dev@xiph.org])
+AC_INIT([libvorbis],[1.3.5],[vorbis-dev@xiph.org])
AC_CONFIG_SRCDIR([lib/mdct.c])
AC_CANONICAL_TARGET([])
-AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
-AM_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE
+AM_MAINTAINER_MODE
dnl Add parameters for aclocal
AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
dnl - interfaces removed -> AGE = 0
V_LIB_CURRENT=4
-V_LIB_REVISION=1
+V_LIB_REVISION=8
V_LIB_AGE=4
+
VF_LIB_CURRENT=6
-VF_LIB_REVISION=0
+VF_LIB_REVISION=7
VF_LIB_AGE=3
+
VE_LIB_CURRENT=2
-VE_LIB_REVISION=4
+VE_LIB_REVISION=10
VE_LIB_AGE=0
+
AC_SUBST(V_LIB_CURRENT)
AC_SUBST(V_LIB_REVISION)
AC_SUBST(V_LIB_AGE)
AC_C_INLINE
-AM_PROG_LIBTOOL
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
AM_PROG_CC_C_O
-dnl docbook xml transform and processing tools
+dnl Check for doxygen
+if test "x$enable_docs" = xyes; then
+ AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)
+ if test $HAVE_DOXYGEN = "false"; then
+ AC_MSG_WARN([*** doxygen not found, API documentation will not be built])
+ fi
+else
+ HAVE_DOXYGEN=false
+fi
+AM_CONDITIONAL(HAVE_DOXYGEN,$HAVE_DOXYGEN)
+
+dnl latex tools for the specification document
AC_ARG_ENABLE(docs,
- [ --enable-docs build the documentation],
- [case "${enableval}" in
- yes) build_docs=true;;
- no) build_docs=false;;
- *) AC_MSG_ERROR(unknown value ${enableval} for --enable-docs);;
- esac],[build_docs=false])
-
-dnl ideally we'd look for other tools and support them
-if test x$build_docs = xtrue; then
- AC_CHECK_PROGS([XSLTPROC], xsltproc, [/bin/false])
- AC_CHECK_PROGS([PDFXMLTEX], pdfxmltex, [/bin/false])
- if test "x$XSLTPROC" = "x/bin/false" || test "x$PDFXMLTEX" = "x/bin/false"; then
- build_docs=false
+ AC_HELP_STRING([--enable-docs], [build the documentation]))
+
+if test "x$enable_docs" = xyes; then
+ AC_CHECK_PROGS([PDFLATEX], pdflatex, [/bin/false])
+ AC_CHECK_PROGS([HTLATEX], htlatex, [/bin/false])
+ if test "x$PDFLATEX" = x/bin/false || test "x$HTLATEX" = x/bin/false; then
+ enable_docs=no
AC_MSG_WARN([Documentation will not be built!])
fi
fi
-AM_CONDITIONAL(BUILD_DOCS, [test x$build_docs = xtrue])
+AM_CONDITIONAL(BUILD_DOCS, [test "x$enable_docs" = xyes])
+
+AC_ARG_ENABLE(examples,
+ AS_HELP_STRING([--enable-examples], [build the examples]))
+
+AM_CONDITIONAL(BUILD_EXAMPLES, [test "x$enable_examples" = xyes])
dnl --------------------------------------------------
dnl Set build flags based on environment
AC_MSG_WARN([* machine. Upgrading to glibc 2.1.3 is strongly urged *])
AC_MSG_WARN([* to correct the problem. Note that upgrading glibc *])
AC_MSG_WARN([* will not fix any previously built programs; this is *])
- AC_MSG_WARN([* a compile-time time bug. *])
+ AC_MSG_WARN([* a compile-time bug. *])
AC_MSG_WARN([* To work around the problem for this build of Ogg, *])
AC_MSG_WARN([* autoconf is disabling all math inlining. This will *])
AC_MSG_WARN([* hurt Ogg performace but is necessary for an Ogg that *])
CFLAGS=${OPT}" -D__NO_MATH_INLINES"
PROFILE=${PROFILE}" -D__NO_MATH_INLINES"
fi;;
+ powerpc-*-linux*spe)
+ DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES"
+ CFLAGS="-O3 -Wall -Wextra -ffast-math -mfused-madd -D_REENTRANT"
+ PROFILE="-pg -g -O3 -ffast-math -mfused-madd -D_REENTRANT";;
powerpc-*-linux*)
DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES"
CFLAGS="-O3 -Wall -Wextra -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
CFLAGS="-O20 -Wall -Wextra -ffast-math -D_REENTRANT -fsigned-char"
PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
sparc-sun-*)
- DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char -mv8"
- CFLAGS="-O20 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
+ sparc_cpu=""
+ AC_MSG_CHECKING([if gcc supports -mv8])
+ old_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS -mv8"
+ AC_TRY_COMPILE(, [return 0;], [
+ AC_MSG_RESULT([yes])
+ sparc_cpu="-mv8"
+ ])
+ CFLAGS="$old_cflags"
+ DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char $sparc_cpu"
+ CFLAGS="-O20 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES -fsigned-char $sparc_cpu"
+ PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
*-*-darwin*)
DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
- *)
+ *-*-os2*)
+ # Use -W instead of -Wextra because gcc on OS/2 is an old version.
+ DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+ CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char"
+ PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
+ *)
DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
AC_CHECK_LIB(m, cos, VORBIS_LIBS="-lm", VORBIS_LIBS="")
AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)
+PKG_PROG_PKG_CONFIG
+
HAVE_OGG=no
-dnl first check through pkg-config
-dnl check for pkg-config itself so we don't try the m4 macro without pkg-config
-AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
-if test "x$HAVE_PKG_CONFIG" = "xyes"
+if test "x$PKG_CONFIG" != "x"
then
PKG_CHECK_MODULES(OGG, ogg >= 1.0, HAVE_OGG=yes, HAVE_OGG=no)
fi
dnl to be replaced if the build system has a more recent version.
AC_SUBST(LIBTOOL_DEPS)
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
m4/Makefile
lib/Makefile
lib/books/coupled/Makefile
lib/books/uncoupled/Makefile
lib/books/floor/Makefile
-doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile
+doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile doc/libvorbis/Makefile
+doc/Doxyfile
include/Makefile include/vorbis/Makefile
examples/Makefile
test/Makefile
vorbisenc-uninstalled.pc
vorbisfile-uninstalled.pc
])
+AC_CONFIG_HEADERS([config.h])
+
+AC_OUTPUT