=== modified file 'configure.ac' --- configure.ac 2013-04-07 17:41:35 +0000 +++ configure.ac 2013-05-15 23:32:27 +0000 @@ -630,6 +630,14 @@ sigc++-2.0 >= 2.0.12 ) +dnl Check whether we need to use new Glib::Thread::Mutex API. +dnl TODO: Drop this test once we bump the required version of glibmm to 2.32 +PKG_CHECK_MODULES(GLIBMM_2_32, glibmm-2.4 >= 2.32, with_glibmm_2_32=yes, with_glibmm_2_32=no) + +if test "x$with_glibmm_2_32" = "xyes"; then + AC_DEFINE(WITH_GLIBMM_2_32,1,[Build with Glibmm 2.32 or higher]) +fi + dnl ********************************* dnl Allow experimental GTK+3 build dnl ********************************* === modified file 'src/ui/dialog/filedialog.cpp' --- src/ui/dialog/filedialog.cpp 2013-03-26 16:03:49 +0000 +++ src/ui/dialog/filedialog.cpp 2013-05-15 23:15:58 +0000 @@ -15,9 +15,9 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include "filedialogimpl-win32.h" #include "filedialogimpl-gtkmm.h" #include "filedialog.h" -#include "filedialogimpl-win32.h" #include "gc-core.h" #include === modified file 'src/ui/dialog/filedialogimpl-win32.h' --- src/ui/dialog/filedialogimpl-win32.h 2013-05-15 15:27:19 +0000 +++ src/ui/dialog/filedialogimpl-win32.h 2013-05-15 23:49:22 +0000 @@ -10,13 +10,18 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#if HAVE_CONFIG_H +# include "config.h" +#endif + #ifdef WIN32 +#if WITH_GLIBMM_2_32 +# include +#endif + #include "gc-core.h" #include -#if GLIB_CHECK_VERSION(2,32,0) -#include -#endif namespace Inkscape {