summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5737e7a)
raw | patch | inline | side by side (parent: 5737e7a)
author | Krzysztof Kosiński <tweenk.pl@gmail.com> | |
Tue, 23 Feb 2010 19:03:50 +0000 (20:03 +0100) | ||
committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | |
Tue, 23 Feb 2010 19:03:50 +0000 (20:03 +0100) |
contains only information relevant to this particular error.
Also perform the check earlier during configure.
Also perform the check earlier during configure.
configure.ac | patch | blob | history |
diff --git a/configure.ac b/configure.ac
index eb5c22c5a545d875d87872576f5100c282075578..ca49d5f54cfd3192f73a7ff2498bb6d1e1c99476 100644 (file)
--- a/configure.ac
+++ b/configure.ac
fi
fi
+# Test for broken unordered_set on GCC 4.0.0, shipped with Apple XCode tools
+# This is a system header so we check it as soon as possible
+AC_MSG_CHECKING([TR1 unordered_set usability])
+AC_COMPILE_IFELSE([
+#include <tr1/unordered_set>
+int main() {
+ std::tr1::unordered_set<int> i, j;
+ i = j;
+ return 0;
+}
+], [unordered_set_broken=no], [unordered_set_broken=yes])
+if test "x$unordered_set_broken" = "xyes"; then
+ AC_MSG_RESULT([broken])
+ AC_MSG_ERROR([
+You have a broken version of the <tr1/unordered_set> header. See
+http://wiki.inkscape.org/wiki/index.php/HashtableFixOSX
+for information on how to fix this problem.])
+else
+ AC_MSG_RESULT([ok])
+fi
+
+# Test whether GCC emits a spurious warning when using boost::optional
+# If yes, turn off strict aliasing warnings to reduce noise
+# and allow the legitimate warnings to stand out
+AC_MSG_CHECKING([for overzealous strict aliasing warnings])
+ignore_strict_aliasing=no
+CXXFLAGS_SAVE=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS -Werror=strict-aliasing"
+AC_COMPILE_IFELSE([
+#include <boost/optional.hpp>
+boost::optional<int> x;
+int func() {
+ return *x;
+}
+], [ignore_strict_aliasing=no], [ignore_strict_aliasing=yes])
+AC_MSG_RESULT($ignore_strict_aliasing)
+CXXFLAGS=$CXXFLAGS_SAVE
+if test "x$ignore_strict_aliasing" = "xyes"; then
+ CXXFLAGS="$CXXFLAGS -Wno-strict-aliasing"
+fi
+
dnl ******************************
dnl Gettext stuff
dnl ******************************
# Check for some boost header files
AC_CHECK_HEADERS([boost/concept_check.hpp], [], AC_MSG_ERROR([You need the boost package (e.g. libboost-dev)]))
-# Test whether GCC emits a spurious warning when using boost::optional
-# If yes, turn off strict aliasing warnings to reduce noise
-AC_MSG_CHECKING([for overzealous strict aliasing warnings])
-ignore_strict_aliasing=no
-CXXFLAGS_SAVE=$CXXFLAGS
-CXXFLAGS="$CXXFLAGS -Werror=strict-aliasing"
-AC_COMPILE_IFELSE([
-#include <boost/optional.hpp>
-boost::optional<int> x;
-int func() {
- return *x;
-}
-], [ignore_strict_aliasing=no], [ignore_strict_aliasing=yes])
-AC_MSG_RESULT($ignore_strict_aliasing)
-CXXFLAGS=$CXXFLAGS_SAVE
-if test "x$ignore_strict_aliasing" = "xyes"; then
- CXXFLAGS="$CXXFLAGS -Wno-strict-aliasing"
-fi
-
-# Test for broken unordered_set on GCC 4.0.0, shipped with Apple XCode tools
-AC_MSG_CHECKING([TR1 unordered_set usability])
-AC_COMPILE_IFELSE([
-#include <tr1/unordered_set>
-int main() {
- std::tr1::unordered_set<int> i, j;
- i = j;
- return 0;
-}
-], [unordered_set_broken=no], [unordered_set_broken=yes])
-if test "x$unordered_set_broken" = "xyes"; then
- AC_MSG_RESULT([broken])
- AC_MSG_ERROR([You have a broken version of the <tr1/unordered_set> header. See http://wiki.inkscape.org/wiki/index.php/CompilingMacOsX for information on how to fix this problem.])
-else
- AC_MSG_RESULT([ok])
-fi
-
PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, cairo_pdf=yes, cairo_pdf=no)
if test "x$cairo_pdf" = "xyes"; then
AC_DEFINE(HAVE_CAIRO_PDF, 1, [Whether the Cairo PDF backend is available])
elif test "$enable_binreloc" = "no"; then
AC_MSG_RESULT(no)
else
- AC_MSG_RESULT(no (unknown value "$enable_binreloc"))
+ AC_MSG_RESULT([no (unknown value "$enable_binreloc")])
enable_binreloc=no
fi
AC_DEFINE(BR_PTHREADS,[0],[Use binreloc thread support?])