X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=d33502000321917be2033bccda7f836301b95e64;hb=79483ba14ddfcd2a9befc251c88233d6495d8436;hp=e4bed1609968a5b319ac89c3899360089b879b1c;hpb=9f235f719e9a8eb4c55945200e30998d6354f151;p=inkscape.git

diff --git a/configure.ac b/configure.ac
index e4bed1609..d33502000 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(inkscape, 0.44+devel)
+AC_INIT(inkscape, 0.46+devel)
 dnl N.B. After 0.40, please change to `0.40+cvs' instead of `0.41cvs'.
 dnl Rationale: (i) placate simple version comparison software such as
 dnl `dpkg --compare-versions'.  (ii) We don't always know what the next
@@ -9,7 +9,7 @@ dnl version is going to be called until about the time we release it
 dnl (whereas we always know what the previous version was called).
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR(src/main.cpp)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([dist-zip dist-bzip2 tar-pax])
 
 AC_ARG_ENABLE([lsb], AS_HELP_STRING([--enable-lsb], [LSB-compatible build configuration]), [
   prefix=/opt/inkscape
@@ -23,27 +23,73 @@ AM_CONFIG_HEADER(config.h)
 
 AC_PROG_INTLTOOL(0.22)
 
+AC_LANG(C++)
+AC_ISC_POSIX
+AC_PROG_CXX
+AM_PROG_CC_STDC
+AM_PROG_AS
+AC_HEADER_STDC
+
 dnl These next few lines are needed only while libcroco is in our source tree.
 AC_PROG_CC
 AM_PROG_CC_C_O
 if test "$GCC" = "yes"; then
   # Enable some warnings from gcc.
+  AC_LANG_PUSH(C)
+
+  ####
+  # Generic cpp flags...
+
+  # What is just plain "-W" ?
+  # Fortify source requires -O2 or higher, which is handled with newer autoconf
+  CPPFLAGS="-W -D_FORTIFY_SOURCE=2 $CPPFLAGS"
+  # Enable format and format security warnings
+  CPPFLAGS="-Wformat -Wformat-security $CPPFLAGS"
+  # Enable all default warnings
+  CPPFLAGS="-Wall $CPPFLAGS"
+
+  # Test for -Werror=... (introduced some time post-4.0)
+  # If we hit a format error -- it should be fatal.
+  AC_MSG_CHECKING([compiler support for -Werror=format-security])
+  ink_svd_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="-Werror=format-security $CPPFLAGS"
+  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
+  AC_MSG_RESULT([$ink_opt_ok])
+  if test "x$ink_opt_ok" != "xyes"; then
+    CPPFLAGS="$ink_svd_CPPFLAGS"
+  fi
+
+  ####
+  # C-specific flags...
 
   # -Wno-pointer-sign is probably new in gcc 4.0; certainly it isn't accepted
   # by gcc 2.95.
+  AC_MSG_CHECKING([compiler support for -Wno-pointer-sign])
   ink_svd_CFLAGS="$CFLAGS"
   CFLAGS="-Wno-pointer-sign $CFLAGS"
-  AC_COMPILE_IFELSE([int dummy;
-], , CFLAGS="$ink_svd_CFLAGS",)
-  CFLAGS="-Wall -W $CFLAGS"
-fi
+  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
+  AC_MSG_RESULT([$ink_opt_ok])
+  if test "x$ink_opt_ok" != "xyes"; then
+    CFLAGS="$ink_svd_CFLAGS"
+  fi
 
-AC_LANG(C++)
-AC_ISC_POSIX
-AC_PROG_CXX
-AM_PROG_CC_STDC
-AM_PROG_AS
-AC_HEADER_STDC
+  ####
+  # Linker flags...
+
+  # Have linker produce read-only relocations, if it knows how
+  AC_MSG_CHECKING([linker tolerates -z relro])
+  ink_svd_LDFLAGS="$LDFLAGS"
+  LDFLAGS="-Wl,-z,relro $LDFLAGS"
+  AC_LINK_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
+  AC_MSG_RESULT([$ink_opt_ok])
+  if test "x$ink_opt_ok" != "xyes"; then
+    LDFLAGS="$ink_svd_LDFLAGS"
+  fi
+
+  AC_LANG_POP
+
+  # C++-specific flags are defined further below.  Look for CXXFLAGS...
+fi
 
 dnl Honor aclocal flags
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
@@ -54,7 +100,9 @@ dnl Verify our GCC version
 if test "x$GXX" = "xyes"; then
 	AC_MSG_CHECKING([GNU compiler version])
 
-	cc_version=["`$CXX $CXXFLAGS -v 2>&1 </dev/null |grep 'gcc version' |\
+	# Don't pass CXXFLAGS to the following CXX command as some 
+	# of them can't be specified along with '-v'.
+	cc_version=["`$CXX -v 2>&1 </dev/null |grep 'gcc version' |\
 		sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"]
 
 	AC_MSG_RESULT([$cc_version])
@@ -80,7 +128,7 @@ GETTEXT_PACKAGE="AC_PACKAGE_NAME"
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Translation domain used])
 dnl Add the languages which your application supports here.
-ALL_LINGUAS="am az be bg ca cs da de dz el en_GB en_CA en_US@piglatin es es_MX et fi fr ga gl hr hu it ja ko lt mk mn nb ne nl nn pa pl pt pt_BR ru rw sk sl sq sr sr@Latn sv th tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn br ca ca@valencia cs da de dz el en_AU en_CA en_GB en_US@piglatin eo es_MX es et eu fi fr ga gl he hr hu id it ja km ko lt mk mn nb ne nl nn pa pl pt_BR pt ro ru rw sk sl sq sr@latin sr sv th tr uk vi zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -88,6 +136,25 @@ if test "x$PKG_CONFIG" = "xno"; then
 	AC_MSG_ERROR(You have to install pkg-config to compile inkscape.)
 fi
 
+dnl Find msgfmt.  Without this, po/Makefile fails to set MSGFMT on some platforms.
+AC_PATH_PROG(MSGFMT, msgfmt, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
+dnl ******************************
+dnl Check for OpenMP 
+dnl ******************************
+
+AX_OPENMP([openmp_ok=yes],[openmp_ok=no])
+AC_MSG_CHECKING([for OpenMP support])
+dnl a bit odd, but AX_OPENMP does its own check message, so we're not wrapping it at the moment
+AC_MSG_RESULT([$openmp_ok])
+if test "x$openmp_ok" = "xyes"; then
+	dnl We have it, now set up the flags
+	CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
+	AC_CHECK_HEADER(omp.h)
+fi
+
+
 dnl ******************************
 dnl Check for libpng 
 dnl ******************************
@@ -140,7 +207,7 @@ AC_CHECK_HEADERS([gc.h gc/gc.h],
 				  break], [gc_ok=no], [$gc_libs])
 		    break],
                  [gc_ok=no])
-if test "x$gc_ok" = "xyes"; then
+if test "x$gc_ok" = "xyes" && "x$cross_compiling" = "xno" ; then 
 	AC_MSG_CHECKING([libgc version 6.4+])
 	AC_RUN_IFELSE(
 		[AC_LANG_SOURCE([[
@@ -196,7 +263,7 @@ AC_MSG_CHECKING([for Win32 platform])
 case "$host" in
   *-*-mingw*)
     platform_win32=yes
-    INKSCAPE_CFLAGS="$INKSCAPE_CFLAGS -mms-bitfields -DLIBXML_STATIC"
+    WIN32_CFLAGS="-mms-bitfields -DLIBXML_STATIC"
     ;;
   *)
     platform_win32=no
@@ -204,6 +271,22 @@ case "$host" in
 esac
 AC_MSG_RESULT([$platform_win32])
 AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+AC_SUBST(WIN32_CFLAGS)
+
+AC_MSG_CHECKING([for Solaris platform])
+case "$host" in
+  *-solaris2.*)
+    platform_solaris=yes
+    solaris_version=`echo $host|sed -e 's/^.*-solaris2\.//' -e s'/\..*$//'`
+    CFLAGS="$CFLAGS -DSOLARIS=$solaris_version"
+    CXXFLAGS="$CXXFLAGS -DSOLARIS=$solaris_version"
+    ;;
+  *)
+    platform_solaris=no
+    ;;
+esac
+AC_MSG_RESULT([$platform_solaris])
+AM_CONDITIONAL(PLATFORM_SOLARIS, test "$platform_solaris" = "yes")
 
 dnl ******************************
 dnl Xft checking
@@ -215,10 +298,10 @@ AC_ARG_WITH(xft,
 
 if test "x$with_xft" != "xno" ; then
 	dnl Test fontconfig package
-	PKG_CHECK_MODULES(XFT, xft, xft_ok=yes, xft_ok=no)
+	PKG_CHECK_MODULES(XFT, fontconfig, xft_ok=yes, xft_ok=no)
 	if test "x$xft_ok" != "xyes"; then
 		dnl test xft package
-		PKG_CHECK_MODULES(XFT, fontconfig, xft_ok=yes, xft_ok=no)
+		PKG_CHECK_MODULES(XFT, xft, xft_ok=yes, xft_ok=no)
 		if test "x$xft_ok" != "xyes"; then
 			dnl Have to test xft presence
 			AC_CHECK_HEADER(X11/Xft/Xft.h, xft_ok=yes, xft_ok=no)
@@ -258,39 +341,6 @@ if test "x$xft_ok" = "xyes"; then
 	fi
 fi
 
-dnl ******************************
-dnl GnomePrint checking
-dnl ******************************
-
-AC_ARG_WITH(gnome-print,
-            AC_HELP_STRING([--with-gnome-print], [use gnome print font database and spooler frontend]),
-            [with_gp=$withval], [with_gp=auto])
-
-if test "x$with_gp" = "xyes"; then
-	dnl Have to test gnome-print presence
-	PKG_CHECK_MODULES(GNOME_PRINT, libgnomeprint-2.2 >= 1.116.0  libgnomeprintui-2.2 >= 1.116.0, gp=yes, gp=no)
-	if test "x$gp" != "xyes"; then
-		dnl No gnome-print found
-		if test "x$with_gp" = "xyes"; then
-			dnl Gnome-print was explicitly asked, so stop
-			AC_MSG_ERROR([--with-gnome-print was specified, but appropriate libgnomeprint development packages could not be found])
-		else 
-			# gp is no, tell us for the log file 
-			AC_MSG_RESULT($gp)
-		fi
-	fi
-else
-	dnl Asked to ignore gnome-print
-	gp=no
-fi
-
-AC_SUBST(GNOME_PRINT_CFLAGS)
-AC_SUBST(GNOME_PRINT_LIBS)
-
-AM_CONDITIONAL(USE_GNOME_PRINT, test "x$gp" = "xyes")
-if test "x$gp" = "xyes"; then
-	AC_DEFINE(WITH_GNOME_PRINT, 1, [Use gnome print font database and spooler frontend])
-fi
 
 dnl ******************************
 dnl gnome vfs checking
@@ -363,7 +413,7 @@ if test "x$with_perl" = "xyes"; then
     if test "$?" -gt "0"; then
         with_perl="no"
     else
-        checkPERL_LDFLAGS=`perl -MExtUtils::Embed -e ldopts 2>/dev/null`
+        checkPERL_LIBS=`perl -MExtUtils::Embed -e ldopts 2>/dev/null`
         if test "$?" -gt "0"; then
             with_perl="no"
         else
@@ -375,22 +425,22 @@ AC_MSG_RESULT([$with_perl])
 if test "x$with_perl" = "xyes"; then
     # Test that we actually have the perl libraries installed
     oldCFLAGS="$CFLAGS"
-    oldLDFLAGS="$LDFLAGS"
+    oldLIBS="$LIBS"
     CFLAGS="$CFLAGS $checkPERL_CFLAGS"
-    LDFLAGS="$LDFLAGS $checkPERL_LDFLAGS"
+    LIBS="$LIBS $checkPERL_LIBS"
     AC_CHECK_FUNC([perl_parse],[
 	PERL_CFLAGS="$checkPERL_CFLAGS"
-	PERL_LDFLAGS="$checkPERL_LDFLAGS"
+	PERL_LIBS="$checkPERL_LIBS"
         AC_DEFINE(WITH_PERL, 1, [use Perl for embedded scripting])
         ],[
 	with_perl="no"
 	])
     CFLAGS="$oldCFLAGS"
-    LDFLAGS="$oldLDFLAGS"
+    LIBS="$oldLIBS"
 fi
 AM_CONDITIONAL(WITH_PERL, test "x$with_perl" = "xyes")
 AC_SUBST(PERL_CFLAGS)
-AC_SUBST(PERL_LDFLAGS)
+AC_SUBST(PERL_LIBS)
 
 dnl ******************************
 dnl Python checking
@@ -406,7 +456,7 @@ if test "x$with_python" = "xyes"; then
     if test "$?" -gt "0"; then
         with_python="no"
     else
-        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
+        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
         if test "$?" -gt "0"; then
             with_python="no"
         else
@@ -460,18 +510,68 @@ else
 		fi
 	else
 		dnl Working lcms
-		LCMS_LIBS="-llcms "
+		LIBS="$LIBS $LCMS_LIBS"
+		AC_DEFINE(ENABLE_LCMS, 1, [Use LittleCms color management])
 	fi
 fi
 
-if test "x$lcms" = "xyes"; then
-	LIBS="$LIBS $LCMS_LIBS"
-	AC_DEFINE(ENABLE_LCMS, 1, [Use LittleCms color management])
-fi
-AM_CONDITIONAL(USE_LCMS, test "x$lcms" = "xyes")
 AC_SUBST(LCMS_CFLAGS)
 AC_SUBST(LCMS_LIBS)
 
+dnl ******************************
+dnl Libpoppler checking
+dnl ******************************
+
+AC_ARG_ENABLE(poppler-cairo,
+	AC_HELP_STRING([--enable-poppler-cairo], [Enable libpoppler-cairo for rendering PDF preview]),
+	[enable_poppler_cairo=$enableval], [enable_poppler_cairo=yes])
+
+POPPLER_CFLAGS=""
+PKG_CHECK_MODULES(POPPLER, poppler >= 0.5.9, poppler=yes, poppler=no)
+
+if test "x$poppler" = "xyes"; then
+	dnl Working libpoppler
+	POPPLER_LIBS="-lpoppler "
+	dnl Have to test libpoppler-glib presence
+	PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= 0.5.9, poppler_glib=yes, poppler_glib=no)
+	if test "x$poppler_glib" = "xyes"; then
+		dnl Working libpoppler-glib found
+		dnl Check whether the Cairo SVG backend is available
+		PKG_CHECK_MODULES(CAIRO_SVG, cairo-svg, cairo_svg=yes, cairo_svg=no)
+		if test "x$cairo_svg" = "xyes"; then
+			POPPLER_LIBS="$POPPLER_LIBS -lpoppler-glib "
+		fi
+	fi
+	if test "x$enable_poppler_cairo" = "xyes"; then
+		dnl Have to test libpoppler-cairo presence for PDF preview
+		dnl AC_CHECK_HEADER(Magick++.h, magick_ok=yes, magick_ok=no)
+		PKG_CHECK_MODULES(POPPLER_CAIRO, poppler-cairo >= 0.5.9, poppler_cairo=yes, poppler_cairo=no)
+		if test "x$poppler_glib" = "xyes" -a "x$poppler_cairo" = "xyes" -a \
+			"x$cairo_svg" = "xno"
+		then
+			POPPLER_LIBS="$POPPLER_LIBS -lpoppler-glib "
+		fi
+	fi
+fi
+
+if test "x$poppler" = "xyes"; then
+	LIBS="$LIBS $POPPLER_LIBS"
+	AC_DEFINE(HAVE_POPPLER, 1, [Use libpoppler for direct PDF import])
+fi
+if test "x$poppler_cairo" = "xyes" -a "x$poppler_glib" = "xyes"; then
+	AC_DEFINE(HAVE_POPPLER_CAIRO, 1, [Use libpoppler-cairo for rendering PDF preview])
+fi
+if test "x$poppler_glib" = "xyes" -a "x$cairo_svg" = "xyes"; then
+	AC_DEFINE(HAVE_POPPLER_GLIB, 1, [Use libpoppler-glib and Cairo-SVG for PDF import])
+fi
+AC_SUBST(POPPLER_CFLAGS)
+AC_SUBST(POPPLER_LIBS)
+
+PKG_CHECK_MODULES(POPPLERNEW, poppler >= 0.8.3, popplernew=yes, popplernew=no)
+if test "x$popplernew" = "xyes"; then
+	AC_DEFINE(POPPLER_NEW_GFXFONT, 1, [Poppler version of GfxFont to use (0.8.3 or higher versions of Poppler)])
+fi
+
 dnl ******************************
 dnl Inkboard dependency checking
 dnl ******************************
@@ -494,6 +594,8 @@ if test "x$with_inkboard" = "xyes"; then
 		if test "x$with_inkboard_ssl" = "xyes"; then
 			dnl OpenSSL found; enable SSL support in Pedro
 			INKBOARD_CFLAGS="$INKBOARD_CFLAGS -DHAVE_SSL"
+			RELAYTOOL([ssl], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes])
+			RELAYTOOL([crypto], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes])
 			AC_DEFINE(WITH_INKBOARD_SSL,1,[Build in SSL support for Inkboard])
 		fi
 else
@@ -504,19 +606,71 @@ AM_CONDITIONAL(WITH_INKBOARD, test "x$with_inkboard" = "xyes")
 AC_SUBST(INKBOARD_LIBS)
 AC_SUBST(INKBOARD_CFLAGS)
 
+dnl ******************************
+dnl Check for libwpg for extension
+dnl ******************************
+
+PKG_CHECK_MODULES(LIBWPG, libwpg-0.1 libwpg-stream-0.1, with_libwpg=yes, with_libwpg=no)
+if test "x$with_libwpg" = "xyes"; then
+	AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg])
+fi
+AM_CONDITIONAL(WITH_LIBWPG, test "x$with_libwpg" = "xyes")
+
+AC_SUBST(LIBWPG_LIBS)
+AC_SUBST(LIBWPG_CFLAGS)
+
+dnl ******************************
+dnl Check for ImageMagick Magick++ 
+dnl ******************************
+
+PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no)
+if test "x$magick_ok" = "xyes"; then
+      AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects])
+fi
+AM_CONDITIONAL(USE_IMAGE_MAGICK, test "x$magick_ok" = "xyes")
+
+AC_SUBST(IMAGEMAGICK_LIBS)
+AC_SUBST(IMAGEMAGICK_CFLAGS)
+
+dnl ***********************************************************************************************************
+dnl Check for a Cairo version that implements user-fonts feature (with a stable API, that is cairo > 1.7.6),
+dnl so that we conditionally add SVGFonts support
+dnl ***********************************************************************************************************
+
+PKG_CHECK_MODULES(CAIRO_USER_FONTS, cairo > 1.7.6, cairouserfonts=yes, cairouserfonts=no)
+if test "x$cairouserfonts" = "xyes"; then
+       AC_DEFINE(ENABLE_SVG_FONTS, 1, [SVG Fonts should be used])
+fi
+
 dnl ******************************
 dnl   Unconditional dependencies
 dnl ******************************
 
-dnl *** NOTE: when we move to gtk 2.6 or later, we can remove the 
-dnl ********* the override for g_ascii_strtod below...
 dnl sigc++-2.0 >= 2.0.12: using "visit_each" not available in 2.0.10
 if test $cc_vers_major -gt 3; then
   min_sigc_version=2.0.12
 else
   min_sigc_version=2.0.11
 fi
-PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4  glibmm-2.4  gtkmm-2.4  gtk+-2.0 >= 2.4.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2)
+PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4  glibmm-2.4  gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl)
+
+# Check for Apple Mac OS X Carbon framework
+carbon_ok=no
+AC_MSG_CHECKING([for Mac OS X Carbon support])
+AC_TRY_CPP([
+#include <Carbon/Carbon.h>
+#include <CoreServices/CoreServices.h>
+], carbon_ok=yes)
+AC_MSG_RESULT($carbon_ok)
+if test "x$carbon_ok" = "xyes"; then
+  AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available])
+  CARBON_LDFLAGS="-framework Carbon"
+  AC_SUBST(CARBON_LDFLAGS)
+fi
+AM_CONDITIONAL(HAVE_CARBON, test "x$carbon_ok" = "xyes")
+
+# 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)]))
 
 PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, cairo_pdf=yes, cairo_pdf=no)
 if test "x$cairo_pdf" = "xyes"; then
@@ -524,7 +678,11 @@ if test "x$cairo_pdf" = "xyes"; then
 fi
 
 dnl Shouldn't we test for libpng and libz?
-INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz"
+if test "x$openmp_ok" = "xyes"; then
+	INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lgomp"
+else
+	INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz"
+fi
 
 AC_CHECK_HEADER(popt.h,
 		[INKSCAPE_LIBS="$INKSCAPE_LIBS -lpopt"],
@@ -669,7 +827,8 @@ if test "$GXX" = "yes"; then
   # programmer deliberately has an unused parameter (e.g. because it's used
   # as a callback or similar function pointer use).
 
-  CXXFLAGS="-Wall -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch  $CXXFLAGS"
+  # Add even more stuff
+  CXXFLAGS="-Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch $CXXFLAGS"
 
   dnl Test for arch-specific situations.
   case "$host_cpu" in
@@ -751,9 +910,6 @@ fi
 
 AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
 
-dnl Override the default g_ascii_strtod
-AC_DEFINE(g_ascii_strtod, fixed_g_ascii_strtod, [Pre-1.107 gstrfuncs.c version of g_ascii_strtod is broken])
-
 dnl Figure out where the datadir actually is
 dnl http://autoconf-archive.cryp.to/ac_define_dir.html
 prefix_NONE=
@@ -788,6 +944,7 @@ src/Makefile
 src/check-header-compile
 src/algorithms/makefile
 src/application/makefile
+src/bind/makefile
 src/debug/makefile
 src/dialogs/makefile
 src/display/makefile
@@ -796,20 +953,25 @@ src/extension/implementation/makefile
 src/extension/internal/makefile
 src/extension/makefile
 src/extension/script/makefile
+src/filters/makefile
 src/helper/makefile
 src/inkjar/makefile
 src/io/makefile
 src/libcroco/makefile
+src/libgdl/makefile
 src/libnr/makefile
 src/libnrtype/makefile
 src/libavoid/makefile
 src/livarot/makefile
+src/live_effects/makefile
+src/live_effects/parameter/makefile
 src/pedro/makefile
 src/jabber_whiteboard/makefile
 src/removeoverlap/makefile
 src/svg/makefile
 src/trace/makefile
 src/traits/makefile
+src/ui/cache/makefile
 src/ui/dialog/makefile
 src/ui/makefile
 src/ui/view/makefile
@@ -818,12 +980,18 @@ src/utest/makefile
 src/util/makefile
 src/widgets/makefile
 src/xml/makefile
+src/2geom/makefile
 doc/Makefile
 po/Makefile.in
 share/Makefile
 share/clipart/Makefile
 share/examples/Makefile
 share/extensions/Makefile
+share/extensions/alphabet_soup/Makefile
+share/extensions/Barcode/Makefile
+share/extensions/Poly3DObjects/Makefile
+share/extensions/xaml2svg/Makefile
+share/filters/Makefile
 share/fonts/Makefile
 share/gradients/Makefile
 share/icons/Makefile
@@ -860,11 +1028,16 @@ Configuration:
         LDFLAGS:                  ${LDFLAGS}
 
         Use Xft font database:    ${xft_ok}
-	Use gnome-vfs:            ${gnome_vfs}
+        Use gnome-vfs:            ${gnome_vfs}
         Use openoffice files:     ${ij}
         Use MMX optimizations:    ${use_mmx_asm}
         Use relocation support:   ${enable_binreloc}
-	Enable LittleCms:         ${enable_lcms}
-	Enable Inkboard:	  ${with_inkboard}
-	Enable SSL in Inkboard:   ${with_inkboard_ssl}
+        Internal Python:          ${with_python}
+        Internal Perl:            ${with_perl}
+        Enable LittleCms:         ${enable_lcms}
+        Enable Inkboard:          ${with_inkboard}
+        Enable SSL in Inkboard:   ${with_inkboard_ssl}
+        Enable Poppler-Cairo:     ${enable_poppler_cairo}
+        ImageMagick Magick++:     ${magick_ok}
+        Libwpg:                   ${with_libwpg}
 "