[poppler] cmake/modules configure.ac

Albert Astals Cid aacid at kemper.freedesktop.org
Tue Jan 14 11:27:54 PST 2014


 cmake/modules/PopplerMacros.cmake |    5 -----
 configure.ac                      |   15 ---------------
 2 files changed, 20 deletions(-)

New commits:
commit c8a845cf7c7752d3b7dad06013d3154812c66c92
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Jan 14 20:26:59 2014 +0100

    Do not define -ansi
    
    We are using long long that is not defined in ansi, so forcing ansi strictness does
    not make any sense. Bug #72499

diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
index 04dfc46..27ba7af 100644
--- a/cmake/modules/PopplerMacros.cmake
+++ b/cmake/modules/PopplerMacros.cmake
@@ -116,11 +116,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
   set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
 
-  if(CMAKE_SYSTEM_NAME MATCHES Linux)
-    set(DEFAULT_COMPILE_WARNINGS_YES "${DEFAULT_COMPILE_WARNINGS_YES} -ansi")
-    set(DEFAULT_COMPILE_WARNINGS_KDE "${DEFAULT_COMPILE_WARNINGS_KDE} -ansi")
-  endif(CMAKE_SYSTEM_NAME MATCHES Linux)
-
   poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
   if(GCC_HAS_AS_NEEDED)
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
diff --git a/configure.ac b/configure.ac
index 9c5c7ee..9d91229 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,21 +25,6 @@ AC_PROG_CC_STDC
 #  CXX="gcc"
 #fi
 AC_PROG_CXX
-if test "x$GXX" = "xyes"; then
-  case "$host_os" in
-    cygwin* | mingw*)
-    ;;
-    *)
-      case "${CXXFLAGS}" in
-      *-std=*)
-        ;;
-      *)
-        CXXFLAGS="$CXXFLAGS -ansi"
-        ;;
-      esac
-    ;;
-  esac
-fi
 AC_PROG_INSTALL
 
 dnl ##### Check for pkgconfig


More information about the poppler mailing list