Commit ce430766 authored by Monty's avatar Monty
Browse files

Incremental update toward VQ integration, vorbis_info rearrangement

Monty

svn path=/trunk/vorbis/; revision=234
parent 85fb0bc2
......@@ -1224,10 +1224,8 @@ dummy="__noconf"
# X_LIBS="-L${srcdir}/libgtk/gtk/.libs -L${srcdir}/libgtk/gdk/.libs -L${srcdir}/libgtk/glib/.libs $X_LIBS"
#fi
TYPESIZES=""
echo $ac_n "checking size of short""... $ac_c" 1>&6
echo "configure:1231: checking size of short" >&5
echo "configure:1229: checking size of short" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -1235,7 +1233,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
#line 1239 "configure"
#line 1237 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
......@@ -1246,7 +1244,7 @@ main()
exit(0);
}
EOF
if { (eval echo configure:1250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:1248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_short=`cat conftestval`
else
......@@ -1266,7 +1264,7 @@ EOF
echo $ac_n "checking size of int""... $ac_c" 1>&6
echo "configure:1270: checking size of int" >&5
echo "configure:1268: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -1274,7 +1272,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
#line 1278 "configure"
#line 1276 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
......@@ -1285,7 +1283,7 @@ main()
exit(0);
}
EOF
if { (eval echo configure:1289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:1287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
......@@ -1305,7 +1303,7 @@ EOF
echo $ac_n "checking size of long""... $ac_c" 1>&6
echo "configure:1309: checking size of long" >&5
echo "configure:1307: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -1313,7 +1311,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
#line 1317 "configure"
#line 1315 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
......@@ -1324,7 +1322,7 @@ main()
exit(0);
}
EOF
if { (eval echo configure:1328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:1326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
......@@ -1344,7 +1342,7 @@ EOF
echo $ac_n "checking size of long long""... $ac_c" 1>&6
echo "configure:1348: checking size of long long" >&5
echo "configure:1346: checking size of long long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -1352,7 +1350,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
#line 1356 "configure"
#line 1354 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
......@@ -1363,7 +1361,7 @@ main()
exit(0);
}
EOF
if { (eval echo configure:1367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:1365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_long=`cat conftestval`
else
......@@ -1384,30 +1382,220 @@ EOF
case 2 in
$ac_cv_sizeof_short) TYPESIZES="$TYPESIZES -Dsize16='short'"
SIZE16=TRUE;;
$ac_cv_sizeof_int) TYPESIZES="$TYPESIZES -Dsize16='int'"
SIZE16=TRUE;;
$ac_cv_sizeof_short) SIZE16="short";;
$ac_cv_sizeof_int) SIZE16="int";;
esac
case 4 in
$ac_cv_sizeof_short) TYPESIZES="$TYPESIZES -Dsize32='short'"
SIZE32=TRUE;;
$ac_cv_sizeof_int) TYPESIZES="$TYPESIZES -Dsize32='int'"
SIZE32=TRUE;;
$ac_cv_sizeof_long) TYPESIZES="$TYPESIZES -Dsize32='long'"
SIZE32=TRUE;;
$ac_cv_sizeof_short) SIZE32="short";;
$ac_cv_sizeof_int) SIZE32="int";;
$ac_cv_sizeof_long) SIZE32="long";;
esac
case 8 in
$ac_cv_sizeof_int) TYPESIZES="$TYPESIZES -Dsize64='int'"
SIZE64=TRUE;;
$ac_cv_sizeof_long) TYPESIZES="$TYPESIZES -Dsize64='long'"
SIZE64=TRUE;;
$ac_cv_sizeof_long_long) TYPESIZES="$TYPESIZES -Dsize64='long long'"
SIZE64=TRUE;;
$ac_cv_sizeof_int) SIZE64="int";;
$ac_cv_sizeof_long) SIZE64="long";;
$ac_cv_sizeof_long_long) SIZE64="long long";;
esac
echo $ac_n "checking for int16_t""... $ac_c" 1>&6
echo "configure:1403: checking for int16_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_int16_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1408 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "(^|[^a-zA-Z_0-9])int16_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_int16_t=yes
else
rm -rf conftest*
ac_cv_type_int16_t=no
fi
rm -f conftest*
fi
echo "$ac_t""$ac_cv_type_int16_t" 1>&6
if test $ac_cv_type_int16_t = no; then
cat >> confdefs.h <<\EOF
#define int16_t $SIZE16
EOF
fi
echo $ac_n "checking for int32_t""... $ac_c" 1>&6
echo "configure:1436: checking for int32_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1441 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "(^|[^a-zA-Z_0-9])int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_int32_t=yes
else
rm -rf conftest*
ac_cv_type_int32_t=no
fi
rm -f conftest*
fi
echo "$ac_t""$ac_cv_type_int32_t" 1>&6
if test $ac_cv_type_int32_t = no; then
cat >> confdefs.h <<\EOF
#define int32_t $SIZE32
EOF
fi
echo $ac_n "checking for int64_t""... $ac_c" 1>&6
echo "configure:1469: checking for int64_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_int64_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1474 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "(^|[^a-zA-Z_0-9])int64_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_int64_t=yes
else
rm -rf conftest*
ac_cv_type_int64_t=no
fi
rm -f conftest*
fi
echo "$ac_t""$ac_cv_type_int64_t" 1>&6
if test $ac_cv_type_int64_t = no; then
cat >> confdefs.h <<\EOF
#define int64_t $SIZE64
EOF
fi
echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6
echo "configure:1502: checking for u_int16_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_u_int16_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1507 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "(^|[^a-zA-Z_0-9])u_int16_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_u_int16_t=yes
else
rm -rf conftest*
ac_cv_type_u_int16_t=no
fi
rm -f conftest*
fi
echo "$ac_t""$ac_cv_type_u_int16_t" 1>&6
if test $ac_cv_type_u_int16_t = no; then
cat >> confdefs.h <<\EOF
#define u_int16_t unsigned $SIZE16
EOF
fi
echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6
echo "configure:1535: checking for u_int32_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1540 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "(^|[^a-zA-Z_0-9])u_int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_u_int32_t=yes
else
rm -rf conftest*
ac_cv_type_u_int32_t=no
fi
rm -f conftest*
fi
echo "$ac_t""$ac_cv_type_u_int32_t" 1>&6
if test $ac_cv_type_u_int32_t = no; then
cat >> confdefs.h <<\EOF
#define u_int32_t unsigned $SIZE32
EOF
fi
echo $ac_n "checking for u_int64_t""... $ac_c" 1>&6
echo "configure:1568: checking for u_int64_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_u_int64_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1573 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "(^|[^a-zA-Z_0-9])u_int64_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_u_int64_t=yes
else
rm -rf conftest*
ac_cv_type_u_int64_t=no
fi
rm -f conftest*
fi
echo "$ac_t""$ac_cv_type_u_int64_t" 1>&6
if test $ac_cv_type_u_int64_t = no; then
cat >> confdefs.h <<\EOF
#define u_int64_t unsigned $SIZE64
EOF
fi
if test -z "$SIZE16"; then
{ echo "configure: error: No 16 bit type found on this platform!" 1>&2; exit 1; }
......@@ -1420,12 +1608,12 @@ if test -z "$SIZE64"; then
fi
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
echo "configure:1424: checking for sys/wait.h that is POSIX.1 compatible" >&5
echo "configure:1612: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1429 "configure"
#line 1617 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
......@@ -1441,7 +1629,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
if { (eval echo configure:1445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
......@@ -1465,17 +1653,17 @@ for ac_hdr in fcntl.h limits.h sys/ioctl.h sys/time.h unistd.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1469: checking for $ac_hdr" >&5
echo "configure:1657: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1474 "configure"
#line 1662 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
......@@ -1503,12 +1691,12 @@ done
echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:1507: checking for working const" >&5
echo "configure:1695: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1512 "configure"
#line 1700 "configure"
#include "confdefs.h"
int main() {
......@@ -1557,7 +1745,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
if { (eval echo configure:1561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
......@@ -1578,12 +1766,12 @@ EOF
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
echo "configure:1582: checking whether time.h and sys/time.h may both be included" >&5
echo "configure:1770: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1587 "configure"
#line 1775 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
......@@ -1592,7 +1780,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
if { (eval echo configure:1596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
......@@ -1613,12 +1801,12 @@ EOF
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
echo "configure:1617: checking whether struct tm is in sys/time.h or time.h" >&5
echo "configure:1805: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1622 "configure"
#line 1810 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
......@@ -1626,7 +1814,7 @@ int main() {
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
if { (eval echo configure:1630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
......@@ -1648,7 +1836,7 @@ fi
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:1652: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo "configure:1840: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -1675,7 +1863,7 @@ else
fi
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
echo "configure:1679: checking for 8-bit clean memcmp" >&5
echo "configure:1867: checking for 8-bit clean memcmp" >&5
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -1683,7 +1871,7 @@ else
ac_cv_func_memcmp_clean=no
else
cat > conftest.$ac_ext <<EOF
#line 1687 "configure"
#line 1875 "configure"
#include "confdefs.h"
main()
......@@ -1693,7 +1881,7 @@ main()
}
EOF
if { (eval echo configure:1697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:1885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_memcmp_clean=yes
else
......@@ -1711,12 +1899,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
echo "configure:1715: checking return type of signal handlers" >&5
echo "configure:1903: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1720 "configure"
#line 1908 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
......@@ -1733,7 +1921,7 @@ int main() {
int i;
; return 0; }
EOF
if { (eval echo configure:1737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
......@@ -1754,12 +1942,12 @@ EOF
for ac_func in gettimeofday select strcspn strerror strspn sigaction
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:1758: checking for $ac_func" >&5
echo "configure:1946: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1763 "configure"
#line 1951 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
......@@ -1782,7 +1970,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
......
# $Id: configure.in,v 1.8 1999/12/30 07:26:25 xiphmont Exp $
# $Id: configure.in,v 1.9 2000/01/12 11:34:34 xiphmont Exp $
AC_INIT(lib/mdct.c)
#AC_CONFIG_HEADER(config.h)
......@@ -119,38 +119,34 @@ dummy="__noconf"
# X_LIBS="-L${srcdir}/libgtk/gtk/.libs -L${srcdir}/libgtk/gdk/.libs -L${srcdir}/libgtk/glib/.libs $X_LIBS"
#fi
TYPESIZES=""
AC_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(long long)
case 2 in
$ac_cv_sizeof_short) TYPESIZES="$TYPESIZES -Dsize16='short'"
SIZE16=TRUE;;
$ac_cv_sizeof_int) TYPESIZES="$TYPESIZES -Dsize16='int'"
SIZE16=TRUE;;
$ac_cv_sizeof_short) SIZE16="short";;
$ac_cv_sizeof_int) SIZE16="int";;
esac
case 4 in
$ac_cv_sizeof_short) TYPESIZES="$TYPESIZES -Dsize32='short'"
SIZE32=TRUE;;
$ac_cv_sizeof_int) TYPESIZES="$TYPESIZES -Dsize32='int'"
SIZE32=TRUE;;
$ac_cv_sizeof_long) TYPESIZES="$TYPESIZES -Dsize32='long'"
SIZE32=TRUE;;
$ac_cv_sizeof_short) SIZE32="short";;
$ac_cv_sizeof_int) SIZE32="int";;
$ac_cv_sizeof_long) SIZE32="long";;
esac
case 8 in
$ac_cv_sizeof_int) TYPESIZES="$TYPESIZES -Dsize64='int'"
SIZE64=TRUE;;
$ac_cv_sizeof_long) TYPESIZES="$TYPESIZES -Dsize64='long'"
SIZE64=TRUE;;
$ac_cv_sizeof_long_long) TYPESIZES="$TYPESIZES -Dsize64='long long'"
SIZE64=TRUE;;
$ac_cv_sizeof_int) SIZE64="int";;
$ac_cv_sizeof_long) SIZE64="long";;
$ac_cv_sizeof_long_long) SIZE64="long long";;
esac
AC_CHECK_TYPE(int16_t,$SIZE16)
AC_CHECK_TYPE(int32_t,$SIZE32)
AC_CHECK_TYPE(int64_t,$SIZE64)
AC_CHECK_TYPE(u_int16_t,unsigned $SIZE16)
AC_CHECK_TYPE(u_int32_t,unsigned $SIZE32)
AC_CHECK_TYPE(u_int64_t,unsigned $SIZE64)
if test -z "$SIZE16"; then
AC_MSG_ERROR(No 16 bit type found on this platform!)
......
......@@ -12,7 +12,7 @@
********************************************************************
function: codebook types
last mod: $Id: codebook.h,v 1.1 2000/01/05 03:10:47 xiphmont Exp $
last mod: $Id: codebook.h,v 1.2 2000/01/12 11:34:35 xiphmont Exp $
********************************************************************/
......@@ -59,8 +59,6 @@ typedef struct encode_aux{
long *ptr0;
long *ptr1;
double *n; /* decision hyperplanes: sum(x_i*n_i)[0<=i<dim]=c */
double *c; /* decision hyperplanes: sum(x_i*n_i)[0<=i<dim]=c */
long *p; /* decision points (each is an entry) */
long *q; /* decision points (each is an entry) */
long aux; /* number of tree entries */
......@@ -70,8 +68,11 @@ typedef struct encode_aux{
typedef struct decode_aux{
long *ptr0;
long *ptr1;
long aux; /* number of tree entries */
} decode_aux;
#define VQ_FEXP_BIAS 20 /* bias toward values smaller than 1. */
#endif
......
......@@ -12,26 +12,14 @@
********************************************************************
function: libvorbis codec headers
last mod: $Id: codec.h,v 1.1 2000/01/05 03:10:47 xiphmont Exp $
last mod: $Id: codec.h,v 1.2 2000/01/12 11:34:37 xiphmont Exp $
********************************************************************/
#ifndef _vorbis_codec_h_
#define _vorbis_codec_h_
#include <sys/types.h> /* get BSD style 16/32/64 bit types */
/* if no BSD width types, get them from the configure script */