diff options
author | Monty <xiphmont@xiph.org> | 2000-08-30 07:09:46 +0000 |
---|---|---|
committer | Monty <xiphmont@xiph.org> | 2000-08-30 07:09:46 +0000 |
commit | fc025616971725aa2d2f47a988630f247e9872e0 (patch) | |
tree | 344ab509e3da441196eda59a6d6d40789485e5a4 | |
parent | d95be10be9f8b21a40531f7969df5bf44e60c3e7 (diff) | |
download | libvorbis-git-fc025616971725aa2d2f47a988630f247e9872e0.tar.gz |
Autoconf fixes suggested by Jeff Squyres
svn path=/trunk/vorbis/; revision=607
-rwxr-xr-x | configure | 195 | ||||
-rw-r--r-- | configure.in | 23 | ||||
-rw-r--r-- | include/vorbis/codec.h | 3 | ||||
-rw-r--r-- | include/vorbis/os_types.h.in | 4 |
4 files changed, 104 insertions, 121 deletions
@@ -634,11 +634,10 @@ fi esac -if test -z "$CC"; then - # Extract the first word of "gcc", so it can be a program name with args. +# Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:642: checking for $ac_word" >&5 +echo "configure:641: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -668,7 +667,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:672: checking for $ac_word" >&5 +echo "configure:671: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -719,7 +718,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:723: checking for $ac_word" >&5 +echo "configure:722: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -751,7 +750,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:755: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:754: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -762,12 +761,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 766 "configure" +#line 765 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -793,12 +792,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:797: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:796: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:802: checking whether we are using GNU C" >&5 +echo "configure:801: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -807,7 +806,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -826,7 +825,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:830: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:829: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -857,9 +856,8 @@ else fi fi -fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:863: checking how to run the C preprocessor" >&5 +echo "configure:861: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -874,13 +872,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 878 "configure" +#line 876 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:882: \"$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 : @@ -891,13 +889,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 895 "configure" +#line 893 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:899: \"$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 : @@ -908,13 +906,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 912 "configure" +#line 910 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:916: \"$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 : @@ -941,7 +939,7 @@ echo "$ac_t""$CPP" 1>&6 # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:945: checking for $ac_word" >&5 +echo "configure:943: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -971,7 +969,7 @@ fi # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:975: checking for $ac_word" >&5 +echo "configure:973: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1000,7 +998,7 @@ fi # Extract the first word of "install", so it can be a program name with args. set dummy install; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1004: checking for $ac_word" >&5 +echo "configure:1002: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INSTALL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1031,7 +1029,7 @@ fi #AC_CHECK_LIB(m, cos, LIBS="-lm"; AC_DEFINE(HAVE_LIBM), LIBS="") # We no longer use config.h echo $ac_n "checking for cos in -lm""... $ac_c" 1>&6 -echo "configure:1035: checking for cos in -lm" >&5 +echo "configure:1033: checking for cos in -lm" >&5 ac_lib_var=`echo m'_'cos | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1039,7 +1037,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 1043 "configure" +#line 1041 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1050,7 +1048,7 @@ int main() { cos() ; return 0; } EOF -if { (eval echo configure:1054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1101,7 +1099,7 @@ else # the buggy version cat > conftest.$ac_ext <<EOF -#line 1105 "configure" +#line 1103 "configure" #include "confdefs.h" #define __LIBC_INTERNAL_MATH_INLINES 1 @@ -1121,7 +1119,7 @@ rm -f conftest* if test ${bad} = "maybe" ;then cat > conftest.$ac_ext <<EOF -#line 1125 "configure" +#line 1123 "configure" #include "confdefs.h" #define __LIBC_INTERNAL_MATH_INLINES 1 @@ -1177,12 +1175,12 @@ rm -f conftest* fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1181: checking for ANSI C header files" >&5 +echo "configure:1179: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1186 "configure" +#line 1184 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1190,7 +1188,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1192: \"$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* @@ -1207,7 +1205,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1211 "configure" +#line 1209 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1225,7 +1223,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1229 "configure" +#line 1227 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1246,7 +1244,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1250 "configure" +#line 1248 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1257,7 +1255,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1281,14 +1279,12 @@ EOF fi -CFLAGS="" - #AC_CHECK_LIB(pthread, pthread_create, # pthread_lib="-lpthread"; AC_DEFINE(HAVE_LIBPTHREAD), :) # We no longer use config.h echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:1292: checking for pthread_create in -lpthread" >&5 +echo "configure:1288: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1296,7 +1292,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 1300 "configure" +#line 1296 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1307,7 +1303,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:1311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1376,7 +1372,7 @@ dummy="__noconf" # behind the times on type madness echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:1380: checking for int16_t" >&5 +echo "configure:1376: checking for int16_t" >&5 if eval "test \"`echo '$''{'has_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1385,19 +1381,18 @@ else else cat > conftest.$ac_ext <<EOF -#line 1389 "configure" +#line 1385 "configure" #include "confdefs.h" #ifdef __BEOS__ #include <inttypes.h> -#else -#include <sys/types.h> #endif +#include <sys/types.h> int16_t foo; int main() {return 0;} EOF -if { (eval echo configure:1401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then has_int16_t=yes else @@ -1414,7 +1409,7 @@ fi echo "$ac_t""$has_int16_t" 1>&6 echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:1418: checking for int32_t" >&5 +echo "configure:1413: checking for int32_t" >&5 if eval "test \"`echo '$''{'has_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1423,19 +1418,18 @@ else else cat > conftest.$ac_ext <<EOF -#line 1427 "configure" +#line 1422 "configure" #include "confdefs.h" #ifdef __BEOS__ #include <inttypes.h> -#else -#include <sys/types.h> #endif +#include <sys/types.h> int32_t foo; int main() {return 0;} EOF -if { (eval echo configure:1439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then has_int32_t=yes else @@ -1452,7 +1446,7 @@ fi echo "$ac_t""$has_int32_t" 1>&6 echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 -echo "configure:1456: checking for uint32_t" >&5 +echo "configure:1450: checking for uint32_t" >&5 if eval "test \"`echo '$''{'has_uint32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1461,19 +1455,18 @@ else else cat > conftest.$ac_ext <<EOF -#line 1465 "configure" +#line 1459 "configure" #include "confdefs.h" #ifdef __BEOS__ #include <inttypes.h> -#else -#include <sys/types.h> #endif +#include <sys/types.h> uint32_t foo; int main() {return 0;} EOF -if { (eval echo configure:1477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then has_uint32_t=yes else @@ -1490,7 +1483,7 @@ fi echo "$ac_t""$has_uint32_t" 1>&6 echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6 -echo "configure:1494: checking for u_int32_t" >&5 +echo "configure:1487: checking for u_int32_t" >&5 if eval "test \"`echo '$''{'has_u_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1499,19 +1492,18 @@ else else cat > conftest.$ac_ext <<EOF -#line 1503 "configure" +#line 1496 "configure" #include "confdefs.h" #ifdef __BEOS__ #include <inttypes.h> -#else -#include <sys/types.h> #endif +#include <sys/types.h> u_int32_t foo; int main() {return 0;} EOF -if { (eval echo configure:1515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then has_u_int32_t=yes else @@ -1528,7 +1520,7 @@ fi echo "$ac_t""$has_u_int32_t" 1>&6 echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:1532: checking for int64_t" >&5 +echo "configure:1524: checking for int64_t" >&5 if eval "test \"`echo '$''{'has_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1537,19 +1529,18 @@ else else cat > conftest.$ac_ext <<EOF -#line 1541 "configure" +#line 1533 "configure" #include "confdefs.h" #ifdef __BEOS__ #include <inttypes.h> -#else -#include <sys/types.h> #endif +#include <sys/types.h> int64_t foo; int main() {return 0;} EOF -if { (eval echo configure:1553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then has_int64_t=yes else @@ -1566,7 +1557,7 @@ fi echo "$ac_t""$has_int64_t" 1>&6 echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:1570: checking size of short" >&5 +echo "configure:1561: 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 @@ -1574,7 +1565,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1578 "configure" +#line 1569 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1585,7 +1576,7 @@ main() exit(0); } EOF -if { (eval echo configure:1589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1580: \"$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 @@ -1605,7 +1596,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1609: checking size of int" >&5 +echo "configure:1600: 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 @@ -1613,7 +1604,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1617 "configure" +#line 1608 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1624,7 +1615,7 @@ main() exit(0); } EOF -if { (eval echo configure:1628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1619: \"$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 @@ -1644,7 +1635,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1648: checking size of long" >&5 +echo "configure:1639: 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 @@ -1652,7 +1643,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1656 "configure" +#line 1647 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1663,7 +1654,7 @@ main() exit(0); } EOF -if { (eval echo configure:1667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1658: \"$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 @@ -1683,7 +1674,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:1687: checking size of long long" >&5 +echo "configure:1678: 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 @@ -1691,7 +1682,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1695 "configure" +#line 1686 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1702,7 +1693,7 @@ main() exit(0); } EOF -if { (eval echo configure:1706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1697: \"$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 @@ -1784,17 +1775,17 @@ fi # We no longer use config.h ac_safe=`echo "alloca.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for alloca.h""... $ac_c" 1>&6 -echo "configure:1788: checking for alloca.h" >&5 +echo "configure:1779: checking for alloca.h" >&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 1793 "configure" +#line 1784 "configure" #include "confdefs.h" #include <alloca.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1789: \"$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* @@ -1818,17 +1809,17 @@ fi ac_safe=`echo "memory.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for memory.h""... $ac_c" 1>&6 -echo "configure:1822: checking for memory.h" >&5 +echo "configure:1813: checking for memory.h" >&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 1827 "configure" +#line 1818 "configure" #include "confdefs.h" #include <memory.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1823: \"$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* @@ -1852,12 +1843,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1856: checking for working const" >&5 +echo "configure:1847: 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 1861 "configure" +#line 1852 "configure" #include "confdefs.h" int main() { @@ -1906,7 +1897,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:1910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1927,12 +1918,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1931: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1922: 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 1936 "configure" +#line 1927 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -1941,7 +1932,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1962,12 +1953,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:1966: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:1957: 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 1971 "configure" +#line 1962 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -1975,7 +1966,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -1997,7 +1988,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:2001: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1992: 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 @@ -2024,7 +2015,7 @@ else fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2028: checking for 8-bit clean memcmp" >&5 +echo "configure:2019: 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 @@ -2032,7 +2023,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <<EOF -#line 2036 "configure" +#line 2027 "configure" #include "confdefs.h" main() @@ -2042,7 +2033,7 @@ main() } EOF -if { (eval echo configure:2046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2037: \"$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 @@ -2060,12 +2051,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:2064: checking return type of signal handlers" >&5 +echo "configure:2055: 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 2069 "configure" +#line 2060 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2082,7 +2073,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2103,12 +2094,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:2107: checking for $ac_func" >&5 +echo "configure:2098: 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 2112 "configure" +#line 2103 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2131,7 +2122,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2126: \"$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 diff --git a/configure.in b/configure.in index cd7d1552..56732495 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.21 2000/08/30 06:09:21 xiphmont Exp $ +# $Id: configure.in,v 1.22 2000/08/30 07:09:46 xiphmont Exp $ AC_INIT(lib/mdct.c) #AC_CONFIG_HEADER(config.h) @@ -25,9 +25,7 @@ case $host in esac -if test -z "$CC"; then - AC_PROG_CC -fi +AC_PROG_CC AC_PROG_CPP AC_PROG_RANLIB AC_CHECK_PROG(AR,ar,ar) @@ -118,8 +116,6 @@ fi AC_HEADER_STDC -CFLAGS="" - dnl AC_PATH_X dnl AC_PATH_XTRA @@ -184,9 +180,8 @@ AC_CACHE_VAL(has_int16_t, [AC_TRY_RUN([ #ifdef __BEOS__ #include <inttypes.h> -#else -#include <sys/types.h> #endif +#include <sys/types.h> int16_t foo; int main() {return 0;} ], @@ -201,9 +196,8 @@ AC_CACHE_VAL(has_int32_t, [AC_TRY_RUN([ #ifdef __BEOS__ #include <inttypes.h> -#else -#include <sys/types.h> #endif +#include <sys/types.h> int32_t foo; int main() {return 0;} ], @@ -218,9 +212,8 @@ AC_CACHE_VAL(has_uint32_t, [AC_TRY_RUN([ #ifdef __BEOS__ #include <inttypes.h> -#else -#include <sys/types.h> #endif +#include <sys/types.h> uint32_t foo; int main() {return 0;} ], @@ -235,9 +228,8 @@ AC_CACHE_VAL(has_u_int32_t, [AC_TRY_RUN([ #ifdef __BEOS__ #include <inttypes.h> -#else -#include <sys/types.h> #endif +#include <sys/types.h> u_int32_t foo; int main() {return 0;} ], @@ -252,9 +244,8 @@ AC_CACHE_VAL(has_int64_t, [AC_TRY_RUN([ #ifdef __BEOS__ #include <inttypes.h> -#else -#include <sys/types.h> #endif +#include <sys/types.h> int64_t foo; int main() {return 0;} ], diff --git a/include/vorbis/codec.h b/include/vorbis/codec.h index ff2f31fe..38e24fc2 100644 --- a/include/vorbis/codec.h +++ b/include/vorbis/codec.h @@ -12,7 +12,7 @@ ******************************************************************** function: libvorbis codec headers - last mod: $Id: codec.h,v 1.28 2000/08/30 06:09:21 xiphmont Exp $ + last mod: $Id: codec.h,v 1.29 2000/08/30 07:09:46 xiphmont Exp $ ********************************************************************/ @@ -26,7 +26,6 @@ extern "C" #define MAX_BARK 27 -#include <sys/types.h> #include "os_types.h" #include "vorbis/codebook.h" #include "vorbis/internal.h" diff --git a/include/vorbis/os_types.h.in b/include/vorbis/os_types.h.in index ab783c21..f4638a66 100644 --- a/include/vorbis/os_types.h.in +++ b/include/vorbis/os_types.h.in @@ -14,7 +14,7 @@ ******************************************************************** function: #ifdef jail to whip a few platforms into the UNIX ideal. - last mod: $Id: os_types.h.in,v 1.2 2000/08/30 06:26:49 xiphmont Exp $ + last mod: $Id: os_types.h.in,v 1.3 2000/08/30 07:09:46 xiphmont Exp $ ********************************************************************/ @@ -43,6 +43,8 @@ typedef _G_int16_t ogg_int16_t; #include <inttypes.h> #endif +#include <sys/types.h> + /* filled in by configure */ typedef @SIZE16@ ogg_int16_t; typedef @SIZE32@ ogg_int32_t; |