diff --git a/configure b/configure
index 9ebd16145e..585caa2daa 100755
--- a/configure
+++ b/configure
@@ -985,8 +985,8 @@ if test "$bigendian" = "yes" ; then
   echo "WORDS_BIGENDIAN=yes" >> config.mak
   echo "#define WORDS_BIGENDIAN 1" >> $TMPH
 fi
-if test "$inttypes" = "yes" ; then
-  echo "#define HAVE_INTTYPES_H 1" >> $TMPH
+if test "$inttypes" != "yes" ; then
+  echo "#define EMULATE_INTTYPES 1" >> $TMPH
 fi
 if test "$emu_fast_int" = "yes" ; then
   echo "#define EMULATE_FAST_INT 1" >> $TMPH
diff --git a/libavcodec/common.h b/libavcodec/common.h
index ee5a4cbd82..e0e90225c0 100644
--- a/libavcodec/common.h
+++ b/libavcodec/common.h
@@ -82,7 +82,7 @@ extern const struct AVOption avoptions_workaround_bug[11];
 #    define always_inline inline
 #endif
 
-#ifdef HAVE_INTTYPES_H
+#ifndef EMULATE_INTTYPES
 #   include <inttypes.h>
 #else
     typedef signed char  int8_t;