Fix k9copy FTBFS due to incorrect libavcodec configure checks

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k9copy@1233810 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
13 years ago · 6f1d13b519
parent 7e96f17ac1
commit 6f1d13b519
2 changed files with 12 additions and 1 deletions
--- a/configure.in
+++ b/configure.in
@ -99,12 +99,17 @@ AC_CHECK_HEADER([GL/gl.h], \
 [AC_DEFINE(HAVE_OPENGL, 1, [openGL support]) have_gl=yes], \
 [AC_DEFINE(NO_OPENGL, 1, [No openGL support])])

-
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+cxx_flags_safe="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
 AC_CHECK_HEADER([ffmpeg/avcodec.h], \
 [AC_DEFINE(OLD_FFMPEG,1, [old ffmpeg])], \
  [AC_CHECK_HEADER([libavcodec/avcodec.h], \
   [AC_DEFINE(NEW_FFMPEG,1, [new ffmpeg])], \
   [AC_MSG_ERROR([libavcodec may be missing]) ])])
+CXXFLAGS="$cxx_flags_safe"
+AC_LANG_RESTORE

 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
--- a/configure.in.in
+++ b/configure.in.in
@ -43,11 +43,17 @@ AC_CHECK_HEADER([GL/gl.h], \
 [AC_DEFINE(NO_OPENGL, 1, [No openGL support])])


+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+cxx_flags_safe="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
 AC_CHECK_HEADER([ffmpeg/avcodec.h], \
 [AC_DEFINE(OLD_FFMPEG,1, [old ffmpeg])], \
  [AC_CHECK_HEADER([libavcodec/avcodec.h], \
   [AC_DEFINE(NEW_FFMPEG,1, [new ffmpeg])], \
   [AC_MSG_ERROR([libavcodec may be missing]) ])])
+CXXFLAGS="$cxx_flags_safe"
+AC_LANG_RESTORE

 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS