diff --git a/configure.ac b/configure.ac index 2cd2d1e..1de0c23 100644 --- a/configure.ac +++ b/configure.ac @@ -334,6 +334,12 @@ AC_SUBST([USIZE16]) AC_SUBST([SIZE32]) AC_SUBST([USIZE32]) +AS_IF([test "$ac_cv_header_stdint_h" = "yes"], [INCLUDE_STDINT="#include <stdint.h>"], + [test "$ac_cv_header_inttypes_h" = "yes"], [INCLUDE_STDINT="#include <inttypes.h>"], + [test "$ac_cv_header_sys_types_h" = "yes"], [INCLUDE_STDINT="#include <sys/types.h>"]) + +AC_SUBST([INCLUDE_STDINT]) + AC_CONFIG_FILES([ Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec include/Makefile include/speex/Makefile speexdsp.pc diff --git a/include/speex/speexdsp_config_types.h.in b/include/speex/speexdsp_config_types.h.in index 02b82fd..5ea7b55 100644 --- a/include/speex/speexdsp_config_types.h.in +++ b/include/speex/speexdsp_config_types.h.in @@ -1,13 +1,7 @@ #ifndef __SPEEX_TYPES_H__ #define __SPEEX_TYPES_H__ -#if defined HAVE_STDINT_H -# include <stdint.h> -#elif defined HAVE_INTTYPES_H -# include <inttypes.h> -#elif defined HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif +@INCLUDE_STDINT@ typedef @SIZE16@ spx_int16_t; typedef @USIZE16@ spx_uint16_t;