diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-05-25 03:13:13 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-06-08 15:50:12 +0200 |
| commit | 255733d7924015ffe4950caa1bdff8f85b549e8b (patch) | |
| tree | 1f9c281b2e12b03fbc8f7ae00fbf74c93af7ba30 | |
| parent | e8216a0c1e01f9ae166bebaa2dac9c171c85056c (diff) | |
| download | gwenview-255733d7924015ffe4950caa1bdff8f85b549e8b.tar.gz gwenview-255733d7924015ffe4950caa1bdff8f85b549e8b.zip | |
Define QT_CLEAN_NAMESPACE during libmng checksv3.5.13.2
(cherry picked from commit 59c7639f5e9f3ef40b06cb0e011216cc748e3f85)
| -rw-r--r-- | configure.in.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.in.in b/configure.in.in index f51154e..46b57f4 100644 --- a/configure.in.in +++ b/configure.in.in @@ -98,6 +98,8 @@ AC_SUBST(GV_ASM_DEFS) # libmng check (for gvmngformattype.*) # LIBMNG= +CXXFLAGS_SAVE="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE" KDE_CHECK_HEADER(libmng.h, [ KDE_CHECK_LIB(mng, mng_initialize, @@ -106,6 +108,7 @@ KDE_CHECK_HEADER(libmng.h, LIBMNG="-lmng $LIBZ -lm" ], [], $LIBZ -lm) ]) +CXXFLAGS="$CXXFLAGS_SAVE" AC_SUBST(LIBMNG) if test -z "$LIBMNG"; then AC_WARN([Can't find libmng.h, Gwenview won't be compiled with MNG support]) |