diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-27 20:13:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-27 20:13:39 +0000 |
| commit | 6f1d13b519fc01e95837fde2e5b250b9901fb7bd (patch) | |
| tree | 0d61e556b508d822a46639cd92dec8f54de7b8bb | |
| parent | 7e96f17ac1107950c215559315f1591ec1107d82 (diff) | |
| download | k9copy-6f1d13b519fc01e95837fde2e5b250b9901fb7bd.tar.gz k9copy-6f1d13b519fc01e95837fde2e5b250b9901fb7bd.zip | |
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
| -rw-r--r-- | configure.in | 7 | ||||
| -rwxr-xr-x | configure.in.in | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/configure.in b/configure.in index a930bfa..8c99b48 100644 --- 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 diff --git a/configure.in.in b/configure.in.in index 521ade7..b0446b2 100755 --- 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 |