Fix to segfault unpacking a sparse book

[platform/upstream/libvorbis.git] / configure.in

diff --git a/configure.in b/configure.in
index 77f614e..467c292 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,19 +5,19 @@ dnl Initialization and Versioning
 dnl ------------------------------------------------
 
 AC_INIT(lib/mdct.c)
-AM_INIT_AUTOMAKE(libvorbis,1.0rc2)
+AM_INIT_AUTOMAKE(libvorbis,1.0rc3)
 
 dnl Library versioning
 
-V_LIB_CURRENT=0
-V_LIB_REVISION=1
-V_LIB_AGE=0
-VF_LIB_CURRENT=1
+V_LIB_CURRENT=1
+V_LIB_REVISION=0
+V_LIB_AGE=1
+VF_LIB_CURRENT=2
 VF_LIB_REVISION=0
-VF_LIB_AGE=1
-VE_LIB_CURRENT=0
-VE_LIB_REVISION=1
-VE_LIB_AGE=0
+VF_LIB_AGE=2
+VE_LIB_CURRENT=1
+VE_LIB_REVISION=0
+VE_LIB_AGE=1
 AC_SUBST(V_LIB_CURRENT)
 AC_SUBST(V_LIB_REVISION)
 AC_SUBST(V_LIB_AGE)
@@ -75,10 +75,10 @@ else
 
        case $host in 
        *86-*-linux*)
-               DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+               DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
                CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
 #                      PROFILE="-Wall -W -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
-               PROFILE="-Wall -W -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline -static"
+               PROFILE="-Wall -W -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
 
                # glibc < 2.1.3 has a serious FP bug in the math inline header
                # that will cripple Vorbis.  Look to see if the magic FP stack
@@ -120,11 +120,11 @@ else
                PROFILE=${PROFILE}" -D__NO_MATH_INLINES"
                fi;;
        *-*-linux*)
-               DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+               DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
                CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
                PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
        sparc-sun-*)
-               DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8"
+               DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char -mv8"
                CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
                PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
        *-*-darwin*)
@@ -132,7 +132,7 @@ else
                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";;
        *)
-               DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+               DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char"
                CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
                PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
         esac
@@ -159,7 +159,7 @@ dnl --------------------------------------------------
 AC_CHECK_LIB(m, cos, LIBS="-lm", LIBS="")
 AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)
 
-AM_PATH_OGG(LIBS="$LIBS $OGG_LIBS", AC_MSG_ERROR(must have Ogg installed!))
+AM_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
 
 dnl --------------------------------------------------
 dnl Check for library functions
@@ -180,8 +180,11 @@ dnl --------------------------------------------------
 dnl Do substitutions
 dnl --------------------------------------------------
 
+LIBS="$LIBS $OGG_LIBS"
+
+AC_SUBST(LIBS)
 AC_SUBST(DEBUG)
 AC_SUBST(PROFILE)
 AC_SUBST(pthread_lib)
 
-AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile include/Makefile include/vorbis/Makefile examples/Makefile win32/Makefile debian/Makefile vq/Makefile)
+AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile lib/books/coupled/Makefile lib/books/uncoupled/Makefile lib/books/floor/Makefile doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile include/Makefile include/vorbis/Makefile examples/Makefile win32/Makefile debian/Makefile vq/Makefile)