Incremental update

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

diff --git a/configure.in b/configure.in
index 0df5b42..d330830 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.2 1999/07/13 07:48:13 mwhitson 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)
@@ -42,19 +42,23 @@ if test -z "$GCC"; then
                PROFILE="-g -p" ;;
         esac
 else
+
+# -D__NO_MATH_INLINES avoids some serious FP assembly related bugs in
+# glibc 2.0/2.1
+
        case $host in 
-       i?86-*-linux*)
-               DEBUG="-g -Wall -fsigned-char"
-               OPT="-O20 -ffast-math -fsigned-char"
-               PROFILE="-pg -g -O20 -fsigned-char";;
+       *-*-linux*)
+               DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+               OPT="-O20 -ffast-math -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+               PROFILE="-pg -g -O20 -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char";;
        sparc-sun-*)
-               DEBUG="-g -Wall -fsigned-char -mv8"
-               OPT="-O20 -ffast-math -fsigned-char -mv8"
-               PROFILE="-pg -g -O20 -fsigned-char -mv8" ;;
+               DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8"
+               OPT="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
+               PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
        *)
-               DEBUG="-g -Wall -fsigned-char"
-               OPT="-O20 -fsigned-char"
-               PROFILE="-O20 -g -pg -fsigned-char" ;;
+               DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+               OPT="-O20 -D__NO_MATH_INLINES -fsigned-char"
+               PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
         esac
 fi
 
@@ -115,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!)
@@ -180,4 +180,4 @@ AC_SUBST(RANLIB)
 #AC_SUBST(LIBGTKDIR)
 AC_SUBST(pthread_lib)
 
-AC_OUTPUT(Makefile lib/Makefile cmdline/Makefile)
+AC_OUTPUT(Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile xmms/Makefile)