Bug 556527 - The current page property is not passed to GtkPrintUnixDialog

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index 4dd0a55f050fbf9a810c2cd5e7fe58a5db1aa3e3..f00157c826eb7207cdceaf74f1ae029282cb8f81 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,8 +11,8 @@ AC_PREREQ(2.54)
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [13])
-m4_define([gtk_micro_version], [6])
+m4_define([gtk_minor_version], [15])
+m4_define([gtk_micro_version], [0])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -184,6 +184,9 @@ fi
 
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
+dnl when using libtool 2.x create libtool early, because it's used in configure
+m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+
 
 # Make sure we use 64-bit versions of various file stuff.
 AC_SYS_LARGEFILE
@@ -323,7 +326,7 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DPANGO_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
 
 # Ensure MSVC-compatible struct packing convention is used when
 # compiling for Win32 with gcc.
@@ -398,7 +401,7 @@ AC_MSG_CHECKING([Whether to write dependencies into .pc files])
 case $enable_explicit_deps in
   auto)
     export SED
-    deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh`
+    deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
     if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
       enable_explicit_deps=yes  
     else
@@ -583,6 +586,8 @@ if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; th
   CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
 fi
 
+CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
+
 
 dnl
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
@@ -791,7 +796,7 @@ AC_ARG_WITH(libjasper,
                             [disable JPEG2000 loader for gdk-pixbuf])])
 
 AC_ARG_ENABLE(gdiplus,
-            [AC_HELP_STRING([--disable-gdiplus-loaders],
+            [AC_HELP_STRING([--disable-gdiplus],
                             [disable GDI+ loaders for gdk-pixbuf])])
 
 AM_CONDITIONAL(BUILD_GDIPLUS_LOADERS, [ test x$os_win32 = xyes && test x$enable_gdiplus != xno ])
@@ -1052,7 +1057,7 @@ if test x$gio_can_sniff = x; then
     char *content_type;
     char *image_png;
     content_type = g_content_type_guess (NULL, data, data_size, NULL);  
-    image_png = g_content_type_for_mime_type ("image/png");
+    image_png = g_content_type_from_mime_type ("image/png");
     return !!strcmp (content_type, image_png);
   }]])],
     [gio_can_sniff=yes
@@ -1987,9 +1992,7 @@ if test "x$gdktarget" = "xx11" ; then
 #define GDK_WINDOWING_X11'
 elif test "x$gdktarget" = "xwin32" ; then
   gdk_windowing='
-#ifdef _WIN64
-#  define GDK_NATIVE_WINDOW_POINTER
-#endif
+#define GDK_NATIVE_WINDOW_POINTER
 
 #define GDK_WINDOWING_WIN32'
 elif test "x$gdktarget" = "xquartz" ; then