r22476 - /desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Tue Dec 1 12:04:23 UTC 2009


Author: slomo
Date: Tue Dec  1 12:04:17 2009
New Revision: 22476

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22476
Log:
* fix relibtoolize patch

Modified:
    desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch

Modified: desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/070_mandatory-relibtoolize.patch?rev=22476&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] Tue Dec  1 12:04:17 2009
@@ -1,6 +1,6 @@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/aclocal.m4 gtk+2.0-2.18.4/aclocal.m4
+diff -Naur gtk+2.0-2.18.4.old/aclocal.m4 gtk+2.0-2.18.4/aclocal.m4
 --- gtk+2.0-2.18.4.old/aclocal.m4	2009-12-01 05:08:37.000000000 +0100
-+++ gtk+2.0-2.18.4/aclocal.m4	2009-12-01 08:07:54.123224950 +0100
++++ gtk+2.0-2.18.4/aclocal.m4	2009-12-01 13:03:27.352291520 +0100
 @@ -13,8 +13,8 @@
  
  m4_ifndef([AC_AUTOCONF_VERSION],
@@ -206,9 +206,9 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/config.h.in gtk+2.0-2.18.4/config.h.in
+diff -Naur gtk+2.0-2.18.4.old/config.h.in gtk+2.0-2.18.4/config.h.in
 --- gtk+2.0-2.18.4.old/config.h.in	2009-12-01 05:08:40.000000000 +0100
-+++ gtk+2.0-2.18.4/config.h.in	2009-12-01 08:07:56.106245208 +0100
++++ gtk+2.0-2.18.4/config.h.in	2009-12-01 13:03:29.352294428 +0100
 @@ -126,6 +126,9 @@
  /* Define to 1 if you have the <string.h> header file. */
  #undef HAVE_STRING_H
@@ -229,9 +229,9 @@
  /* Define to the version of this package. */
  #undef PACKAGE_VERSION
  
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure
+diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure
 --- gtk+2.0-2.18.4.old/configure	2009-12-01 05:08:51.000000000 +0100
-+++ gtk+2.0-2.18.4/configure	2009-12-01 08:07:55.719222067 +0100
++++ gtk+2.0-2.18.4/configure	2009-12-01 13:03:29.003290708 +0100
 @@ -1,20 +1,24 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -1079,7 +1079,24 @@
  TEST_PRINT_BACKEND_FALSE
  TEST_PRINT_BACKEND_TRUE
  HAVE_PAPI_CUPS_FALSE
-@@ -1149,6 +1100,7 @@
+@@ -847,6 +798,7 @@
+ GDK_DEP_LIBS
+ GDK_EXTRA_CFLAGS
+ GDK_EXTRA_LIBS
++GDK_PRIVATE_PACKAGES
+ GDK_PACKAGES
+ USE_DIRECTFB_FALSE
+ USE_DIRECTFB_TRUE
+@@ -1052,6 +1004,8 @@
+ CXXFLAGS
+ ac_ct_CXX
+ CXX
++ENABLE_STATIC_FALSE
++ENABLE_STATIC_TRUE
+ am__fastdepCC_FALSE
+ am__fastdepCC_TRUE
+ CCDEPMODE
+@@ -1149,6 +1103,7 @@
  program_transform_name
  prefix
  exec_prefix
@@ -1087,7 +1104,7 @@
  PACKAGE_BUGREPORT
  PACKAGE_STRING
  PACKAGE_VERSION
-@@ -1193,8 +1145,6 @@
+@@ -1193,8 +1148,6 @@
  enable_test_print_backend
  with_html_dir
  enable_gtk_doc
@@ -1096,7 +1113,7 @@
  enable_man
  with_xml_catalog
  '
-@@ -1329,8 +1279,7 @@
+@@ -1329,8 +1282,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1106,7 +1123,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1356,8 +1305,7 @@
+@@ -1356,8 +1308,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1116,7 +1133,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1561,8 +1509,7 @@
+@@ -1561,8 +1512,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1126,7 +1143,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1578,8 +1525,7 @@
+@@ -1578,8 +1528,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1136,7 +1153,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1609,17 +1555,17 @@
+@@ -1609,17 +1558,17 @@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -1160,7 +1177,7 @@
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
-@@ -1636,15 +1582,13 @@
+@@ -1636,15 +1585,13 @@
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1178,7 +1195,7 @@
      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
-@@ -1667,8 +1611,7 @@
+@@ -1667,8 +1614,7 @@
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
@@ -1188,7 +1205,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -1698,11 +1641,9 @@
+@@ -1698,11 +1644,9 @@
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1202,7 +1219,7 @@
  
  
  # Find the source files, if location was not specified.
-@@ -1741,13 +1682,11 @@
+@@ -1741,13 +1685,11 @@
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1218,7 +1235,7 @@
  	pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1890,9 +1829,7 @@
+@@ -1890,9 +1832,7 @@
  
    --enable-test-print-backend
                            build test print backend
@@ -1229,7 +1246,7 @@
    --enable-man            regenerate man pages from Docbook [default=no]
  
  Optional Packages:
-@@ -1922,7 +1859,7 @@
+@@ -1922,7 +1862,7 @@
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
    LIBS        libraries to pass to the linker, e.g. -l<library>
@@ -1238,7 +1255,7 @@
                you have headers in a nonstandard directory <include dir>
    CXX         C++ compiler command
    CXXFLAGS    C++ compiler flags
-@@ -2012,464 +1949,973 @@
+@@ -2012,464 +1952,973 @@
  if $ac_init_version; then
    cat <<\_ACEOF
  gtk+ configure 2.18.4
@@ -2590,7 +2607,7 @@
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -2498,7 +2944,7 @@
+@@ -2498,7 +2947,7 @@
      ;;
  esac
  
@@ -2599,7 +2616,7 @@
  IFS=$as_save_IFS
  
  rm -rf conftest.one conftest.two conftest.dir
-@@ -2514,7 +2960,7 @@
+@@ -2514,7 +2963,7 @@
      INSTALL=$ac_install_sh
    fi
  fi
@@ -2608,7 +2625,7 @@
  $as_echo "$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2525,7 +2971,7 @@
+@@ -2525,7 +2974,7 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -2617,7 +2634,7 @@
  $as_echo_n "checking whether build environment is sane... " >&6; }
  # Just in case
  sleep 1
-@@ -2536,15 +2982,11 @@
+@@ -2536,15 +2985,11 @@
  '
  case `pwd` in
    *[\\\"\#\$\&\'\`$am_lf]*)
@@ -2635,7 +2652,7 @@
  esac
  
  # Do `set' in a subshell so we don't clobber the current shell's
-@@ -2566,11 +3008,8 @@
+@@ -2566,11 +3011,8 @@
        # if, for instance, CONFIG_SHELL is bash and it inherits a
        # broken ls alias from the environment.  This has actually
        # happened.  Such a system could not be considered "sane".
@@ -2649,7 +2666,7 @@
     fi
  
     test "$2" = conftest.file
-@@ -2579,13 +3018,10 @@
+@@ -2579,13 +3021,10 @@
     # Ok.
     :
  else
@@ -2666,7 +2683,7 @@
  $as_echo "yes" >&6; }
  test "$program_prefix" != NONE &&
    program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2613,7 +3049,7 @@
+@@ -2613,7 +3052,7 @@
    am_missing_run="$MISSING --run "
  else
    am_missing_run=
@@ -2675,7 +2692,7 @@
  $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  fi
  
-@@ -2634,9 +3070,9 @@
+@@ -2634,9 +3073,9 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -2687,7 +2704,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
-@@ -2647,24 +3083,24 @@
+@@ -2647,24 +3086,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2717,7 +2734,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2674,9 +3110,9 @@
+@@ -2674,9 +3113,9 @@
    ac_ct_STRIP=$STRIP
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
@@ -2729,7 +2746,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
-@@ -2687,24 +3123,24 @@
+@@ -2687,24 +3126,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2759,7 +2776,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2713,7 +3149,7 @@
+@@ -2713,7 +3152,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -2768,7 +2785,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -2726,10 +3162,10 @@
+@@ -2726,10 +3165,10 @@
  fi
  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  
@@ -2781,7 +2798,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2737,7 +3173,7 @@
+@@ -2737,7 +3176,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2790,7 +2807,7 @@
  	 for ac_exec_ext in '' $ac_executable_extensions; do
  	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
  	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2749,11 +3185,12 @@
+@@ -2749,11 +3188,12 @@
  	   esac
  	 done
         done
@@ -2804,7 +2821,7 @@
    if test "${ac_cv_path_mkdir+set}" = set; then
      MKDIR_P="$ac_cv_path_mkdir -p"
    else
-@@ -2761,11 +3198,10 @@
+@@ -2761,11 +3201,10 @@
      # value for MKDIR_P within a source directory, because that will
      # break other packages using the cache if that directory is
      # removed, or if the value is a relative name.
@@ -2817,7 +2834,7 @@
  $as_echo "$MKDIR_P" >&6; }
  
  mkdir_p="$MKDIR_P"
-@@ -2778,9 +3214,9 @@
+@@ -2778,9 +3217,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -2829,7 +2846,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
-@@ -2791,24 +3227,24 @@
+@@ -2791,24 +3230,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2859,7 +2876,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2816,11 +3252,11 @@
+@@ -2816,11 +3255,11 @@
    test -n "$AWK" && break
  done
  
@@ -2873,7 +2890,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
-@@ -2838,11 +3274,11 @@
+@@ -2838,11 +3277,11 @@
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2887,7 +2904,7 @@
  $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-@@ -2862,9 +3298,7 @@
+@@ -2862,9 +3301,7 @@
    am__isrc=' -I$(srcdir)'
    # test to see if srcdir already configured
    if test -f $srcdir/config.status; then
@@ -2898,7 +2915,7 @@
    fi
  fi
  
-@@ -2918,7 +3352,7 @@
+@@ -2918,7 +3355,7 @@
  # by either passing --enable-silent-rules to configure or passing V=0
  # to make
  # Check whether --enable-silent-rules was given.
@@ -2907,7 +2924,7 @@
    enableval=$enable_silent_rules;
  fi
  
-@@ -3007,35 +3441,27 @@
+@@ -3007,35 +3444,27 @@
  
  # Make sure we can run config.sub.
  $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -2950,7 +2967,7 @@
  esac
  build=$ac_cv_build
  ac_save_IFS=$IFS; IFS='-'
-@@ -3051,28 +3477,24 @@
+@@ -3051,28 +3480,24 @@
  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  
  
@@ -2984,7 +3001,7 @@
  esac
  host=$ac_cv_host
  ac_save_IFS=$IFS; IFS='-'
-@@ -3090,7 +3512,7 @@
+@@ -3090,7 +3515,7 @@
  
  
  MATH_LIB=-lm
@@ -2993,7 +3010,7 @@
  $as_echo_n "checking for native Win32... " >&6; }
  LIB_EXE_MACHINE_FLAG=X86
  case "$host" in
-@@ -3108,7 +3530,7 @@
+@@ -3108,7 +3533,7 @@
      os_win32=no
      ;;
  esac
@@ -3002,7 +3019,7 @@
  $as_echo "$os_win32" >&6; }
  
  
-@@ -3127,9 +3549,9 @@
+@@ -3127,9 +3552,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -3014,7 +3031,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3140,24 +3562,24 @@
+@@ -3140,24 +3565,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3044,7 +3061,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3167,9 +3589,9 @@
+@@ -3167,9 +3592,9 @@
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
@@ -3056,7 +3073,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3180,24 +3602,24 @@
+@@ -3180,24 +3605,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3086,7 +3103,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3206,7 +3628,7 @@
+@@ -3206,7 +3631,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -3095,7 +3112,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3220,9 +3642,9 @@
+@@ -3220,9 +3645,9 @@
            if test -n "$ac_tool_prefix"; then
      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -3107,7 +3124,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3233,24 +3655,24 @@
+@@ -3233,24 +3658,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3137,7 +3154,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3260,9 +3682,9 @@
+@@ -3260,9 +3685,9 @@
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
@@ -3149,7 +3166,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3274,18 +3696,18 @@
+@@ -3274,18 +3699,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3171,7 +3188,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -3304,10 +3726,10 @@
+@@ -3304,10 +3729,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -3184,7 +3201,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3319,9 +3741,9 @@
+@@ -3319,9 +3744,9 @@
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -3196,7 +3213,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3332,24 +3754,24 @@
+@@ -3332,24 +3757,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3226,7 +3243,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3363,9 +3785,9 @@
+@@ -3363,9 +3788,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -3238,7 +3255,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3376,24 +3798,24 @@
+@@ -3376,24 +3801,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3268,7 +3285,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3406,7 +3828,7 @@
+@@ -3406,7 +3831,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -3277,7 +3294,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3417,57 +3839,37 @@
+@@ -3417,57 +3842,37 @@
  fi
  
  
@@ -3355,7 +3372,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3483,8 +3885,8 @@
+@@ -3483,8 +3888,8 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -3366,7 +3383,7 @@
  ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  
  # The possible output files:
-@@ -3500,17 +3902,17 @@
+@@ -3500,17 +3905,17 @@
  done
  rm -f $ac_rmfiles
  
@@ -3389,7 +3406,7 @@
    # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
  # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
  # in a Makefile.  We should not override ac_cv_exeext if it was cached,
-@@ -3527,7 +3929,7 @@
+@@ -3527,7 +3932,7 @@
  	# certainly right.
  	break;;
      *.* )
@@ -3398,7 +3415,7 @@
  	then :; else
  	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  	fi
-@@ -3546,84 +3948,42 @@
+@@ -3546,84 +3951,42 @@
  else
    ac_file=''
  fi
@@ -3504,7 +3521,7 @@
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  # work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3638,32 +3998,83 @@
+@@ -3638,32 +4001,83 @@
    esac
  done
  else
@@ -3604,7 +3621,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3675,17 +4086,17 @@
+@@ -3675,17 +4089,17 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -3627,7 +3644,7 @@
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
-@@ -3698,31 +4109,23 @@
+@@ -3698,31 +4112,23 @@
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -3666,7 +3683,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3736,37 +4139,16 @@
+@@ -3736,37 +4142,16 @@
    return 0;
  }
  _ACEOF
@@ -3707,7 +3724,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -3775,20 +4157,16 @@
+@@ -3775,20 +4160,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -3731,7 +3748,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3799,35 +4177,11 @@
+@@ -3799,35 +4180,11 @@
    return 0;
  }
  _ACEOF
@@ -3770,7 +3787,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3838,36 +4192,12 @@
+@@ -3838,36 +4195,12 @@
    return 0;
  }
  _ACEOF
@@ -3811,7 +3828,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3878,42 +4208,17 @@
+@@ -3878,42 +4211,17 @@
    return 0;
  }
  _ACEOF
@@ -3856,7 +3873,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -3930,18 +4235,14 @@
+@@ -3930,18 +4238,14 @@
      CFLAGS=
    fi
  fi
@@ -3878,7 +3895,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -3998,32 +4299,9 @@
+@@ -3998,32 +4302,9 @@
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -3912,7 +3929,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -4034,17 +4312,19 @@
+@@ -4034,17 +4315,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -3935,7 +3952,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -4063,7 +4343,7 @@
+@@ -4063,7 +4346,7 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -3944,7 +3961,7 @@
  $as_echo_n "checking for style of include used by $am_make... " >&6; }
  am__include="#"
  am__quote=
-@@ -4091,12 +4371,12 @@
+@@ -4091,12 +4374,12 @@
  fi
  
  
@@ -3959,7 +3976,7 @@
    enableval=$enable_dependency_tracking;
  fi
  
-@@ -4116,9 +4396,9 @@
+@@ -4116,9 +4399,9 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -3971,7 +3988,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4226,7 +4506,7 @@
+@@ -4226,7 +4509,7 @@
  fi
  
  fi
@@ -3980,7 +3997,7 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -4242,7 +4522,7 @@
+@@ -4242,7 +4525,7 @@
  
  
  # Check whether --enable-static was given.
@@ -3989,7 +4006,21 @@
    enableval=$enable_static; p=${PACKAGE-default}
      case $enableval in
      yes) enable_static=yes ;;
-@@ -4278,9 +4558,9 @@
+@@ -4272,15 +4555,23 @@
+ 
+ 
+ 
++ if test "$enable_static" = yes; then
++  ENABLE_STATIC_TRUE=
++  ENABLE_STATIC_FALSE='#'
++else
++  ENABLE_STATIC_TRUE='#'
++  ENABLE_STATIC_FALSE=
++fi
++
+ 
+ if test -n "$ac_tool_prefix"; then
+   for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -4001,7 +4032,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CXX"; then
-@@ -4291,24 +4571,24 @@
+@@ -4291,24 +4582,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4031,7 +4062,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -4322,9 +4602,9 @@
+@@ -4322,9 +4613,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -4043,7 +4074,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CXX"; then
-@@ -4335,24 +4615,24 @@
+@@ -4335,24 +4626,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4073,7 +4104,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -4365,7 +4645,7 @@
+@@ -4365,7 +4656,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4082,7 +4113,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -4395,9 +4675,9 @@
+@@ -4395,9 +4686,9 @@
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -4094,7 +4125,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CXX"; then
-@@ -4408,24 +4688,24 @@
+@@ -4408,24 +4699,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4124,7 +4155,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -4439,9 +4719,9 @@
+@@ -4439,9 +4730,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -4136,7 +4167,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CXX"; then
-@@ -4452,24 +4732,24 @@
+@@ -4452,24 +4743,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4166,7 +4197,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -4482,7 +4762,7 @@
+@@ -4482,7 +4773,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4175,7 +4206,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -4493,53 +4773,36 @@
+@@ -4493,53 +4784,36 @@
    fi
  fi
  # Provide some information about the compiler.
@@ -4248,7 +4279,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -4553,37 +4816,16 @@
+@@ -4553,37 +4827,16 @@
    return 0;
  }
  _ACEOF
@@ -4289,7 +4320,7 @@
  $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GXX=yes
-@@ -4592,20 +4834,16 @@
+@@ -4592,20 +4845,16 @@
  fi
  ac_test_CXXFLAGS=${CXXFLAGS+set}
  ac_save_CXXFLAGS=$CXXFLAGS
@@ -4313,7 +4344,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -4616,35 +4854,11 @@
+@@ -4616,35 +4865,11 @@
    return 0;
  }
  _ACEOF
@@ -4352,7 +4383,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -4655,36 +4869,12 @@
+@@ -4655,36 +4880,12 @@
    return 0;
  }
  _ACEOF
@@ -4393,7 +4424,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -4695,42 +4885,17 @@
+@@ -4695,42 +4896,17 @@
    return 0;
  }
  _ACEOF
@@ -4438,7 +4469,7 @@
  $as_echo "$ac_cv_prog_cxx_g" >&6; }
  if test "$ac_test_CXXFLAGS" = set; then
    CXXFLAGS=$ac_save_CXXFLAGS
-@@ -4755,9 +4920,9 @@
+@@ -4755,9 +4931,9 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -4450,7 +4481,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4865,7 +5030,7 @@
+@@ -4865,7 +5041,7 @@
  fi
  
  fi
@@ -4459,7 +4490,7 @@
  $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
-@@ -4881,11 +5046,7 @@
+@@ -4881,11 +5057,7 @@
  
  
  
@@ -4472,7 +4503,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -4896,32 +5057,11 @@
+@@ -4896,32 +5068,11 @@
    return 0;
  }
  _ACEOF
@@ -4508,7 +4539,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   if test "$CXX" != ""; then
    HAVE_CXX_TRUE=
-@@ -4934,11 +5074,7 @@
+@@ -4934,11 +5085,7 @@
  
  gtk_save_cxxflags="$CXXFLAGS"
  CXXFLAGS="$CXXFLAGS -x objective-c++"
@@ -4521,7 +4552,7 @@
  /* end confdefs.h.  */
  @interface Foo @end
  int
-@@ -4949,32 +5085,11 @@
+@@ -4949,32 +5096,11 @@
    return 0;
  }
  _ACEOF
@@ -4556,7 +4587,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   if test "$OBJC" = "yes"; then
    HAVE_OBJC_TRUE=
-@@ -4994,12 +5109,12 @@
+@@ -4994,12 +5120,12 @@
  
  if test "$os_win32" = "yes"; then
    if test x$enable_static = xyes -o x$enable_static = x; then
@@ -4571,7 +4602,7 @@
  $as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;}
    fi
    enable_shared=yes
-@@ -5012,9 +5127,9 @@
+@@ -5012,9 +5138,9 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
  set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -4583,7 +4614,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AS"; then
-@@ -5025,24 +5140,24 @@
+@@ -5025,24 +5151,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4613,7 +4644,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5052,9 +5167,9 @@
+@@ -5052,9 +5178,9 @@
    ac_ct_AS=$AS
    # Extract the first word of "as", so it can be a program name with args.
  set dummy as; ac_word=$2
@@ -4625,7 +4656,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_AS"; then
-@@ -5065,24 +5180,24 @@
+@@ -5065,24 +5191,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4655,7 +4686,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5091,7 +5206,7 @@
+@@ -5091,7 +5217,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4664,7 +4695,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5104,9 +5219,9 @@
+@@ -5104,9 +5230,9 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  set dummy ${ac_tool_prefix}dlltool; ac_word=$2
@@ -4676,7 +4707,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DLLTOOL"; then
-@@ -5117,24 +5232,24 @@
+@@ -5117,24 +5243,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4706,7 +4737,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5144,9 +5259,9 @@
+@@ -5144,9 +5270,9 @@
    ac_ct_DLLTOOL=$DLLTOOL
    # Extract the first word of "dlltool", so it can be a program name with args.
  set dummy dlltool; ac_word=$2
@@ -4718,7 +4749,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DLLTOOL"; then
-@@ -5157,24 +5272,24 @@
+@@ -5157,24 +5283,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4748,7 +4779,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5183,7 +5298,7 @@
+@@ -5183,7 +5309,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4757,7 +4788,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5196,9 +5311,9 @@
+@@ -5196,9 +5322,9 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
  set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -4769,7 +4800,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OBJDUMP"; then
-@@ -5209,24 +5324,24 @@
+@@ -5209,24 +5335,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4799,7 +4830,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5236,9 +5351,9 @@
+@@ -5236,9 +5362,9 @@
    ac_ct_OBJDUMP=$OBJDUMP
    # Extract the first word of "objdump", so it can be a program name with args.
  set dummy objdump; ac_word=$2
@@ -4811,7 +4842,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OBJDUMP"; then
-@@ -5249,24 +5364,24 @@
+@@ -5249,24 +5375,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4841,7 +4872,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5275,7 +5390,7 @@
+@@ -5275,7 +5401,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4850,7 +4881,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5310,7 +5425,7 @@
+@@ -5310,7 +5436,7 @@
  
  case `pwd` in
    *\ * | *\	*)
@@ -4859,7 +4890,7 @@
  $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
  esac
  
-@@ -5333,9 +5448,9 @@
+@@ -5333,9 +5459,9 @@
  
  ltmain="$ac_aux_dir/ltmain.sh"
  
@@ -4871,7 +4902,7 @@
    $as_echo_n "(cached) " >&6
  else
              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -5343,7 +5458,7 @@
+@@ -5343,7 +5469,7 @@
         ac_script="$ac_script$as_nl$ac_script"
       done
       echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -4880,7 +4911,7 @@
       if test -z "$SED"; then
    ac_path_SED_found=false
    # Loop through the user's path and test for each of PROGNAME-LIST
-@@ -5352,7 +5467,7 @@
+@@ -5352,7 +5478,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4889,7 +4920,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -5372,7 +5487,7 @@
+@@ -5372,7 +5498,7 @@
      $as_echo '' >> "conftest.nl"
      "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -4898,7 +4929,7 @@
      if test $ac_count -gt ${ac_path_SED_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_SED="$ac_path_SED"
-@@ -5387,19 +5502,17 @@
+@@ -5387,19 +5513,17 @@
        $ac_path_SED_found && break 3
      done
    done
@@ -4921,7 +4952,7 @@
  $as_echo "$ac_cv_path_SED" >&6; }
   SED="$ac_cv_path_SED"
    rm -f conftest.sed
-@@ -5417,9 +5530,9 @@
+@@ -5417,9 +5541,9 @@
  
  
  
@@ -4933,7 +4964,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
-@@ -5430,7 +5543,7 @@
+@@ -5430,7 +5554,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4942,7 +4973,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -5450,7 +5563,7 @@
+@@ -5450,7 +5574,7 @@
      $as_echo 'GREP' >> "conftest.nl"
      "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -4951,7 +4982,7 @@
      if test $ac_count -gt ${ac_path_GREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_GREP="$ac_path_GREP"
-@@ -5465,26 +5578,24 @@
+@@ -5465,26 +5589,24 @@
        $ac_path_GREP_found && break 3
      done
    done
@@ -4983,7 +5014,7 @@
    $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -5498,7 +5609,7 @@
+@@ -5498,7 +5620,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4992,7 +5023,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -5518,7 +5629,7 @@
+@@ -5518,7 +5640,7 @@
      $as_echo 'EGREP' >> "conftest.nl"
      "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -5001,7 +5032,7 @@
      if test $ac_count -gt ${ac_path_EGREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -5533,12 +5644,10 @@
+@@ -5533,12 +5655,10 @@
        $ac_path_EGREP_found && break 3
      done
    done
@@ -5016,7 +5047,7 @@
    fi
  else
    ac_cv_path_EGREP=$EGREP
-@@ -5546,14 +5655,14 @@
+@@ -5546,14 +5666,14 @@
  
     fi
  fi
@@ -5034,7 +5065,7 @@
    $as_echo_n "(cached) " >&6
  else
    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -5567,7 +5676,7 @@
+@@ -5567,7 +5687,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5043,7 +5074,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -5587,7 +5696,7 @@
+@@ -5587,7 +5707,7 @@
      $as_echo 'FGREP' >> "conftest.nl"
      "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -5052,7 +5083,7 @@
      if test $ac_count -gt ${ac_path_FGREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -5602,12 +5711,10 @@
+@@ -5602,12 +5722,10 @@
        $ac_path_FGREP_found && break 3
      done
    done
@@ -5067,7 +5098,7 @@
    fi
  else
    ac_cv_path_FGREP=$FGREP
-@@ -5615,7 +5722,7 @@
+@@ -5615,7 +5733,7 @@
  
     fi
  fi
@@ -5076,7 +5107,7 @@
  $as_echo "$ac_cv_path_FGREP" >&6; }
   FGREP="$ac_cv_path_FGREP"
  
-@@ -5641,7 +5748,7 @@
+@@ -5641,7 +5759,7 @@
  
  
  # Check whether --with-gnu-ld was given.
@@ -5085,7 +5116,7 @@
    withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
  else
    with_gnu_ld=no
-@@ -5650,7 +5757,7 @@
+@@ -5650,7 +5768,7 @@
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
@@ -5094,7 +5125,7 @@
  $as_echo_n "checking for ld used by $CC... " >&6; }
    case $host in
    *-*-mingw*)
-@@ -5680,13 +5787,13 @@
+@@ -5680,13 +5798,13 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -5111,7 +5142,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
-@@ -5717,18 +5824,16 @@
+@@ -5717,18 +5835,16 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -5135,7 +5166,7 @@
    $as_echo_n "(cached) " >&6
  else
    # I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -5741,7 +5846,7 @@
+@@ -5741,7 +5857,7 @@
    ;;
  esac
  fi
@@ -5144,7 +5175,7 @@
  $as_echo "$lt_cv_prog_gnu_ld" >&6; }
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
-@@ -5753,9 +5858,9 @@
+@@ -5753,9 +5869,9 @@
  
  
  
@@ -5156,7 +5187,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NM"; then
-@@ -5802,7 +5907,7 @@
+@@ -5802,7 +5918,7 @@
    : ${lt_cv_path_NM=no}
  fi
  fi
@@ -5165,7 +5196,7 @@
  $as_echo "$lt_cv_path_NM" >&6; }
  if test "$lt_cv_path_NM" != "no"; then
    NM="$lt_cv_path_NM"
-@@ -5813,9 +5918,9 @@
+@@ -5813,9 +5929,9 @@
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -5177,7 +5208,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DUMPBIN"; then
-@@ -5826,24 +5931,24 @@
+@@ -5826,24 +5942,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5207,7 +5238,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5857,9 +5962,9 @@
+@@ -5857,9 +5973,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -5219,7 +5250,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DUMPBIN"; then
-@@ -5870,24 +5975,24 @@
+@@ -5870,24 +5986,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5249,7 +5280,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5900,7 +6005,7 @@
+@@ -5900,7 +6016,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -5258,7 +5289,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5920,44 +6025,44 @@
+@@ -5920,44 +6036,44 @@
  
  
  
@@ -5272,15 +5303,15 @@
    lt_cv_nm_interface="BSD nm"
    echo "int some_variable = 0;" > conftest.$ac_ext
 -  (eval echo "\"\$as_me:5930: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:6035: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:6046: $ac_compile\"" >&5)
    (eval "$ac_compile" 2>conftest.err)
    cat conftest.err >&5
 -  (eval echo "\"\$as_me:5933: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:6038: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:6049: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    cat conftest.err >&5
 -  (eval echo "\"\$as_me:5936: output\"" >&5)
-+  (eval echo "\"\$as_me:6041: output\"" >&5)
++  (eval echo "\"\$as_me:6052: output\"" >&5)
    cat conftest.out >&5
    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
      lt_cv_nm_interface="MS dumpbin"
@@ -5314,7 +5345,7 @@
    $as_echo_n "(cached) " >&6
  else
      i=0
-@@ -6075,10 +6180,10 @@
+@@ -6075,10 +6191,10 @@
  fi
  
  if test -n $lt_cv_sys_max_cmd_len ; then
@@ -5327,7 +5358,7 @@
  $as_echo "none" >&6; }
  fi
  max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -6092,7 +6197,7 @@
+@@ -6092,7 +6208,7 @@
  : ${MV="mv -f"}
  : ${RM="rm -f"}
  
@@ -5336,7 +5367,7 @@
  $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
  # Try some XSI features
  xsi_shell=no
-@@ -6102,17 +6207,17 @@
+@@ -6102,17 +6218,17 @@
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
@@ -5357,7 +5388,7 @@
  $as_echo "$lt_shell_append" >&6; }
  
  
-@@ -6147,14 +6252,14 @@
+@@ -6147,14 +6263,14 @@
  
  
  
@@ -5375,7 +5406,7 @@
  $as_echo "$lt_cv_ld_reload_flag" >&6; }
  reload_flag=$lt_cv_ld_reload_flag
  case $reload_flag in
-@@ -6183,9 +6288,9 @@
+@@ -6183,9 +6299,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
  set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -5387,7 +5418,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OBJDUMP"; then
-@@ -6196,24 +6301,24 @@
+@@ -6196,24 +6312,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5417,7 +5448,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6223,9 +6328,9 @@
+@@ -6223,9 +6339,9 @@
    ac_ct_OBJDUMP=$OBJDUMP
    # Extract the first word of "objdump", so it can be a program name with args.
  set dummy objdump; ac_word=$2
@@ -5429,7 +5460,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OBJDUMP"; then
-@@ -6236,24 +6341,24 @@
+@@ -6236,24 +6352,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5459,7 +5490,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6262,7 +6367,7 @@
+@@ -6262,7 +6378,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -5468,7 +5499,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6279,9 +6384,9 @@
+@@ -6279,9 +6395,9 @@
  
  
  
@@ -5480,7 +5511,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -6400,7 +6505,7 @@
+@@ -6400,7 +6516,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -5489,7 +5520,7 @@
    if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -6475,7 +6580,7 @@
+@@ -6475,7 +6591,7 @@
  esac
  
  fi
@@ -5498,7 +5529,7 @@
  $as_echo "$lt_cv_deplibs_check_method" >&6; }
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -6495,9 +6600,9 @@
+@@ -6495,9 +6611,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -5510,7 +5541,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AR"; then
-@@ -6508,24 +6613,24 @@
+@@ -6508,24 +6624,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5540,7 +5571,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6535,9 +6640,9 @@
+@@ -6535,9 +6651,9 @@
    ac_ct_AR=$AR
    # Extract the first word of "ar", so it can be a program name with args.
  set dummy ar; ac_word=$2
@@ -5552,7 +5583,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_AR"; then
-@@ -6548,24 +6653,24 @@
+@@ -6548,24 +6664,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5582,7 +5613,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6574,7 +6679,7 @@
+@@ -6574,7 +6690,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -5591,7 +5622,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6600,9 +6705,9 @@
+@@ -6600,9 +6716,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -5603,7 +5634,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
-@@ -6613,24 +6718,24 @@
+@@ -6613,24 +6729,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5633,7 +5664,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6640,9 +6745,9 @@
+@@ -6640,9 +6756,9 @@
    ac_ct_STRIP=$STRIP
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
@@ -5645,7 +5676,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
-@@ -6653,24 +6758,24 @@
+@@ -6653,24 +6769,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5675,7 +5706,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6679,7 +6784,7 @@
+@@ -6679,7 +6795,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -5684,7 +5715,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6699,9 +6804,9 @@
+@@ -6699,9 +6815,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -5696,7 +5727,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$RANLIB"; then
-@@ -6712,24 +6817,24 @@
+@@ -6712,24 +6828,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5726,7 +5757,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6739,9 +6844,9 @@
+@@ -6739,9 +6855,9 @@
    ac_ct_RANLIB=$RANLIB
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
@@ -5738,7 +5769,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_RANLIB"; then
-@@ -6752,24 +6857,24 @@
+@@ -6752,24 +6868,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5768,7 +5799,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6778,7 +6883,7 @@
+@@ -6778,7 +6894,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -5777,7 +5808,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6856,9 +6961,9 @@
+@@ -6856,9 +6972,9 @@
  
  
  # Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -5789,7 +5820,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -6974,18 +7079,18 @@
+@@ -6974,18 +7090,18 @@
  int main(){nm_test_var='a';nm_test_func();return(0);}
  _LT_EOF
  
@@ -5814,7 +5845,7 @@
        # Try sorting and uniquifying the output.
        if sort "$nlist" | uniq > "$nlist"T; then
  	mv -f "$nlist"T "$nlist"
-@@ -7038,11 +7143,11 @@
+@@ -7038,11 +7154,11 @@
  	  lt_save_CFLAGS="$CFLAGS"
  	  LIBS="conftstm.$ac_objext"
  	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -5829,7 +5860,7 @@
  	    pipe_works=yes
  	  fi
  	  LIBS="$lt_save_LIBS"
-@@ -7076,10 +7181,10 @@
+@@ -7076,10 +7192,10 @@
    lt_cv_sys_global_symbol_to_cdecl=
  fi
  if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -5842,7 +5873,7 @@
  $as_echo "ok" >&6; }
  fi
  
-@@ -7106,7 +7211,7 @@
+@@ -7106,7 +7222,7 @@
  
  
  # Check whether --enable-libtool-lock was given.
@@ -5851,7 +5882,7 @@
    enableval=$enable_libtool_lock;
  fi
  
-@@ -7118,11 +7223,11 @@
+@@ -7118,11 +7234,11 @@
  ia64-*-hpux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -5866,13 +5897,13 @@
      case `/usr/bin/file conftest.$ac_objext` in
        *ELF-32*)
  	HPUX_IA64_MODE="32"
-@@ -7136,12 +7241,12 @@
+@@ -7136,12 +7252,12 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 7139 "configure"' > conftest.$ac_ext
 -  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  echo '#line 7244 "configure"' > conftest.$ac_ext
++  echo '#line 7255 "configure"' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
@@ -5883,7 +5914,7 @@
      if test "$lt_cv_prog_gnu_ld" = yes; then
        case `/usr/bin/file conftest.$ac_objext` in
  	*32-bit*)
-@@ -7175,11 +7280,11 @@
+@@ -7175,11 +7291,11 @@
  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -5898,7 +5929,7 @@
      case `/usr/bin/file conftest.o` in
        *32-bit*)
  	case $host in
-@@ -7228,9 +7333,9 @@
+@@ -7228,9 +7344,9 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -5910,7 +5941,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_ext=c
-@@ -7239,11 +7344,7 @@
+@@ -7239,11 +7355,7 @@
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
@@ -5923,7 +5954,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -7254,38 +7355,13 @@
+@@ -7254,38 +7366,13 @@
    return 0;
  }
  _ACEOF
@@ -5966,7 +5997,7 @@
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7293,7 +7369,7 @@
+@@ -7293,7 +7380,7 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -5975,7 +6006,7 @@
  $as_echo "$lt_cv_cc_needs_belf" >&6; }
    if test x"$lt_cv_cc_needs_belf" != x"yes"; then
      # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -7303,11 +7379,11 @@
+@@ -7303,11 +7390,11 @@
  sparc*-*solaris*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -5990,7 +6021,7 @@
      case `/usr/bin/file conftest.o` in
      *64-bit*)
        case $lt_cv_prog_gnu_ld in
-@@ -7333,9 +7409,9 @@
+@@ -7333,9 +7420,9 @@
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
  set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -6002,7 +6033,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DSYMUTIL"; then
-@@ -7346,24 +7422,24 @@
+@@ -7346,24 +7433,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6032,7 +6063,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7373,9 +7449,9 @@
+@@ -7373,9 +7460,9 @@
    ac_ct_DSYMUTIL=$DSYMUTIL
    # Extract the first word of "dsymutil", so it can be a program name with args.
  set dummy dsymutil; ac_word=$2
@@ -6044,7 +6075,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DSYMUTIL"; then
-@@ -7386,24 +7462,24 @@
+@@ -7386,24 +7473,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6074,7 +6105,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7412,7 +7488,7 @@
+@@ -7412,7 +7499,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -6083,7 +6114,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -7425,9 +7501,9 @@
+@@ -7425,9 +7512,9 @@
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
  set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -6095,7 +6126,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NMEDIT"; then
-@@ -7438,24 +7514,24 @@
+@@ -7438,24 +7525,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6125,7 +6156,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7465,9 +7541,9 @@
+@@ -7465,9 +7552,9 @@
    ac_ct_NMEDIT=$NMEDIT
    # Extract the first word of "nmedit", so it can be a program name with args.
  set dummy nmedit; ac_word=$2
@@ -6137,7 +6168,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_NMEDIT"; then
-@@ -7478,24 +7554,24 @@
+@@ -7478,24 +7565,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6167,7 +6198,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7504,7 +7580,7 @@
+@@ -7504,7 +7591,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -6176,7 +6207,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -7517,9 +7593,9 @@
+@@ -7517,9 +7604,9 @@
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
  set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -6188,7 +6219,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$LIPO"; then
-@@ -7530,24 +7606,24 @@
+@@ -7530,24 +7617,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6218,7 +6249,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7557,9 +7633,9 @@
+@@ -7557,9 +7644,9 @@
    ac_ct_LIPO=$LIPO
    # Extract the first word of "lipo", so it can be a program name with args.
  set dummy lipo; ac_word=$2
@@ -6230,7 +6261,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_LIPO"; then
-@@ -7570,24 +7646,24 @@
+@@ -7570,24 +7657,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6260,7 +6291,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7596,7 +7672,7 @@
+@@ -7596,7 +7683,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -6269,7 +6300,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -7609,9 +7685,9 @@
+@@ -7609,9 +7696,9 @@
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
  set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -6281,7 +6312,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL"; then
-@@ -7622,24 +7698,24 @@
+@@ -7622,24 +7709,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6311,7 +6342,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7649,9 +7725,9 @@
+@@ -7649,9 +7736,9 @@
    ac_ct_OTOOL=$OTOOL
    # Extract the first word of "otool", so it can be a program name with args.
  set dummy otool; ac_word=$2
@@ -6323,7 +6354,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL"; then
-@@ -7662,24 +7738,24 @@
+@@ -7662,24 +7749,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6353,7 +6384,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7688,7 +7764,7 @@
+@@ -7688,7 +7775,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -6362,7 +6393,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -7701,9 +7777,9 @@
+@@ -7701,9 +7788,9 @@
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
  set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -6374,7 +6405,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL64"; then
-@@ -7714,24 +7790,24 @@
+@@ -7714,24 +7801,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6404,7 +6435,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7741,9 +7817,9 @@
+@@ -7741,9 +7828,9 @@
    ac_ct_OTOOL64=$OTOOL64
    # Extract the first word of "otool64", so it can be a program name with args.
  set dummy otool64; ac_word=$2
@@ -6416,7 +6447,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL64"; then
-@@ -7754,24 +7830,24 @@
+@@ -7754,24 +7841,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6446,7 +6477,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7780,7 +7856,7 @@
+@@ -7780,7 +7867,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -6455,7 +6486,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -7816,9 +7892,9 @@
+@@ -7816,9 +7903,9 @@
  
  
  
@@ -6467,7 +6498,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_apple_cc_single_mod=no
-@@ -7843,22 +7919,18 @@
+@@ -7843,22 +7930,18 @@
  	rm -f conftest.*
        fi
  fi
@@ -6494,7 +6525,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -7869,42 +7941,17 @@
+@@ -7869,42 +7952,17 @@
    return 0;
  }
  _ACEOF
@@ -6542,7 +6573,7 @@
  $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
      case $host_os in
      rhapsody* | darwin1.[012])
-@@ -7946,14 +7993,14 @@
+@@ -7946,14 +8004,14 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6559,7 +6590,7 @@
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
-@@ -7968,11 +8015,7 @@
+@@ -7968,11 +8026,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -6572,7 +6603,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -7981,78 +8024,34 @@
+@@ -7981,78 +8035,34 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -6656,7 +6687,7 @@
    break
  fi
  
-@@ -8064,7 +8063,7 @@
+@@ -8064,7 +8074,7 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -6665,7 +6696,7 @@
  $as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -8075,11 +8074,7 @@
+@@ -8075,11 +8085,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -6678,7 +6709,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -8088,87 +8083,40 @@
+@@ -8088,87 +8094,40 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -6775,7 +6806,7 @@
  fi
  
  ac_ext=c
-@@ -8178,16 +8126,12 @@
+@@ -8178,16 +8137,12 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -6795,7 +6826,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -8202,48 +8146,23 @@
+@@ -8202,48 +8157,23 @@
    return 0;
  }
  _ACEOF
@@ -6849,7 +6880,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -8253,18 +8172,14 @@
+@@ -8253,18 +8183,14 @@
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -6871,7 +6902,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -8274,14 +8189,10 @@
+@@ -8274,14 +8200,10 @@
  
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -6888,7 +6919,7 @@
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-@@ -8308,118 +8219,34 @@
+@@ -8308,118 +8230,34 @@
    return 0;
  }
  _ACEOF
@@ -7020,7 +7051,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -8429,62 +8256,13 @@
+@@ -8429,62 +8267,13 @@
  done
  
  
@@ -7088,7 +7119,7 @@
  _ACEOF
  
  fi
-@@ -8507,9 +8285,9 @@
+@@ -8507,9 +8296,9 @@
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -7100,7 +7131,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CXX"; then
-@@ -8520,24 +8298,24 @@
+@@ -8520,24 +8309,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7130,7 +7161,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8551,9 +8329,9 @@
+@@ -8551,9 +8340,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -7142,7 +7173,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CXX"; then
-@@ -8564,24 +8342,24 @@
+@@ -8564,24 +8353,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7172,7 +7203,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8594,7 +8372,7 @@
+@@ -8594,7 +8383,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -7181,7 +7212,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -8605,53 +8383,36 @@
+@@ -8605,53 +8394,36 @@
    fi
  fi
  # Provide some information about the compiler.
@@ -7254,7 +7285,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -8665,37 +8426,16 @@
+@@ -8665,37 +8437,16 @@
    return 0;
  }
  _ACEOF
@@ -7295,7 +7326,7 @@
  $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GXX=yes
-@@ -8704,20 +8444,16 @@
+@@ -8704,20 +8455,16 @@
  fi
  ac_test_CXXFLAGS=${CXXFLAGS+set}
  ac_save_CXXFLAGS=$CXXFLAGS
@@ -7319,7 +7350,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -8728,35 +8464,11 @@
+@@ -8728,35 +8475,11 @@
    return 0;
  }
  _ACEOF
@@ -7358,7 +7389,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -8767,36 +8479,12 @@
+@@ -8767,36 +8490,12 @@
    return 0;
  }
  _ACEOF
@@ -7399,7 +7430,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -8807,42 +8495,17 @@
+@@ -8807,42 +8506,17 @@
    return 0;
  }
  _ACEOF
@@ -7444,7 +7475,7 @@
  $as_echo "$ac_cv_prog_cxx_g" >&6; }
  if test "$ac_test_CXXFLAGS" = set; then
    CXXFLAGS=$ac_save_CXXFLAGS
-@@ -8867,9 +8530,9 @@
+@@ -8867,9 +8541,9 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -7456,7 +7487,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -8977,7 +8640,7 @@
+@@ -8977,7 +8651,7 @@
  fi
  
  fi
@@ -7465,7 +7496,7 @@
  $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
-@@ -9000,10 +8663,10 @@
+@@ -9000,10 +8674,10 @@
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
@@ -7478,7 +7509,7 @@
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CXXCPP needs to be expanded
-@@ -9018,11 +8681,7 @@
+@@ -9018,11 +8692,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -7491,7 +7522,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -9031,78 +8690,34 @@
+@@ -9031,78 +8701,34 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -7575,7 +7606,7 @@
    break
  fi
  
-@@ -9114,7 +8729,7 @@
+@@ -9114,7 +8740,7 @@
  else
    ac_cv_prog_CXXCPP=$CXXCPP
  fi
@@ -7584,7 +7615,7 @@
  $as_echo "$CXXCPP" >&6; }
  ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
-@@ -9125,11 +8740,7 @@
+@@ -9125,11 +8751,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -7597,7 +7628,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -9138,81 +8749,37 @@
+@@ -9138,81 +8760,37 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -7686,7 +7717,7 @@
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  _lt_caught_CXX_error=yes; }
  fi
-@@ -9239,7 +8806,7 @@
+@@ -9239,7 +8817,7 @@
  
  
              # Check whether --enable-shared was given.
@@ -7695,7 +7726,7 @@
    enableval=$enable_shared; p=${PACKAGE-default}
      case $enableval in
      yes) enable_shared=yes ;;
-@@ -9272,7 +8839,7 @@
+@@ -9272,7 +8850,7 @@
  
  
  # Check whether --with-pic was given.
@@ -7704,7 +7735,7 @@
    withval=$with_pic; pic_mode="$withval"
  else
    pic_mode=default
-@@ -9288,7 +8855,7 @@
+@@ -9288,7 +8866,7 @@
  
  
    # Check whether --enable-fast-install was given.
@@ -7713,7 +7744,7 @@
    enableval=$enable_fast_install; p=${PACKAGE-default}
      case $enableval in
      yes) enable_fast_install=yes ;;
-@@ -9369,9 +8936,9 @@
+@@ -9369,9 +8947,9 @@
     setopt NO_GLOB_SUBST
  fi
  
@@ -7725,7 +7756,7 @@
    $as_echo_n "(cached) " >&6
  else
    rm -f .libs 2>/dev/null
-@@ -9384,7 +8951,7 @@
+@@ -9384,7 +8962,7 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -7734,7 +7765,7 @@
  $as_echo "$lt_cv_objdir" >&6; }
  objdir=$lt_cv_objdir
  
-@@ -9477,9 +9044,9 @@
+@@ -9477,9 +9055,9 @@
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -7746,7 +7777,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
-@@ -9530,10 +9097,10 @@
+@@ -9530,10 +9108,10 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -7759,7 +7790,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -9543,9 +9110,9 @@
+@@ -9543,9 +9121,9 @@
  
  if test -z "$lt_cv_path_MAGIC_CMD"; then
    if test -n "$ac_tool_prefix"; then
@@ -7771,7 +7802,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
-@@ -9596,10 +9163,10 @@
+@@ -9596,10 +9174,10 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -7784,7 +7815,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -9676,9 +9243,9 @@
+@@ -9676,9 +9254,9 @@
  if test "$GCC" = yes; then
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
@@ -7796,21 +7827,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9694,11 +9261,11 @@
+@@ -9694,11 +9272,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9697: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9264: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9275: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9701: \$? = $ac_status" >&5
-+   echo "$as_me:9268: \$? = $ac_status" >&5
++   echo "$as_me:9279: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9711,7 +9278,7 @@
+@@ -9711,7 +9289,7 @@
     $RM conftest*
  
  fi
@@ -7819,7 +7850,7 @@
  $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9731,7 +9298,7 @@
+@@ -9731,7 +9309,7 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -7828,7 +7859,7 @@
  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  
    if test "$GCC" = yes; then
-@@ -10003,7 +9570,7 @@
+@@ -10003,7 +9581,7 @@
      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
      ;;
  esac
@@ -7837,7 +7868,7 @@
  $as_echo "$lt_prog_compiler_pic" >&6; }
  
  
-@@ -10015,9 +9582,9 @@
+@@ -10015,9 +9593,9 @@
  # Check to make sure the PIC flag actually works.
  #
  if test -n "$lt_prog_compiler_pic"; then
@@ -7849,21 +7880,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_pic_works=no
-@@ -10033,11 +9600,11 @@
+@@ -10033,11 +9611,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:10036: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9603: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9614: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:10040: \$? = $ac_status" >&5
-+   echo "$as_me:9607: \$? = $ac_status" >&5
++   echo "$as_me:9618: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -10050,7 +9617,7 @@
+@@ -10050,7 +9628,7 @@
     $RM conftest*
  
  fi
@@ -7872,7 +7903,7 @@
  $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
  
  if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -10074,9 +9641,9 @@
+@@ -10074,9 +9652,9 @@
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -7884,7 +7915,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_static_works=no
-@@ -10102,7 +9669,7 @@
+@@ -10102,7 +9680,7 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -7893,7 +7924,7 @@
  $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
  
  if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -10117,9 +9684,9 @@
+@@ -10117,9 +9695,9 @@
  
  
  
@@ -7905,21 +7936,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
-@@ -10138,11 +9705,11 @@
+@@ -10138,11 +9716,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:10141: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9708: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9719: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:10145: \$? = $ac_status" >&5
-+   echo "$as_me:9712: \$? = $ac_status" >&5
++   echo "$as_me:9723: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -10164,7 +9731,7 @@
+@@ -10164,7 +9742,7 @@
     $RM conftest*
  
  fi
@@ -7928,7 +7959,7 @@
  $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
-@@ -10172,9 +9739,9 @@
+@@ -10172,9 +9750,9 @@
  
  
  
@@ -7940,21 +7971,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
-@@ -10193,11 +9760,11 @@
+@@ -10193,11 +9771,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:10196: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9763: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9774: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:10200: \$? = $ac_status" >&5
-+   echo "$as_me:9767: \$? = $ac_status" >&5
++   echo "$as_me:9778: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -10219,7 +9786,7 @@
+@@ -10219,7 +9797,7 @@
     $RM conftest*
  
  fi
@@ -7963,7 +7994,7 @@
  $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
-@@ -10228,7 +9795,7 @@
+@@ -10228,7 +9806,7 @@
  hard_links="nottested"
  if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
    # do not overwrite the value of need_locks provided by the user
@@ -7972,7 +8003,7 @@
  $as_echo_n "checking if we can lock with hard links... " >&6; }
    hard_links=yes
    $RM conftest*
-@@ -10236,10 +9803,10 @@
+@@ -10236,10 +9814,10 @@
    touch conftest.a
    ln conftest.a conftest.b 2>&5 || hard_links=no
    ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -7985,7 +8016,7 @@
  $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
      need_locks=warn
    fi
-@@ -10252,7 +9819,7 @@
+@@ -10252,7 +9830,7 @@
  
  
  
@@ -7994,7 +8025,7 @@
  $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  
    runpath_var=
-@@ -10312,6 +9879,9 @@
+@@ -10312,6 +9890,9 @@
    openbsd*)
      with_gnu_ld=no
      ;;
@@ -8004,7 +8035,7 @@
    esac
  
    ld_shlibs=yes
-@@ -10494,7 +10064,7 @@
+@@ -10494,7 +10075,7 @@
        fi
        ;;
  
@@ -8013,7 +8044,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -10669,6 +10239,7 @@
+@@ -10669,6 +10250,7 @@
  	if test "$aix_use_runtimelinking" = yes; then
  	  shared_flag="$shared_flag "'${wl}-G'
  	fi
@@ -8021,7 +8052,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -10694,11 +10265,7 @@
+@@ -10694,11 +10276,7 @@
  	allow_undefined_flag='-berok'
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -8034,7 +8065,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -10709,27 +10276,7 @@
+@@ -10709,27 +10287,7 @@
    return 0;
  }
  _ACEOF
@@ -8063,7 +8094,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -10743,16 +10290,9 @@
+@@ -10743,16 +10301,9 @@
  if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
@@ -8082,7 +8113,7 @@
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10765,11 +10305,7 @@
+@@ -10765,11 +10316,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an
  	 # empty executable.
@@ -8095,7 +8126,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -10780,27 +10316,7 @@
+@@ -10780,27 +10327,7 @@
    return 0;
  }
  _ACEOF
@@ -8124,7 +8155,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -10814,16 +10330,9 @@
+@@ -10814,16 +10341,9 @@
  if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
@@ -8143,7 +8174,7 @@
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
  	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -11035,42 +10544,16 @@
+@@ -11035,42 +10555,16 @@
  	# implicitly export all symbols.
          save_LDFLAGS="$LDFLAGS"
          LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -8191,7 +8222,7 @@
          LDFLAGS="$save_LDFLAGS"
        else
  	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11083,7 +10566,7 @@
+@@ -11083,7 +10577,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -8200,7 +8231,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -11326,7 +10809,7 @@
+@@ -11326,7 +10820,7 @@
      fi
    fi
  
@@ -8209,7 +8240,7 @@
  $as_echo "$ld_shlibs" >&6; }
  test "$ld_shlibs" = no && can_build_shared=no
  
-@@ -11363,16 +10846,16 @@
+@@ -11363,16 +10857,16 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -8230,7 +8261,7 @@
          soname=conftest
          lib=conftest
          libobjs=conftest.$ac_objext
-@@ -11386,11 +10869,11 @@
+@@ -11386,11 +10880,11 @@
          libname=conftest
          lt_save_allow_undefined_flag=$allow_undefined_flag
          allow_undefined_flag=
@@ -8245,7 +8276,7 @@
          then
  	  archive_cmds_need_lc=no
          else
-@@ -11401,7 +10884,7 @@
+@@ -11401,7 +10895,7 @@
          cat conftest.err 1>&5
        fi
        $RM conftest*
@@ -8254,7 +8285,7 @@
  $as_echo "$archive_cmds_need_lc" >&6; }
        ;;
      esac
-@@ -11565,7 +11048,7 @@
+@@ -11565,7 +11059,7 @@
  
  
  
@@ -8263,7 +8294,7 @@
  $as_echo_n "checking dynamic linker characteristics... " >&6; }
  
  if test "$GCC" = yes; then
-@@ -11987,11 +11470,7 @@
+@@ -11987,11 +11481,7 @@
    save_libdir=$libdir
    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
         LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -8276,7 +8307,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -12002,41 +11481,13 @@
+@@ -12002,41 +11492,13 @@
    return 0;
  }
  _ACEOF
@@ -8322,7 +8353,7 @@
    LDFLAGS=$save_LDFLAGS
    libdir=$save_libdir
  
-@@ -12045,13 +11496,10 @@
+@@ -12045,13 +11507,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -8337,7 +8368,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12063,6 +11511,18 @@
+@@ -12063,6 +11522,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -8356,7 +8387,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -12251,7 +11711,7 @@
+@@ -12251,7 +11722,7 @@
    dynamic_linker=no
    ;;
  esac
@@ -8365,7 +8396,7 @@
  $as_echo "$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
-@@ -12353,7 +11813,7 @@
+@@ -12353,7 +11824,7 @@
  
  
  
@@ -8374,7 +8405,7 @@
  $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" ||
-@@ -12378,7 +11838,7 @@
+@@ -12378,7 +11849,7 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -8383,7 +8414,7 @@
  $as_echo "$hardcode_action" >&6; }
  
  if test "$hardcode_action" = relink ||
-@@ -12423,18 +11883,14 @@
+@@ -12423,18 +11894,14 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -8405,7 +8436,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -12452,43 +11908,18 @@
+@@ -12452,43 +11919,18 @@
    return 0;
  }
  _ACEOF
@@ -8455,7 +8486,7 @@
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
  
-@@ -12501,33 +11932,19 @@
+@@ -12501,33 +11943,19 @@
      ;;
  
    *)
@@ -8499,7 +8530,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -12536,13 +11953,6 @@
+@@ -12536,13 +11964,6 @@
  extern "C"
  #endif
  char shl_load ();
@@ -8513,7 +8544,7 @@
  int
  main ()
  {
-@@ -12551,56 +11961,32 @@
+@@ -12551,56 +11972,32 @@
    return 0;
  }
  _ACEOF
@@ -8589,7 +8620,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -12609,222 +11995,37 @@
+@@ -12609,222 +12006,37 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -8633,8 +8664,7 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_lib_dld_shl_load=no
-+  ac_cv_lib_dl_dlopen=no
- fi
+-fi
 -
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -8790,7 +8820,8 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_lib_dl_dlopen=no
--fi
++  ac_cv_lib_dl_dlopen=no
+ fi
 -
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -8824,7 +8855,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -12842,57 +12043,28 @@
+@@ -12842,57 +12054,28 @@
    return 0;
  }
  _ACEOF
@@ -8891,7 +8922,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -12910,43 +12082,18 @@
+@@ -12910,43 +12093,18 @@
    return 0;
  }
  _ACEOF
@@ -8941,7 +8972,7 @@
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
  fi
  
-@@ -12985,9 +12132,9 @@
+@@ -12985,9 +12143,9 @@
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
  
@@ -8953,16 +8984,16 @@
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
-@@ -12996,7 +12143,7 @@
+@@ -12996,7 +12154,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
 -#line 12999 "configure"
-+#line 12146 "configure"
++#line 12157 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -13055,11 +12202,11 @@
+@@ -13055,11 +12213,11 @@
    return status;
  }
  _LT_EOF
@@ -8977,7 +9008,7 @@
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
-@@ -13076,14 +12223,14 @@
+@@ -13076,14 +12234,14 @@
  
  
  fi
@@ -8995,16 +9026,16 @@
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
-@@ -13092,7 +12239,7 @@
+@@ -13092,7 +12250,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
 -#line 13095 "configure"
-+#line 12242 "configure"
++#line 12253 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -13151,11 +12298,11 @@
+@@ -13151,11 +12309,11 @@
    return status;
  }
  _LT_EOF
@@ -9019,7 +9050,7 @@
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
-@@ -13172,7 +12319,7 @@
+@@ -13172,7 +12330,7 @@
  
  
  fi
@@ -9028,7 +9059,7 @@
  $as_echo "$lt_cv_dlopen_self_static" >&6; }
      fi
  
-@@ -13211,12 +12358,12 @@
+@@ -13211,12 +12369,12 @@
  
  striplib=
  old_striplib=
@@ -9043,7 +9074,7 @@
  $as_echo "yes" >&6; }
  else
  # FIXME - insert some real tests, host_os isn't really good enough
-@@ -13225,15 +12372,15 @@
+@@ -13225,15 +12383,15 @@
      if test -n "$STRIP" ; then
        striplib="$STRIP -x"
        old_striplib="$STRIP -S"
@@ -9062,7 +9093,7 @@
  $as_echo "no" >&6; }
      ;;
    esac
-@@ -13251,12 +12398,12 @@
+@@ -13251,12 +12409,12 @@
  
  
    # Report which library types will actually be built
@@ -9078,7 +9109,7 @@
  $as_echo_n "checking whether to build shared libraries... " >&6; }
    test "$can_build_shared" = "no" && enable_shared=no
  
-@@ -13277,14 +12424,14 @@
+@@ -13277,14 +12435,14 @@
      fi
      ;;
    esac
@@ -9096,7 +9127,7 @@
  $as_echo "$enable_static" >&6; }
  
  
-@@ -13425,7 +12572,7 @@
+@@ -13425,7 +12583,7 @@
  
  
  # Check whether --with-gnu-ld was given.
@@ -9105,7 +9136,7 @@
    withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
  else
    with_gnu_ld=no
-@@ -13434,7 +12581,7 @@
+@@ -13434,7 +12592,7 @@
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
@@ -9114,7 +9145,7 @@
  $as_echo_n "checking for ld used by $CC... " >&6; }
    case $host in
    *-*-mingw*)
-@@ -13464,13 +12611,13 @@
+@@ -13464,13 +12622,13 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -9131,7 +9162,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
-@@ -13501,18 +12648,16 @@
+@@ -13501,18 +12659,16 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -9155,7 +9186,7 @@
    $as_echo_n "(cached) " >&6
  else
    # I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -13525,7 +12670,7 @@
+@@ -13525,7 +12681,7 @@
    ;;
  esac
  fi
@@ -9164,7 +9195,7 @@
  $as_echo "$lt_cv_prog_gnu_ld" >&6; }
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
-@@ -13580,7 +12725,7 @@
+@@ -13580,7 +12736,7 @@
      fi
  
      # PORTME: fill in a description of your system's C++ link characteristics
@@ -9173,7 +9204,7 @@
  $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
      ld_shlibs_CXX=yes
      case $host_os in
-@@ -13681,11 +12826,7 @@
+@@ -13681,11 +12837,7 @@
            allow_undefined_flag_CXX='-berok'
            # Determine the default libpath from the value encoded in an empty
            # executable.
@@ -9186,7 +9217,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -13696,27 +12837,7 @@
+@@ -13696,27 +12848,7 @@
    return 0;
  }
  _ACEOF
@@ -9215,7 +9246,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -13730,16 +12851,9 @@
+@@ -13730,16 +12862,9 @@
  if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
@@ -9234,7 +9265,7 @@
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
            hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -13753,11 +12867,7 @@
+@@ -13753,11 +12878,7 @@
            else
  	    # Determine the default libpath from the value encoded in an
  	    # empty executable.
@@ -9247,7 +9278,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -13768,27 +12878,7 @@
+@@ -13768,27 +12889,7 @@
    return 0;
  }
  _ACEOF
@@ -9276,7 +9307,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -13802,16 +12892,9 @@
+@@ -13802,16 +12903,9 @@
  if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
@@ -9295,7 +9326,7 @@
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
  	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -14555,7 +13638,7 @@
+@@ -14555,7 +13649,7 @@
          ;;
      esac
  
@@ -9304,7 +9335,7 @@
  $as_echo "$ld_shlibs_CXX" >&6; }
      test "$ld_shlibs_CXX" = no && can_build_shared=no
  
-@@ -14583,11 +13666,11 @@
+@@ -14583,11 +13677,11 @@
  };
  _LT_EOF
  
@@ -9319,7 +9350,7 @@
    # Parse the compiler output and extract the necessary
    # objects, libraries and library flags.
  
-@@ -14768,7 +13851,7 @@
+@@ -14768,7 +13862,7 @@
  lt_prog_compiler_pic_CXX=
  lt_prog_compiler_static_CXX=
  
@@ -9328,7 +9359,7 @@
  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  
    # C++ specific cases for pic, static, wl, etc.
-@@ -14988,7 +14071,7 @@
+@@ -14988,7 +14082,7 @@
  	    ;;
  	esac
  	;;
@@ -9337,7 +9368,7 @@
  	;;
        *qnx* | *nto*)
          # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -15085,7 +14168,7 @@
+@@ -15085,7 +14179,7 @@
      lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
      ;;
  esac
@@ -9346,7 +9377,7 @@
  $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
  
  
-@@ -15094,9 +14177,9 @@
+@@ -15094,9 +14188,9 @@
  # Check to make sure the PIC flag actually works.
  #
  if test -n "$lt_prog_compiler_pic_CXX"; then
@@ -9358,21 +9389,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_pic_works_CXX=no
-@@ -15112,11 +14195,11 @@
+@@ -15112,11 +14206,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:15115: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14198: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14209: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:15119: \$? = $ac_status" >&5
-+   echo "$as_me:14202: \$? = $ac_status" >&5
++   echo "$as_me:14213: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -15129,7 +14212,7 @@
+@@ -15129,7 +14223,7 @@
     $RM conftest*
  
  fi
@@ -9381,7 +9412,7 @@
  $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
  
  if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-@@ -15150,9 +14233,9 @@
+@@ -15150,9 +14244,9 @@
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
@@ -9393,7 +9424,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_static_works_CXX=no
-@@ -15178,7 +14261,7 @@
+@@ -15178,7 +14272,7 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -9402,7 +9433,7 @@
  $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
  
  if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-@@ -15190,9 +14273,9 @@
+@@ -15190,9 +14284,9 @@
  
  
  
@@ -9414,21 +9445,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o_CXX=no
-@@ -15211,11 +14294,11 @@
+@@ -15211,11 +14305,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:15214: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14297: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14308: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:15218: \$? = $ac_status" >&5
-+   echo "$as_me:14301: \$? = $ac_status" >&5
++   echo "$as_me:14312: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -15237,14 +14320,14 @@
+@@ -15237,14 +14331,14 @@
     $RM conftest*
  
  fi
@@ -9446,21 +9477,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o_CXX=no
-@@ -15263,11 +14346,11 @@
+@@ -15263,11 +14357,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:15266: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14349: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14360: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:15270: \$? = $ac_status" >&5
-+   echo "$as_me:14353: \$? = $ac_status" >&5
++   echo "$as_me:14364: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -15289,7 +14372,7 @@
+@@ -15289,7 +14383,7 @@
     $RM conftest*
  
  fi
@@ -9469,7 +9500,7 @@
  $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
  
  
-@@ -15298,7 +14381,7 @@
+@@ -15298,7 +14392,7 @@
  hard_links="nottested"
  if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
    # do not overwrite the value of need_locks provided by the user
@@ -9478,7 +9509,7 @@
  $as_echo_n "checking if we can lock with hard links... " >&6; }
    hard_links=yes
    $RM conftest*
-@@ -15306,10 +14389,10 @@
+@@ -15306,10 +14400,10 @@
    touch conftest.a
    ln conftest.a conftest.b 2>&5 || hard_links=no
    ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -9491,7 +9522,7 @@
  $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
      need_locks=warn
    fi
-@@ -15319,7 +14402,7 @@
+@@ -15319,7 +14413,7 @@
  
  
  
@@ -9500,7 +9531,7 @@
  $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -15339,13 +14422,16 @@
+@@ -15339,13 +14433,16 @@
    cygwin* | mingw* | cegcc*)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
@@ -9518,7 +9549,7 @@
  $as_echo "$ld_shlibs_CXX" >&6; }
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
-@@ -15373,16 +14459,16 @@
+@@ -15373,16 +14470,16 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -9539,7 +9570,7 @@
          soname=conftest
          lib=conftest
          libobjs=conftest.$ac_objext
-@@ -15396,11 +14482,11 @@
+@@ -15396,11 +14493,11 @@
          libname=conftest
          lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
          allow_undefined_flag_CXX=
@@ -9554,7 +9585,7 @@
          then
  	  archive_cmds_need_lc_CXX=no
          else
-@@ -15411,7 +14497,7 @@
+@@ -15411,7 +14508,7 @@
          cat conftest.err 1>&5
        fi
        $RM conftest*
@@ -9563,7 +9594,7 @@
  $as_echo "$archive_cmds_need_lc_CXX" >&6; }
        ;;
      esac
-@@ -15482,7 +14568,7 @@
+@@ -15482,7 +14579,7 @@
  
  
  
@@ -9572,7 +9603,7 @@
  $as_echo_n "checking dynamic linker characteristics... " >&6; }
  
  library_names_spec=
-@@ -15852,11 +14938,7 @@
+@@ -15852,11 +14949,7 @@
    save_libdir=$libdir
    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
         LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
@@ -9585,7 +9616,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -15867,41 +14949,13 @@
+@@ -15867,41 +14960,13 @@
    return 0;
  }
  _ACEOF
@@ -9631,7 +9662,7 @@
    LDFLAGS=$save_LDFLAGS
    libdir=$save_libdir
  
-@@ -15910,13 +14964,10 @@
+@@ -15910,13 +14975,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -9646,7 +9677,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15928,6 +14979,18 @@
+@@ -15928,6 +14990,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -9665,7 +9696,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -16116,7 +15179,7 @@
+@@ -16116,7 +15190,7 @@
    dynamic_linker=no
    ;;
  esac
@@ -9674,7 +9705,7 @@
  $as_echo "$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
-@@ -16167,7 +15230,7 @@
+@@ -16167,7 +15241,7 @@
  
  
  
@@ -9683,7 +9714,7 @@
  $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
  hardcode_action_CXX=
  if test -n "$hardcode_libdir_flag_spec_CXX" ||
-@@ -16192,7 +15255,7 @@
+@@ -16192,7 +15266,7 @@
    # directories.
    hardcode_action_CXX=unsupported
  fi
@@ -9692,7 +9723,7 @@
  $as_echo "$hardcode_action_CXX" >&6; }
  
  if test "$hardcode_action_CXX" = relink ||
-@@ -16251,7 +15314,7 @@
+@@ -16251,7 +15325,7 @@
  
  
  : ${CONFIG_LT=./config.lt}
@@ -9701,7 +9732,7 @@
  $as_echo "$as_me: creating $CONFIG_LT" >&6;}
  cat >"$CONFIG_LT" <<_LTEOF
  #! $SHELL
-@@ -16263,13 +15326,13 @@
+@@ -16263,13 +15337,13 @@
  _LTEOF
  
  cat >>"$CONFIG_LT" <<\_LTEOF
@@ -9719,7 +9750,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -16277,23 +15340,15 @@
+@@ -16277,23 +15351,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -9748,7 +9779,7 @@
  as_nl='
  '
  export as_nl
-@@ -16301,7 +15356,13 @@
+@@ -16301,7 +15367,13 @@
  as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -9763,7 +9794,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -16312,7 +15373,7 @@
+@@ -16312,7 +15384,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -9772,7 +9803,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -16335,13 +15396,6 @@
+@@ -16335,13 +15407,6 @@
    }
  fi
  
@@ -9786,7 +9817,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -16351,15 +15405,15 @@
+@@ -16351,15 +15416,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -9805,7 +9836,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -16371,12 +15425,16 @@
+@@ -16371,12 +15436,16 @@
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -9826,7 +9857,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -16388,7 +15446,90 @@
+@@ -16388,7 +15457,90 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -9918,7 +9949,7 @@
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-@@ -16402,8 +15543,12 @@
+@@ -16402,8 +15554,12 @@
    as_basename=false
  fi
  
@@ -9932,7 +9963,7 @@
  as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
-@@ -16423,77 +15568,25 @@
+@@ -16423,77 +15579,25 @@
  	  }
  	  s/.*/./; q'`
  
@@ -10021,7 +10052,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -16522,8 +15615,56 @@
+@@ -16522,8 +15626,56 @@
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
  
@@ -10079,7 +10110,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -16542,10 +15683,10 @@
+@@ -16542,10 +15694,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -10092,7 +10123,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -16585,7 +15726,7 @@
+@@ -16585,7 +15737,7 @@
  
  lt_cl_version="\
  gtk+ config.lt 2.18.4
@@ -10101,7 +10132,7 @@
  
  Copyright (C) 2008 Free Software Foundation, Inc.
  This config.lt script is free software; the Free Software Foundation
-@@ -16603,17 +15744,11 @@
+@@ -16603,17 +15755,11 @@
      --quiet | --q* | --silent | --s* | -q )
        lt_cl_silent=: ;;
  
@@ -10124,7 +10155,7 @@
    esac
    shift
  done
-@@ -16979,7 +16114,7 @@
+@@ -16979,7 +16125,7 @@
  _LTEOF
  
  cat >>"$CONFIG_LT" <<\_LTEOF
@@ -10133,7 +10164,7 @@
  $as_echo "$as_me: creating $ofile" >&6;}
  
  
-@@ -17789,7 +16924,7 @@
+@@ -17789,7 +16935,7 @@
  _LT_EOF
  
  
@@ -10142,7 +10173,7 @@
  _LTEOF
  chmod +x "$CONFIG_LT"
  
-@@ -17804,22 +16939,22 @@
+@@ -17804,22 +16950,22 @@
    exec 5>/dev/null
    $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
    exec 5>>config.log
@@ -10169,7 +10200,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_cv_sys_largefile_CC=no
-@@ -17828,11 +16963,7 @@
+@@ -17828,11 +16974,7 @@
         while :; do
  	 # IRIX 6.2 and later do not support large files by default,
  	 # so use the C compiler's -n32 option if that helps.
@@ -10182,7 +10213,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -17851,60 +16982,14 @@
+@@ -17851,60 +16993,14 @@
    return 0;
  }
  _ACEOF
@@ -10245,7 +10276,7 @@
  rm -f core conftest.err conftest.$ac_objext
  	 break
         done
-@@ -17912,23 +16997,19 @@
+@@ -17912,23 +17008,19 @@
         rm -f conftest.$ac_ext
      fi
  fi
@@ -10273,7 +10304,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -17947,38 +17028,11 @@
+@@ -17947,38 +17039,11 @@
    return 0;
  }
  _ACEOF
@@ -10314,7 +10345,7 @@
  /* end confdefs.h.  */
  #define _FILE_OFFSET_BITS 64
  #include <sys/types.h>
-@@ -17998,38 +17052,15 @@
+@@ -17998,38 +17063,15 @@
    return 0;
  }
  _ACEOF
@@ -10355,7 +10386,7 @@
  $as_echo "$ac_cv_sys_file_offset_bits" >&6; }
  case $ac_cv_sys_file_offset_bits in #(
    no | unknown) ;;
-@@ -18041,17 +17072,13 @@
+@@ -18041,17 +17083,13 @@
  esac
  rm -rf conftest*
    if test $ac_cv_sys_file_offset_bits = unknown; then
@@ -10376,7 +10407,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -18070,38 +17097,11 @@
+@@ -18070,38 +17108,11 @@
    return 0;
  }
  _ACEOF
@@ -10417,7 +10448,7 @@
  /* end confdefs.h.  */
  #define _LARGE_FILES 1
  #include <sys/types.h>
-@@ -18121,38 +17121,15 @@
+@@ -18121,38 +17132,15 @@
    return 0;
  }
  _ACEOF
@@ -10458,7 +10489,7 @@
  $as_echo "$ac_cv_sys_large_files" >&6; }
  case $ac_cv_sys_large_files in #(
    no | unknown) ;;
-@@ -18176,9 +17153,9 @@
+@@ -18176,9 +17164,9 @@
  
  depcc="$CCAS"   am_compiler_list=
  
@@ -10470,7 +10501,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -18284,7 +17261,7 @@
+@@ -18284,7 +17272,7 @@
  fi
  
  fi
@@ -10479,7 +10510,7 @@
  $as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
  CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
  
-@@ -18301,9 +17278,9 @@
+@@ -18301,9 +17289,9 @@
  
  # Extract the first word of "nm", so it can be a program name with args.
  set dummy nm; ac_word=$2
@@ -10491,7 +10522,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $NM in
-@@ -18316,14 +17293,14 @@
+@@ -18316,14 +17304,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10509,7 +10540,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm"
-@@ -18332,26 +17309,26 @@
+@@ -18332,26 +17320,26 @@
  fi
  NM=$ac_cv_path_NM
  if test -n "$NM"; then
@@ -10541,7 +10572,7 @@
  $as_echo "$USE_MAINTAINER_MODE" >&6; }
     if test $USE_MAINTAINER_MODE = yes; then
    MAINTAINER_MODE_TRUE=
-@@ -18365,7 +17342,7 @@
+@@ -18365,7 +17353,7 @@
  
  
  
@@ -10550,7 +10581,7 @@
  $as_echo_n "checking for some Win32 platform... " >&6; }
  case "$host" in
    *-*-mingw*|*-*-cygwin*)
-@@ -18375,7 +17352,7 @@
+@@ -18375,7 +17363,7 @@
      platform_win32=no
      ;;
  esac
@@ -10559,7 +10590,7 @@
  $as_echo "$platform_win32" >&6; }
   if test "$platform_win32" = "yes"; then
    PLATFORM_WIN32_TRUE=
-@@ -18415,9 +17392,9 @@
+@@ -18415,9 +17403,9 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
  set dummy ${ac_tool_prefix}windres; ac_word=$2
@@ -10571,7 +10602,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$WINDRES"; then
-@@ -18428,24 +17405,24 @@
+@@ -18428,24 +17416,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10601,7 +10632,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -18455,9 +17432,9 @@
+@@ -18455,9 +17443,9 @@
    ac_ct_WINDRES=$WINDRES
    # Extract the first word of "windres", so it can be a program name with args.
  set dummy windres; ac_word=$2
@@ -10613,7 +10644,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_WINDRES"; then
-@@ -18468,24 +17445,24 @@
+@@ -18468,24 +17456,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10643,7 +10674,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -18494,7 +17471,7 @@
+@@ -18494,7 +17482,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -10652,7 +10683,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -18505,15 +17482,13 @@
+@@ -18505,15 +17493,13 @@
  fi
  
    if test "$WINDRES" = no; then
@@ -10671,7 +10702,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ms_librarian"; then
-@@ -18524,14 +17499,14 @@
+@@ -18524,14 +17510,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10689,7 +10720,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no"
-@@ -18539,10 +17514,10 @@
+@@ -18539,10 +17525,10 @@
  fi
  ms_librarian=$ac_cv_prog_ms_librarian
  if test -n "$ms_librarian"; then
@@ -10702,7 +10733,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -18560,42 +17535,42 @@
+@@ -18560,42 +17546,42 @@
  
  
  # Check whether --enable-debug was given.
@@ -10751,7 +10782,7 @@
    enableval=$enable_visibility;
  else
    enable_visibility=yes
-@@ -18604,7 +17579,7 @@
+@@ -18604,7 +17590,7 @@
  
  
  # Check whether --with-xinput was given.
@@ -10760,7 +10791,7 @@
    withval=$with_xinput;
  fi
  
-@@ -18617,7 +17592,7 @@
+@@ -18617,7 +17603,7 @@
  
  
  # Check whether --with-gdktarget was given.
@@ -10769,7 +10800,7 @@
    withval=$with_gdktarget; gdktarget=$with_gdktarget
  fi
  
-@@ -18625,9 +17600,7 @@
+@@ -18625,9 +17611,7 @@
  
  case $gdktarget in
    x11|win32|quartz|directfb) ;;
@@ -10780,7 +10811,7 @@
  esac
  
  gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
-@@ -18661,7 +17634,7 @@
+@@ -18661,7 +17645,7 @@
  
  
  # Build time sanity check...
@@ -10789,7 +10820,7 @@
  $as_echo_n "checking whether build environment is sane... " >&6; }
  # Just in case
  sleep 1
-@@ -18672,15 +17645,11 @@
+@@ -18672,15 +17656,11 @@
  '
  case `pwd` in
    *[\\\"\#\$\&\'\`$am_lf]*)
@@ -10807,7 +10838,7 @@
  esac
  
  # Do `set' in a subshell so we don't clobber the current shell's
-@@ -18702,11 +17671,8 @@
+@@ -18702,11 +17682,8 @@
        # if, for instance, CONFIG_SHELL is bash and it inherits a
        # broken ls alias from the environment.  This has actually
        # happened.  Such a system could not be considered "sane".
@@ -10821,7 +10852,7 @@
     fi
  
     test "$2" = conftest.file
-@@ -18715,27 +17681,20 @@
+@@ -18715,27 +17692,20 @@
     # Ok.
     :
  else
@@ -10855,7 +10886,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18760,54 +17719,27 @@
+@@ -18760,54 +17730,27 @@
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
@@ -10918,7 +10949,7 @@
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
-@@ -18820,9 +17752,9 @@
+@@ -18820,9 +17763,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -10930,7 +10961,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -18833,24 +17765,24 @@
+@@ -18833,24 +17776,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10960,7 +10991,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -18860,9 +17792,9 @@
+@@ -18860,9 +17803,9 @@
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
@@ -10972,7 +11003,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -18873,24 +17805,24 @@
+@@ -18873,24 +17816,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11002,7 +11033,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -18899,7 +17831,7 @@
+@@ -18899,7 +17842,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -11011,7 +11042,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -18913,9 +17845,9 @@
+@@ -18913,9 +17856,9 @@
            if test -n "$ac_tool_prefix"; then
      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -11023,7 +11054,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -18926,24 +17858,24 @@
+@@ -18926,24 +17869,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11053,7 +11084,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -18953,9 +17885,9 @@
+@@ -18953,9 +17896,9 @@
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
@@ -11065,7 +11096,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -18967,18 +17899,18 @@
+@@ -18967,18 +17910,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11087,7 +11118,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -18997,10 +17929,10 @@
+@@ -18997,10 +17940,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -11100,7 +11131,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -19012,9 +17944,9 @@
+@@ -19012,9 +17955,9 @@
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -11112,7 +11143,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -19025,24 +17957,24 @@
+@@ -19025,24 +17968,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11142,7 +11173,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -19056,9 +17988,9 @@
+@@ -19056,9 +17999,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -11154,7 +11185,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -19069,24 +18001,24 @@
+@@ -19069,24 +18012,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11184,7 +11215,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -19099,7 +18031,7 @@
+@@ -19099,7 +18042,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -11193,7 +11224,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -19110,62 +18042,42 @@
+@@ -19110,62 +18053,42 @@
  fi
  
  
@@ -11278,7 +11309,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -19179,37 +18091,16 @@
+@@ -19179,37 +18102,16 @@
    return 0;
  }
  _ACEOF
@@ -11319,7 +11350,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -19218,20 +18109,16 @@
+@@ -19218,20 +18120,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -11343,7 +11374,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -19242,35 +18129,11 @@
+@@ -19242,35 +18140,11 @@
    return 0;
  }
  _ACEOF
@@ -11382,7 +11413,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -19281,36 +18144,12 @@
+@@ -19281,36 +18155,12 @@
    return 0;
  }
  _ACEOF
@@ -11423,7 +11454,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -19321,42 +18160,17 @@
+@@ -19321,42 +18171,17 @@
    return 0;
  }
  _ACEOF
@@ -11468,7 +11499,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -19373,18 +18187,14 @@
+@@ -19373,18 +18198,14 @@
      CFLAGS=
    fi
  fi
@@ -11490,7 +11521,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -19441,32 +18251,9 @@
+@@ -19441,32 +18262,9 @@
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -11524,7 +11555,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -19477,17 +18264,19 @@
+@@ -19477,17 +18275,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -11547,7 +11578,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -19497,9 +18286,9 @@
+@@ -19497,9 +18297,9 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -11559,7 +11590,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -19607,7 +18396,7 @@
+@@ -19607,7 +18407,7 @@
  fi
  
  fi
@@ -11568,7 +11599,7 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -19626,22 +18415,18 @@
+@@ -19626,22 +18426,18 @@
  am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
  
  if test "x$CC" != xcc; then
@@ -11595,7 +11626,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -19657,63 +18442,63 @@
+@@ -19657,63 +18453,63 @@
  # existing .o file with -o, though they will create one.
  ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
  rm -f conftest2.*
@@ -11684,7 +11715,7 @@
        then
  	# cc works too.
  	:
-@@ -19730,15 +18515,13 @@
+@@ -19730,15 +18526,13 @@
  
  fi
  if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -11703,7 +11734,7 @@
  
  fi
  
-@@ -19757,104 +18540,12 @@
+@@ -19757,104 +18551,12 @@
  fi
  
  
@@ -11810,7 +11841,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
-@@ -19872,11 +18563,11 @@
+@@ -19872,11 +18574,11 @@
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -11824,7 +11855,7 @@
  $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-@@ -19910,7 +18601,7 @@
+@@ -19910,7 +18612,7 @@
  if test x"$os_win32" = xyes; then
    if test x"$GCC" = xyes; then
      msnative_struct=''
@@ -11833,7 +11864,7 @@
  $as_echo_n "checking how to get MSVC-compatible struct packing... " >&6; }
      if test -z "$ac_cv_prog_CC"; then
        our_gcc="$CC"
-@@ -19930,13 +18621,13 @@
+@@ -19930,13 +18632,13 @@
  	;;
      esac
      if test x"$msnative_struct" = x ; then
@@ -11850,7 +11881,7 @@
  $as_echo "${msnative_struct}" >&6; }
      fi
    fi
-@@ -19957,9 +18648,9 @@
+@@ -19957,9 +18659,9 @@
  	if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -11862,7 +11893,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -19972,14 +18663,14 @@
+@@ -19972,14 +18674,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11880,7 +11911,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -19987,10 +18678,10 @@
+@@ -19987,10 +18689,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -11893,7 +11924,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -20000,9 +18691,9 @@
+@@ -20000,9 +18702,9 @@
    ac_pt_PKG_CONFIG=$PKG_CONFIG
    # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -11905,7 +11936,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $ac_pt_PKG_CONFIG in
-@@ -20015,14 +18706,14 @@
+@@ -20015,14 +18717,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11923,7 +11954,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -20030,10 +18721,10 @@
+@@ -20030,10 +18732,10 @@
  fi
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  if test -n "$ac_pt_PKG_CONFIG"; then
@@ -11936,7 +11967,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -20042,7 +18733,7 @@
+@@ -20042,7 +18744,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -11945,7 +11976,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -20055,13 +18746,13 @@
+@@ -20055,13 +18757,13 @@
  fi
  if test -n "$PKG_CONFIG"; then
  	_pkg_min_version=0.9.0
@@ -11962,7 +11993,7 @@
  $as_echo "no" >&6; }
  		PKG_CONFIG=""
  	fi
-@@ -20069,40 +18760,44 @@
+@@ -20069,40 +18771,44 @@
  fi
  
  pkg_failed=no
@@ -12026,7 +12057,7 @@
  fi
  
  
-@@ -20115,25 +18810,14 @@
+@@ -20115,25 +18821,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -12055,7 +12086,7 @@
  
  $BASE_DEPENDENCIES_PKG_ERRORS
  
-@@ -20143,22 +18827,11 @@
+@@ -20143,22 +18838,11 @@
  Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS
  and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -12081,7 +12112,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -20167,12 +18840,11 @@
+@@ -20167,12 +18851,11 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12096,7 +12127,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -20189,40 +18861,44 @@
+@@ -20189,40 +18872,44 @@
  fi
  
  pkg_failed=no
@@ -12160,7 +12191,7 @@
  fi
  
  
-@@ -20235,25 +18911,14 @@
+@@ -20235,25 +18922,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -12189,7 +12220,7 @@
  
  $CAIRO_BACKEND_PKG_ERRORS
  
-@@ -20263,22 +18928,11 @@
+@@ -20263,22 +18939,11 @@
  Alternatively, you may set the environment variables CAIRO_BACKEND_CFLAGS
  and CAIRO_BACKEND_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -12215,7 +12246,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -20287,12 +18941,11 @@
+@@ -20287,12 +18952,11 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12230,7 +12261,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -20309,14 +18962,14 @@
+@@ -20309,14 +18973,14 @@
  
  
  # Check whether --enable-explicit-deps was given.
@@ -12247,7 +12278,7 @@
  $as_echo_n "checking Whether to write dependencies into .pc files... " >&6; }
  case $enable_explicit_deps in
    auto)
-@@ -20330,12 +18983,10 @@
+@@ -20330,12 +18994,10 @@
    ;;
    yes|no)
    ;;
@@ -12262,7 +12293,7 @@
  $as_echo "$enable_explicit_deps" >&6; }
  
   if test $enable_explicit_deps = no; then
-@@ -20354,9 +19005,9 @@
+@@ -20354,9 +19016,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -12274,7 +12305,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PERL in
-@@ -20369,14 +19020,14 @@
+@@ -20369,14 +19031,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -12292,7 +12323,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -20384,10 +19035,10 @@
+@@ -20384,10 +19046,10 @@
  fi
  PERL=$ac_cv_path_PERL
  if test -n "$PERL"; then
@@ -12305,7 +12336,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -20399,9 +19050,9 @@
+@@ -20399,9 +19061,9 @@
  # We would like indent, but don't require it.
  # Extract the first word of "indent", so it can be a program name with args.
  set dummy indent; ac_word=$2
@@ -12317,7 +12348,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$INDENT"; then
-@@ -20412,24 +19063,24 @@
+@@ -20412,24 +19074,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -12347,7 +12378,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -20443,283 +19094,67 @@
+@@ -20443,283 +19105,67 @@
  fi
  
  
@@ -12667,7 +12698,7 @@
  /* end confdefs.h.  */
  #include <langinfo.h>
  int
-@@ -20733,56 +19168,25 @@
+@@ -20733,56 +19179,25 @@
    return 0;
  }
  _ACEOF
@@ -12732,7 +12763,7 @@
  /* end confdefs.h.  */
  #include <langinfo.h>
  int
-@@ -20796,56 +19200,25 @@
+@@ -20796,56 +19211,25 @@
    return 0;
  }
  _ACEOF
@@ -12797,7 +12828,7 @@
  /* end confdefs.h.  */
  #include <langinfo.h>
  int
-@@ -20859,56 +19232,25 @@
+@@ -20859,56 +19243,25 @@
    return 0;
  }
  _ACEOF
@@ -12862,7 +12893,7 @@
  /* end confdefs.h.  */
  #include <setjmp.h>
  int
-@@ -20922,196 +19264,30 @@
+@@ -20922,424 +19275,92 @@
    return 0;
  }
  _ACEOF
@@ -12917,7 +12948,14 @@
  # i18n stuff
  ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
  
--
++   for ac_header in locale.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
++if test "x$ac_cv_header_locale_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LOCALE_H 1
++_ACEOF
+ 
 -for ac_header in locale.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12926,12 +12964,20 @@
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
--fi
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--else
++
++done
++
++    if test $ac_cv_header_locale_h = yes; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
++$as_echo_n "checking for LC_MESSAGES... " >&6; }
++if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -12940,10 +12986,19 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
--_ACEOF
++#include <locale.h>
++int
++main ()
++{
++return LC_MESSAGES
++  ;
++  return 0;
++}
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -12963,17 +13018,27 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++  am_cv_val_LC_MESSAGES=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_header_compiler=no
--fi
--
++  am_cv_val_LC_MESSAGES=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
++$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
++    if test $am_cv_val_LC_MESSAGES = yes; then
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
--
++$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
+ 
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -13006,10 +13071,13 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    fi
++  fi
++     USE_NLS=yes
+ 
 -  ac_header_preproc=no
 -fi
--
+ 
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
@@ -13060,40 +13128,35 @@
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+   for ac_header in locale.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
-+if test "x$ac_cv_header_locale_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_LOCALE_H 1
- _ACEOF
- 
- fi
-@@ -21119,16 +19295,12 @@
- done
- 
-     if test $ac_cv_header_locale_h = yes; then
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-    if test $ac_cv_header_locale_h = yes; then
 -    { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
- $as_echo_n "checking for LC_MESSAGES... " >&6; }
+-$as_echo_n "checking for LC_MESSAGES... " >&6; }
 -if test "${am_cv_val_LC_MESSAGES+set}" = set; then
-+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <locale.h>
- int
-@@ -21139,46 +19311,19 @@
-   return 0;
- }
- _ACEOF
+-/* end confdefs.h.  */
+-#include <locale.h>
+-int
+-main ()
+-{
+-return LC_MESSAGES
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -13115,35 +13178,35 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   am_cv_val_LC_MESSAGES=yes
- else
+-  am_cv_val_LC_MESSAGES=yes
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	am_cv_val_LC_MESSAGES=no
-+  am_cv_val_LC_MESSAGES=no
- fi
+-fi
 -
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
- $as_echo "$am_cv_val_LC_MESSAGES" >&6; }
-     if test $am_cv_val_LC_MESSAGES = yes; then
- 
+-$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
+-    if test $am_cv_val_LC_MESSAGES = yes; then
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_LC_MESSAGES 1
 -_ACEOF
-+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
- 
-     fi
-   fi
-@@ -21191,155 +19336,20 @@
+-
+-    fi
+-  fi
+-     USE_NLS=yes
+-
+-
+-    gt_cv_have_gettext=no
++    gt_cv_have_gettext=no
+ 
+     CATOBJEXT=NONE
      XGETTEXT=:
      INTLLIBS=
  
@@ -13304,7 +13367,7 @@
  /* end confdefs.h.  */
  
  #include <libintl.h>
-@@ -21352,54 +19362,25 @@
+@@ -21352,54 +19373,25 @@
    return 0;
  }
  _ACEOF
@@ -13367,7 +13430,7 @@
  /* end confdefs.h.  */
  
  #include <libintl.h>
-@@ -21412,141 +19393,26 @@
+@@ -21412,141 +19404,26 @@
    return 0;
  }
  _ACEOF
@@ -13519,7 +13582,7 @@
  _ACEOF
  
  fi
-@@ -21561,18 +19427,14 @@
+@@ -21561,18 +19438,14 @@
  	 || test "$gt_cv_func_ngettext_libc" != "yes" \
           || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
  
@@ -13541,7 +13604,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -21590,55 +19452,26 @@
+@@ -21590,55 +19463,26 @@
    return 0;
  }
  _ACEOF
@@ -13606,7 +13669,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -21656,55 +19489,26 @@
+@@ -21656,55 +19500,26 @@
    return 0;
  }
  _ACEOF
@@ -13671,7 +13734,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -21722,43 +19526,18 @@
+@@ -21722,43 +19537,18 @@
    return 0;
  }
  _ACEOF
@@ -13721,7 +13784,7 @@
    gt_cv_func_dgettext_libintl=yes
  fi
  
-@@ -21768,22 +19547,18 @@
+@@ -21768,22 +19558,18 @@
  
  
  	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -13749,7 +13812,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -21801,55 +19576,26 @@
+@@ -21801,55 +19587,26 @@
    return 0;
  }
  _ACEOF
@@ -13814,7 +13877,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -21867,43 +19613,18 @@
+@@ -21867,43 +19624,18 @@
    return 0;
  }
  _ACEOF
@@ -13864,7 +13927,7 @@
    gt_cv_func_dgettext_libintl=yes
  			libintl_extra_libs=-liconv
  else
-@@ -21925,103 +19646,13 @@
+@@ -21925,102 +19657,12 @@
            glib_save_LIBS="$LIBS"
            LIBS="$LIBS -lintl $libintl_extra_libs"
            unset ac_cv_func_bind_textdomain_codeset
@@ -13962,20 +14025,17 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
 +          for ac_func in bind_textdomain_codeset
 +do :
 +  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
 +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-+_ACEOF
- 
- fi
- done
-@@ -22050,15 +19681,13 @@
+ _ACEOF
+ 
+ fi
+@@ -22050,15 +19692,13 @@
  
        if test "$gt_cv_have_gettext" = "yes"; then
  
@@ -13994,7 +14054,7 @@
    $as_echo_n "(cached) " >&6
  else
    case "$MSGFMT" in
-@@ -22083,118 +19712,28 @@
+@@ -22083,118 +19723,28 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test "$MSGFMT" != "no"; then
@@ -14121,7 +14181,7 @@
  $as_echo_n "checking if msgfmt accepts -c... " >&6; }
  	  cat >conftest.foo <<_ACEOF
  
-@@ -22209,14 +19748,14 @@
+@@ -22209,14 +19759,14 @@
  "Content-Transfer-Encoding: 8bit\n"
  
  _ACEOF
@@ -14141,7 +14201,7 @@
  $as_echo "no" >&6; }
  echo "$as_me: failed input was:" >&5
  sed 's/^/| /' conftest.foo >&5
-@@ -22224,9 +19763,9 @@
+@@ -22224,9 +19774,9 @@
  
  	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
@@ -14153,7 +14213,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GMSGFMT in
-@@ -22239,14 +19778,14 @@
+@@ -22239,14 +19789,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -14171,7 +14231,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -22255,19 +19794,19 @@
+@@ -22255,19 +19805,19 @@
  fi
  GMSGFMT=$ac_cv_path_GMSGFMT
  if test -n "$GMSGFMT"; then
@@ -14195,7 +14255,7 @@
    $as_echo_n "(cached) " >&6
  else
    case "$XGETTEXT" in
-@@ -22292,18 +19831,14 @@
+@@ -22292,18 +19842,14 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test "$XGETTEXT" != ":"; then
@@ -14217,7 +14277,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -22315,121 +19850,14 @@
+@@ -22315,121 +19861,14 @@
    return 0;
  }
  _ACEOF
@@ -14343,7 +14403,7 @@
    CATOBJEXT=.gmo
                 DATADIRNAME=share
  else
-@@ -22444,10 +19872,8 @@
+@@ -22444,10 +19883,8 @@
  	    ;;
  	    esac
  fi
@@ -14356,7 +14416,7 @@
            LIBS="$glib_save_LIBS"
  	  INSTOBJEXT=.mo
  	else
-@@ -22461,9 +19887,7 @@
+@@ -22461,9 +19898,7 @@
  
      if test "$gt_cv_have_gettext" = "yes" ; then
  
@@ -14367,7 +14427,7 @@
  
      fi
  
-@@ -22471,7 +19895,7 @@
+@@ -22471,7 +19906,7 @@
                    if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
          : ;
        else
@@ -14376,7 +14436,7 @@
  $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
          XGETTEXT=":"
        fi
-@@ -22504,7 +19928,7 @@
+@@ -22504,7 +19939,7 @@
       if test "x$ALL_LINGUAS" = "x"; then
         LINGUAS=
       else
@@ -14385,7 +14445,7 @@
  $as_echo_n "checking for catalogs to be installed... " >&6; }
         NEW_LINGUAS=
         for presentlang in $ALL_LINGUAS; do
-@@ -22529,7 +19953,7 @@
+@@ -22529,7 +19964,7 @@
           fi
         done
         LINGUAS=$NEW_LINGUAS
@@ -14394,7 +14454,7 @@
  $as_echo "$LINGUAS" >&6; }
       fi
  
-@@ -22600,129 +20024,67 @@
+@@ -22600,129 +20035,67 @@
  
  
  
@@ -14544,7 +14604,7 @@
  $as_echo "no" >&6; }
    ;;
  esac
-@@ -22730,27 +20092,23 @@
+@@ -22730,27 +20103,23 @@
  #
  # see bug 162979
  #
@@ -14577,7 +14637,7 @@
  /* end confdefs.h.  */
  #include <dirent.h>
  int
-@@ -22761,37 +20119,13 @@
+@@ -22761,37 +20130,13 @@
    return 0;
  }
  _ACEOF
@@ -14619,7 +14679,7 @@
  /* end confdefs.h.  */
  #include <dirent.h>
  int
-@@ -22802,40 +20136,18 @@
+@@ -22802,40 +20147,18 @@
    return 0;
  }
  _ACEOF
@@ -14664,7 +14724,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  #
-@@ -22845,7 +20157,7 @@
+@@ -22845,7 +20168,7 @@
  GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0"
  
  # Check whether --enable-glibtest was given.
@@ -14673,7 +14733,7 @@
    enableval=$enable_glibtest;
  else
    enable_glibtest=yes
-@@ -22880,9 +20192,9 @@
+@@ -22880,9 +20203,9 @@
  	if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -14685,7 +14745,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -22895,14 +20207,14 @@
+@@ -22895,14 +20218,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -14703,7 +14763,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -22910,10 +20222,10 @@
+@@ -22910,10 +20233,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -14716,7 +14776,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -22923,9 +20235,9 @@
+@@ -22923,9 +20246,9 @@
    ac_pt_PKG_CONFIG=$PKG_CONFIG
    # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -14728,7 +14788,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $ac_pt_PKG_CONFIG in
-@@ -22938,14 +20250,14 @@
+@@ -22938,14 +20261,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -14746,7 +14806,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -22953,10 +20265,10 @@
+@@ -22953,10 +20276,10 @@
  fi
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  if test -n "$ac_pt_PKG_CONFIG"; then
@@ -14759,7 +14819,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -22965,7 +20277,7 @@
+@@ -22965,7 +20288,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -14768,7 +14828,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -22978,13 +20290,13 @@
+@@ -22978,13 +20301,13 @@
  fi
  if test -n "$PKG_CONFIG"; then
  	_pkg_min_version=0.16
@@ -14785,7 +14845,7 @@
  $as_echo "no" >&6; }
  		PKG_CONFIG=""
  	fi
-@@ -22999,7 +20311,7 @@
+@@ -22999,7 +20322,7 @@
    fi
  
    min_glib_version=2.21.3
@@ -14794,7 +14854,7 @@
  $as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }
  
    if test x$PKG_CONFIG != xno ; then
-@@ -23035,14 +20347,10 @@
+@@ -23035,14 +20358,10 @@
        CFLAGS="$CFLAGS $GLIB_CFLAGS"
        LIBS="$GLIB_LIBS $LIBS"
        rm -f conf.glibtest
@@ -14811,7 +14871,7 @@
  /* end confdefs.h.  */
  
  #include <glib.h>
-@@ -23054,9 +20362,8 @@
+@@ -23054,9 +20373,8 @@
  {
    int major, minor, micro;
    char *tmp_version;
@@ -14822,7 +14882,7 @@
  
    /* HP/UX 9 (%@#!) writes to sscanf strings */
    tmp_version = g_strdup("$min_glib_version");
-@@ -23118,52 +20425,25 @@
+@@ -23118,52 +20436,25 @@
  }
  
  _ACEOF
@@ -14882,7 +14942,7 @@
  $as_echo "no" >&6; }
       if test "$PKG_CONFIG" = "no" ; then
         echo "*** A new enough version of pkg-config was not found."
-@@ -23177,11 +20457,7 @@
+@@ -23177,11 +20468,7 @@
            ac_save_LIBS="$LIBS"
            CFLAGS="$CFLAGS $GLIB_CFLAGS"
            LIBS="$LIBS $GLIB_LIBS"
@@ -14895,7 +14955,7 @@
  /* end confdefs.h.  */
  
  #include <glib.h>
-@@ -23195,27 +20471,7 @@
+@@ -23195,27 +20482,7 @@
    return 0;
  }
  _ACEOF
@@ -14924,7 +14984,7 @@
     echo "*** The test program compiled, but did not run. This usually means"
            echo "*** that the run-time linker is not finding GLIB or finding the wrong"
            echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-@@ -23226,16 +20482,11 @@
+@@ -23226,16 +20493,11 @@
            echo "*** If you have an old version installed, it is best to remove it, although"
            echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
  else
@@ -14944,23 +15004,23 @@
            CFLAGS="$ac_save_CFLAGS"
            LIBS="$ac_save_LIBS"
         fi
-@@ -23245,13 +20496,9 @@
+@@ -23245,13 +20507,9 @@
       GLIB_GENMARSHAL=""
       GOBJECT_QUERY=""
       GLIB_MKENUMS=""
 -     { { $as_echo "$as_me:$LINENO: error:
--*** GLIB 2.21.3 or better is required. The latest version of
++     as_fn_error "
+ *** GLIB 2.21.3 or better is required. The latest version of
 -*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&5
 -$as_echo "$as_me: error:
-+     as_fn_error "
- *** GLIB 2.21.3 or better is required. The latest version of
+-*** GLIB 2.21.3 or better is required. The latest version of
 -*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&2;}
 -   { (exit 1); exit 1; }; }
 +*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." "$LINENO" 5
    fi
  
  
-@@ -23273,1324 +20520,954 @@
+@@ -23273,413 +20531,354 @@
  
  gtk_save_LIBS=$LIBS
  LIBS="$LIBS $GLIB_LIBS"
@@ -15027,22 +15087,67 @@
 -choke me
 -#endif
 +fi
- 
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
++
 +done
-+
+ 
 +for ac_header in sys/time.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
 +if test "x$ac_cv_header_sys_time_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_SYS_TIME_H 1
++_ACEOF
++
++$as_echo "#define HAVE_SYS_TIME_H 1" >>confdefs.h
++
++fi
++
++done
++
++for ac_header in unistd.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
++if test "x$ac_cv_header_unistd_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_UNISTD_H 1
++_ACEOF
++
++$as_echo "#define HAVE_UNISTD_H 1" >>confdefs.h
++
++fi
++
++done
++
++for ac_header in ftw.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "ftw.h" "ac_cv_header_ftw_h" "$ac_includes_default"
++if test "x$ac_cv_header_ftw_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_FTW_H 1
++_ACEOF
++
++$as_echo "#define HAVE_FTW_H 1" >>confdefs.h
++
++fi
++
++done
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ftw extensions" >&5
++$as_echo_n "checking for GNU ftw extensions... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#define _XOPEN_SOURCE 500
++#define _GNU_SOURCE
++#include <ftw.h>
+ int
+ main ()
+ {
+-return $ac_func ();
++int flags = FTW_ACTIONRETVAL;
+   ;
+   return 0;
+ }
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -15066,18 +15171,24 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++  gtk_ok=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	eval "$as_ac_var=no"
--fi
-+$as_echo "#define HAVE_SYS_TIME_H 1" >>confdefs.h
++  gtk_ok=no
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++if test $gtk_ok = yes; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -15085,34 +15196,21 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+
-+done
-+
-+for ac_header in unistd.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
-+if test "x$ac_cv_header_unistd_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_UNISTD_H 1
- _ACEOF
- 
-+$as_echo "#define HAVE_UNISTD_H 1" >>confdefs.h
-+
- fi
-+
- done
+-_ACEOF
++$as_echo "#define HAVE_GNU_FTW 1" >>confdefs.h
+ 
++else
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-done
  
 -LIBS=$gtk_save_LIBS
-+for ac_header in ftw.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "ftw.h" "ac_cv_header_ftw_h" "$ac_includes_default"
-+if test "x$ac_cv_header_ftw_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FTW_H 1
-+_ACEOF
- 
-+$as_echo "#define HAVE_FTW_H 1" >>confdefs.h
++saved_cflags="$CFLAGS"
++saved_ldflags="$LDFLAGS"
+ 
  
 -for ac_header in pwd.h
 -do
@@ -15121,13 +15219,17 @@
 -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
- fi
++# Checks for header files.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
++$as_echo_n "checking for ANSI C header files... " >&6; }
++if test "${ac_cv_header_stdc+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+-fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--else
+ else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -15136,23 +15238,19 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+done
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ftw extensions" >&5
-+$as_echo_n "checking for GNU ftw extensions... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
-+#define _XOPEN_SOURCE 500
-+#define _GNU_SOURCE
-+#include <ftw.h>
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
++
 +int
 +main ()
 +{
-+int flags = FTW_ACTIONRETVAL;
++
 +  ;
 +  return 0;
 +}
@@ -15177,30 +15275,18 @@
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  gtk_ok=yes
++  ac_cv_header_stdc=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  gtk_ok=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test $gtk_ok = yes; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
+-
 -	ac_header_compiler=no
-+$as_echo "#define HAVE_GNU_FTW 1" >>confdefs.h
-+
-+else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_header_stdc=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
-+saved_cflags="$CFLAGS"
-+saved_ldflags="$LDFLAGS"
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -15210,28 +15296,13 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+# Checks for header files.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-+$as_echo_n "checking for ANSI C header files... " >&6; }
-+if test "${ac_cv_header_stdc+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -#include <$ac_header>
-+#include <stdlib.h>
-+#include <stdarg.h>
 +#include <string.h>
-+#include <float.h>
 +
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
  _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
@@ -15251,29 +15322,31 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_header_stdc=yes
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "memchr" >/dev/null 2>&1; then :
++
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
+ 
 -  ac_header_preproc=no
-+  ac_cv_header_stdc=no
- fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
 +if test $ac_cv_header_stdc = yes; then
-+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
-+#include <string.h>
++#include <stdlib.h>
 +
 +_ACEOF
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "memchr" >/dev/null 2>&1; then :
++  $EGREP "free" >/dev/null 2>&1; then :
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -15330,77 +15403,12 @@
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_PWD_H 1
 +if test $ac_cv_header_stdc = yes; then
-+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+
- _ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "free" >/dev/null 2>&1; then :
- 
-+else
-+  ac_cv_header_stdc=no
- fi
-+rm -f conftest*
- 
--done
--
--
--for ac_header in sys/time.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+
-+if test $ac_cv_header_stdc = yes; then
 +  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 +  if test "$cross_compiling" = yes; then :
 +  :
- else
--  # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--$ac_includes_default
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_header_compiler=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++/* end confdefs.h.  */
 +#include <ctype.h>
 +#include <stdlib.h>
 +#if ((' ' & 0x0FF) == 0x020)
@@ -15425,10 +15433,9 @@
 +      return 2;
 +  return 0;
 +}
-+_ACEOF
+ _ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
  
--	ac_header_compiler=no
 +else
 +  ac_cv_header_stdc=no
 +fi
@@ -15436,15 +15443,130 @@
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
  
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
+-done
 +fi
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 +$as_echo "$ac_cv_header_stdc" >&6; }
 +if test $ac_cv_header_stdc = yes; then
  
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+ 
+-for ac_header in sys/time.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++
++
++# Checks for typedefs, structures, and compiler characteristics.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
++$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
++if test "${ac_cv_c_const+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_header_compiler=no
+-fi
++int
++main ()
++{
++/* FIXME: Include the comments suggested by Paul. */
++#ifndef __cplusplus
++  /* Ultrix mips cc rejects this.  */
++  typedef int charset[2];
++  const charset cs;
++  /* SunOS 4.1.1 cc rejects this.  */
++  char const *const *pcpcc;
++  char **ppc;
++  /* NEC SVR4.0.2 mips cc rejects this.  */
++  struct point {int x, y;};
++  static struct point const zero = {0,0};
++  /* AIX XL C 1.02.0.0 rejects this.
++     It does not let you subtract one const X* pointer from another in
++     an arm of an if-expression whose if-part is not a constant
++     expression */
++  const char *g = "string";
++  pcpcc = &g + (g ? g-g : 0);
++  /* HPUX 7.0 cc rejects these. */
++  ++pcpcc;
++  ppc = (char**) pcpcc;
++  pcpcc = (char const *const *) ppc;
++  { /* SCO 3.2v4 cc rejects this.  */
++    char *t;
++    char const *s = 0 ? (char *) 0 : (char const *) 0;
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++    *t++ = 0;
++    if (s) return 0;
++  }
++  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
++    int x[] = {25, 17};
++    const int *foo = &x[0];
++    ++foo;
++  }
++  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
++    typedef const int *iptr;
++    iptr p = 0;
++    ++p;
++  }
++  { /* AIX XL C 1.02.0.0 rejects this saying
++       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
++    struct s { int j; const int *ap[3]; };
++    struct s *b; b->j = 5;
++  }
++  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
++    const int foo = 10;
++    if (!foo) return 0;
++  }
++  return !cs[0] && !zero.x;
++#endif
+ 
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -15455,7 +15577,10 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
--_ACEOF
++  ;
++  return 0;
++}
+ _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -15474,10 +15599,20 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_c_const=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
++  ac_cv_c_const=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
++$as_echo "$ac_cv_c_const" >&6; }
++if test $ac_cv_c_const = no; then
++
++$as_echo "#define const /**/" >>confdefs.h
  
 -  ac_header_preproc=no
  fi
@@ -15519,10 +15654,10 @@
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+# Checks for typedefs, structures, and compiler characteristics.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-+if test "${ac_cv_c_const+set}" = set; then :
++# Checks for library functions.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
++$as_echo_n "checking return type of signal handlers... " >&6; }
++if test "${ac_cv_type_signal+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  eval "$as_ac_Header=\$ac_header_preproc"
@@ -15533,89 +15668,57 @@
 -$as_echo "$ac_res" >&6; }
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
- 
--fi
++#include <sys/types.h>
++#include <signal.h>
+ 
++int
++main ()
++{
++return *(signal (0, 0)) (0) == 1;
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_type_signal=int
++else
++  ac_cv_type_signal=void
+ fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-+int
-+main ()
-+{
-+/* FIXME: Include the comments suggested by Paul. */
-+#ifndef __cplusplus
-+  /* Ultrix mips cc rejects this.  */
-+  typedef int charset[2];
-+  const charset cs;
-+  /* SunOS 4.1.1 cc rejects this.  */
-+  char const *const *pcpcc;
-+  char **ppc;
-+  /* NEC SVR4.0.2 mips cc rejects this.  */
-+  struct point {int x, y;};
-+  static struct point const zero = {0,0};
-+  /* AIX XL C 1.02.0.0 rejects this.
-+     It does not let you subtract one const X* pointer from another in
-+     an arm of an if-expression whose if-part is not a constant
-+     expression */
-+  const char *g = "string";
-+  pcpcc = &g + (g ? g-g : 0);
-+  /* HPUX 7.0 cc rejects these. */
-+  ++pcpcc;
-+  ppc = (char**) pcpcc;
-+  pcpcc = (char const *const *) ppc;
-+  { /* SCO 3.2v4 cc rejects this.  */
-+    char *t;
-+    char const *s = 0 ? (char *) 0 : (char const *) 0;
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
++$as_echo "$ac_cv_type_signal" >&6; }
++
++cat >>confdefs.h <<_ACEOF
++#define RETSIGTYPE $ac_cv_type_signal
+ _ACEOF
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_SYS_TIME_H 1
--_ACEOF
-+    *t++ = 0;
-+    if (s) return 0;
-+  }
-+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-+    int x[] = {25, 17};
-+    const int *foo = &x[0];
-+    ++foo;
-+  }
-+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+    typedef const int *iptr;
-+    iptr p = 0;
-+    ++p;
-+  }
-+  { /* AIX XL C 1.02.0.0 rejects this saying
-+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+    struct s { int j; const int *ap[3]; };
-+    struct s *b; b->j = 5;
-+  }
-+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+    const int foo = 10;
-+    if (!foo) return 0;
-+  }
-+  return !cs[0] && !zero.x;
-+#endif
- 
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_c_const=yes
-+else
-+  ac_cv_c_const=no
- fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-+$as_echo "$ac_cv_c_const" >&6; }
-+if test $ac_cv_c_const = no; then
- 
--done
-+$as_echo "#define const /**/" >>confdefs.h
- 
-+fi
++
++
++
++
++  for ac_header in $ac_header_list
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -23687,910 +20886,599 @@
+ done
+ 
  
 -for ac_header in unistd.h
 -do
@@ -15624,18 +15727,13 @@
 -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+
-+# Checks for library functions.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-+$as_echo_n "checking return type of signal handlers... " >&6; }
-+if test "${ac_cv_type_signal+set}" = set; then :
-   $as_echo_n "(cached) " >&6
+-  $as_echo_n "(cached) " >&6
 -fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
- else
+-else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -15644,21 +15742,10 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
-+#include <sys/types.h>
-+#include <signal.h>
-+
-+int
-+main ()
-+{
-+return *(signal (0, 0)) (0) == 1;
-+  ;
-+  return 0;
-+}
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -15678,36 +15765,50 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_type_signal=int
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_header_compiler=no
-+  ac_cv_type_signal=void
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-+$as_echo "$ac_cv_type_signal" >&6; }
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++
++
++
++for ac_func in getpagesize
++do :
++  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
++if test "x$ac_cv_func_getpagesize" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_GETPAGESIZE 1
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
++fi
++done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
++$as_echo_n "checking for working mmap... " >&6; }
++if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test "$cross_compiling" = yes; then :
++  ac_cv_func_mmap_fixed_mapped=no
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -#include <$ac_header>
-+cat >>confdefs.h <<_ACEOF
-+#define RETSIGTYPE $ac_cv_type_signal
- _ACEOF
+-_ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -15729,13 +15830,36 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++$ac_includes_default
++/* malloc might have been renamed as rpl_malloc. */
++#undef malloc
  
 -  ac_header_preproc=no
 -fi
++/* Thanks to Mike Haertel and Jim Avera for this test.
++   Here is a matrix of mmap possibilities:
++	mmap private not fixed
++	mmap private fixed at somewhere currently unmapped
++	mmap private fixed at somewhere already mapped
++	mmap shared not fixed
++	mmap shared fixed at somewhere currently unmapped
++	mmap shared fixed at somewhere already mapped
++   For private mappings, we should verify that changes cannot be read()
++   back from the file, nor mmap's back from the file at a different
++   address.  (There have been systems where private was not correctly
++   implemented like the infamous i386 svr4.0, and systems where the
++   VM page cache was not coherent with the file system buffer cache
++   like early versions of FreeBSD and possibly contemporary NetBSD.)
++   For shared mappings, we should conversely verify that changes get
++   propagated back to all the places they're supposed to be.
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
++   Grep wants private fixed already mapped.
++   The main things grep needs to know about mmap are:
++   * does it exist and is it safe to write into the mmap'd area
++   * how to use it (BSD variants)  */
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -15778,31 +15902,66 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
++#include <fcntl.h>
++#include <sys/mman.h>
  
 -fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+
-+  for ac_header in $ac_header_list
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
++char *malloc ();
++#endif
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_UNISTD_H 1
 -_ACEOF
--
- fi
- 
- done
- 
++/* This mess was copied from the GNU getpagesize.h.  */
++#ifndef HAVE_GETPAGESIZE
++# ifdef _SC_PAGESIZE
++#  define getpagesize() sysconf(_SC_PAGESIZE)
++# else /* no _SC_PAGESIZE */
++#  ifdef HAVE_SYS_PARAM_H
++#   include <sys/param.h>
++#   ifdef EXEC_PAGESIZE
++#    define getpagesize() EXEC_PAGESIZE
++#   else /* no EXEC_PAGESIZE */
++#    ifdef NBPG
++#     define getpagesize() NBPG * CLSIZE
++#     ifndef CLSIZE
++#      define CLSIZE 1
++#     endif /* no CLSIZE */
++#    else /* no NBPG */
++#     ifdef NBPC
++#      define getpagesize() NBPC
++#     else /* no NBPC */
++#      ifdef PAGESIZE
++#       define getpagesize() PAGESIZE
++#      endif /* PAGESIZE */
++#     endif /* no NBPC */
++#    endif /* no NBPG */
++#   endif /* no EXEC_PAGESIZE */
++#  else /* no HAVE_SYS_PARAM_H */
++#   define getpagesize() 8192	/* punt totally */
++#  endif /* no HAVE_SYS_PARAM_H */
++# endif /* no _SC_PAGESIZE */
+ 
+-fi
++#endif /* no HAVE_GETPAGESIZE */
+ 
+-done
++int
++main ()
++{
++  char *data, *data2, *data3;
++  const char *cdata2;
++  int i, pagesize;
++  int fd, fd2;
+ 
++  pagesize = getpagesize ();
  
 -for ac_header in ftw.h
 -do
@@ -15829,19 +15988,7 @@
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
-+
-+
-+
-+
-+
-+
-+for ac_func in getpagesize
-+do :
-+  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
-+if test "x$ac_cv_func_getpagesize" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETPAGESIZE 1
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -15864,15 +16011,56 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++  /* First, make a file with some known garbage in it. */
++  data = (char *) malloc (pagesize);
++  if (!data)
++    return 1;
++  for (i = 0; i < pagesize; ++i)
++    *(data + i) = rand ();
++  umask (0);
++  fd = creat ("conftest.mmap", 0600);
++  if (fd < 0)
++    return 2;
++  if (write (fd, data, pagesize) != pagesize)
++    return 3;
++  close (fd);
  
 -	ac_header_compiler=no
- fi
-+done
+-fi
++  /* Next, check that the tail of a page is zero-filled.  File must have
++     non-zero length, otherwise we risk SIGBUS for entire page.  */
++  fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
++  if (fd2 < 0)
++    return 4;
++  cdata2 = "";
++  if (write (fd2, cdata2, 1) != 1)
++    return 5;
++  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
++  if (data2 == MAP_FAILED)
++    return 6;
++  for (i = 0; i < pagesize; ++i)
++    if (*(data2 + i))
++      return 7;
++  close (fd2);
++  if (munmap (data2, pagesize))
++    return 8;
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
--
++  /* Next, try to mmap the file at a fixed address which already has
++     something else allocated at it.  If we can, also make sure that
++     we see the same garbage.  */
++  fd = open ("conftest.mmap", O_RDWR);
++  if (fd < 0)
++    return 9;
++  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
++		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
++    return 10;
++  for (i = 0; i < pagesize; ++i)
++    if (*(data + i) != *(data2 + i))
++      return 11;
+ 
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -15883,7 +16071,23 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
--_ACEOF
++  /* Finally, make sure that changes to the mapped area do not
++     percolate back to the file as seen by read().  (This is a bug on
++     some variants of i386 svr4.0.)  */
++  for (i = 0; i < pagesize; ++i)
++    *(data2 + i) = *(data2 + i) + 1;
++  data3 = (char *) malloc (pagesize);
++  if (!data3)
++    return 12;
++  if (read (fd, data3, pagesize) != pagesize)
++    return 13;
++  for (i = 0; i < pagesize; ++i)
++    if (*(data + i) != *(data3 + i))
++      return 14;
++  close (fd);
++  return 0;
++}
+ _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -15902,17 +16106,28 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  ac_cv_func_mmap_fixed_mapped=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  ac_cv_func_mmap_fixed_mapped=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+ 
 -  ac_header_preproc=no
--fi
--
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
++$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
++if test $ac_cv_func_mmap_fixed_mapped = yes; then
+ 
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
--
++$as_echo "#define HAVE_MMAP 1" >>confdefs.h
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -15946,282 +16161,63 @@
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
-+$as_echo_n "checking for working mmap... " >&6; }
-+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  eval "$as_ac_Header=\$ac_header_preproc"
--fi
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
-+  if test "$cross_compiling" = yes; then :
-+  ac_cv_func_mmap_fixed_mapped=no
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$ac_includes_default
-+/* malloc might have been renamed as rpl_malloc. */
-+#undef malloc
++rm -f conftest.mmap conftest.txt
  
 -fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-+/* Thanks to Mike Haertel and Jim Avera for this test.
-+   Here is a matrix of mmap possibilities:
-+	mmap private not fixed
-+	mmap private fixed at somewhere currently unmapped
-+	mmap private fixed at somewhere already mapped
-+	mmap shared not fixed
-+	mmap shared fixed at somewhere currently unmapped
-+	mmap shared fixed at somewhere already mapped
-+   For private mappings, we should verify that changes cannot be read()
-+   back from the file, nor mmap's back from the file at a different
-+   address.  (There have been systems where private was not correctly
-+   implemented like the infamous i386 svr4.0, and systems where the
-+   VM page cache was not coherent with the file system buffer cache
-+   like early versions of FreeBSD and possibly contemporary NetBSD.)
-+   For shared mappings, we should conversely verify that changes get
-+   propagated back to all the places they're supposed to be.
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_FTW_H 1
--_ACEOF
-+   Grep wants private fixed already mapped.
-+   The main things grep needs to know about mmap are:
-+   * does it exist and is it safe to write into the mmap'd area
-+   * how to use it (BSD variants)  */
- 
--fi
-+#include <fcntl.h>
-+#include <sys/mman.h>
- 
--done
-+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
-+char *malloc ();
-+#endif
-+
-+/* This mess was copied from the GNU getpagesize.h.  */
-+#ifndef HAVE_GETPAGESIZE
-+# ifdef _SC_PAGESIZE
-+#  define getpagesize() sysconf(_SC_PAGESIZE)
-+# else /* no _SC_PAGESIZE */
-+#  ifdef HAVE_SYS_PARAM_H
-+#   include <sys/param.h>
-+#   ifdef EXEC_PAGESIZE
-+#    define getpagesize() EXEC_PAGESIZE
-+#   else /* no EXEC_PAGESIZE */
-+#    ifdef NBPG
-+#     define getpagesize() NBPG * CLSIZE
-+#     ifndef CLSIZE
-+#      define CLSIZE 1
-+#     endif /* no CLSIZE */
-+#    else /* no NBPG */
-+#     ifdef NBPC
-+#      define getpagesize() NBPC
-+#     else /* no NBPC */
-+#      ifdef PAGESIZE
-+#       define getpagesize() PAGESIZE
-+#      endif /* PAGESIZE */
-+#     endif /* no NBPC */
-+#    endif /* no NBPG */
-+#   endif /* no EXEC_PAGESIZE */
-+#  else /* no HAVE_SYS_PARAM_H */
-+#   define getpagesize() 8192	/* punt totally */
-+#  endif /* no HAVE_SYS_PARAM_H */
-+# endif /* no _SC_PAGESIZE */
- 
-+#endif /* no HAVE_GETPAGESIZE */
- 
--{ $as_echo "$as_me:$LINENO: checking for GNU ftw extensions" >&5
--$as_echo_n "checking for GNU ftw extensions... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#define _XOPEN_SOURCE 500
--#define _GNU_SOURCE
--#include <ftw.h>
- int
- main ()
- {
--int flags = FTW_ACTIONRETVAL;
--  ;
-+  char *data, *data2, *data3;
-+  const char *cdata2;
-+  int i, pagesize;
-+  int fd, fd2;
-+
-+  pagesize = getpagesize ();
-+
-+  /* First, make a file with some known garbage in it. */
-+  data = (char *) malloc (pagesize);
-+  if (!data)
-+    return 1;
-+  for (i = 0; i < pagesize; ++i)
-+    *(data + i) = rand ();
-+  umask (0);
-+  fd = creat ("conftest.mmap", 0600);
-+  if (fd < 0)
-+    return 2;
-+  if (write (fd, data, pagesize) != pagesize)
-+    return 3;
-+  close (fd);
-+
-+  /* Next, check that the tail of a page is zero-filled.  File must have
-+     non-zero length, otherwise we risk SIGBUS for entire page.  */
-+  fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
-+  if (fd2 < 0)
-+    return 4;
-+  cdata2 = "";
-+  if (write (fd2, cdata2, 1) != 1)
-+    return 5;
-+  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
-+  if (data2 == MAP_FAILED)
-+    return 6;
-+  for (i = 0; i < pagesize; ++i)
-+    if (*(data2 + i))
-+      return 7;
-+  close (fd2);
-+  if (munmap (data2, pagesize))
-+    return 8;
-+
-+  /* Next, try to mmap the file at a fixed address which already has
-+     something else allocated at it.  If we can, also make sure that
-+     we see the same garbage.  */
-+  fd = open ("conftest.mmap", O_RDWR);
-+  if (fd < 0)
-+    return 9;
-+  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
-+		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
-+    return 10;
-+  for (i = 0; i < pagesize; ++i)
-+    if (*(data + i) != *(data2 + i))
-+      return 11;
-+
-+  /* Finally, make sure that changes to the mapped area do not
-+     percolate back to the file as seen by read().  (This is a bug on
-+     some variants of i386 svr4.0.)  */
-+  for (i = 0; i < pagesize; ++i)
-+    *(data2 + i) = *(data2 + i) + 1;
-+  data3 = (char *) malloc (pagesize);
-+  if (!data3)
-+    return 12;
-+  if (read (fd, data3, pagesize) != pagesize)
-+    return 13;
-+  for (i = 0; i < pagesize; ++i)
-+    if (*(data + i) != *(data3 + i))
-+      return 14;
-+  close (fd);
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  gtk_ok=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+  ac_cv_func_mmap_fixed_mapped=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_func_mmap_fixed_mapped=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
- 
--	gtk_ok=no
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
-+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
-+if test $ac_cv_func_mmap_fixed_mapped = yes; then
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--if test $gtk_ok = yes; then
--    { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
-+
-+fi
-+rm -f conftest.mmap conftest.txt
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GNU_FTW 1
 +
 +for ac_func in mallinfo
 +do :
 +  ac_fn_c_check_func "$LINENO" "mallinfo" "ac_cv_func_mallinfo"
 +if test "x$ac_cv_func_mallinfo" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define HAVE_MALLINFO 1
  _ACEOF
  
--else
--    { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
- fi
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FTW_H 1
++fi
 +done
- 
--saved_cflags="$CFLAGS"
--saved_ldflags="$LDFLAGS"
++
 +for ac_func in getresuid
 +do :
 +  ac_fn_c_check_func "$LINENO" "getresuid" "ac_cv_func_getresuid"
 +if test "x$ac_cv_func_getresuid" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_GETRESUID 1
-+_ACEOF
- 
-+fi
-+done
- 
--# Checks for header files.
--{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--$as_echo_n "checking for ANSI C header files... " >&6; }
--if test "${ac_cv_header_stdc+set}" = set; then
+ _ACEOF
+ 
+ fi
+-
+ done
+ 
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
 +$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
 +if test "${ac_cv_type_uid_t+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
+ 
+-{ $as_echo "$as_me:$LINENO: checking for GNU ftw extensions" >&5
+-$as_echo_n "checking for GNU ftw extensions... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--#include <stdlib.h>
--#include <stdarg.h>
--#include <string.h>
--#include <float.h>
-+#include <sys/types.h>
-+
-+_ACEOF
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "uid_t" >/dev/null 2>&1; then :
 +  ac_cv_type_uid_t=yes
@@ -16237,7 +16233,7 @@
 +
 +$as_echo "#define uid_t int" >>confdefs.h
 +
- 
++
 +$as_echo "#define gid_t int" >>confdefs.h
 +
 +fi
@@ -16247,12 +16243,15 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd_set" >&5
 +$as_echo_n "checking for fd_set... " >&6; }
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ /* end confdefs.h.  */
+-#define _XOPEN_SOURCE 500
+-#define _GNU_SOURCE
+-#include <ftw.h>
 +#include <sys/types.h>
  int
  main ()
  {
--
+-int flags = FTW_ACTIONRETVAL;
 +fd_set readMask, writeMask;
    ;
    return 0;
@@ -16276,18 +16275,106 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_header_stdc=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  gtk_ok=yes
+   gtk_ok=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
+-	gtk_ok=no
++  gtk_ok=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $gtk_ok = yes; then
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GNU_FTW 1
+-_ACEOF
+-
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, found in sys/types.h" >&5
++$as_echo "yes, found in sys/types.h" >&6; }
+ else
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/select.h>
+ 
+-saved_cflags="$CFLAGS"
+-saved_ldflags="$LDFLAGS"
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "fd_mask" >/dev/null 2>&1; then :
++  gtk_ok=yes
++fi
++rm -f conftest*
+ 
++    if test $gtk_ok = yes; then
+ 
+-# Checks for header files.
+-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-$as_echo_n "checking for ANSI C header files... " >&6; }
+-if test "${ac_cv_header_stdc+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <stdlib.h>
+-#include <stdarg.h>
+-#include <string.h>
+-#include <float.h>
++$as_echo "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
+ 
+-int
+-main ()
+-{
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, found in sys/select.h" >&5
++$as_echo "yes, found in sys/select.h" >&6; }
++    else
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_header_stdc=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++$as_echo "#define NO_FD_SET 1" >>confdefs.h
+ 
 -	ac_cv_header_stdc=no
-+  gtk_ok=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++    fi
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -
 -if test $ac_cv_header_stdc = yes; then
 -  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -16296,76 +16383,48 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+if test $gtk_ok = yes; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, found in sys/types.h" >&5
-+$as_echo "yes, found in sys/types.h" >&6; }
-+else
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--#include <string.h>
-+#include <sys/select.h>
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "memchr" >/dev/null 2>&1; then
--  :
--else
--  ac_cv_header_stdc=no
-+  $EGREP "fd_mask" >/dev/null 2>&1; then :
-+  gtk_ok=yes
- fi
- rm -f conftest*
- 
--fi
-+    if test $gtk_ok = yes; then
- 
--if test $ac_cv_header_stdc = yes; then
--  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+$as_echo "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
-+
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, found in sys/select.h" >&5
-+$as_echo "yes, found in sys/select.h" >&6; }
-+    else
-+
-+$as_echo "#define NO_FD_SET 1" >>confdefs.h
-+
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+    fi
-+fi
-+
 +# `widechar' tests for gdki18n.h
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar.h" >&5
 +$as_echo_n "checking for wchar.h... " >&6; }
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--#include <stdlib.h>
+-#include <string.h>
+-
 +#include <wchar.h>
-+_ACEOF
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "memchr" >/dev/null 2>&1; then
+-  :
 +if ac_fn_c_try_cpp "$LINENO"; then :
 +  gdk_wchar_h=yes
-+else
+ else
+-  ac_cv_header_stdc=no
 +  gdk_wchar_h=no
-+fi
+ fi
+-rm -f conftest*
 +rm -f conftest.err conftest.$ac_ext
 +if test $gdk_wchar_h = yes; then
 +
 +$as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h
-+
-+fi
+ 
+ fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdk_wchar_h" >&5
 +$as_echo "$gdk_wchar_h" >&6; }
  
+-if test $ac_cv_header_stdc = yes; then
+-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +# Check for wctype.h (for iswalnum)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype.h" >&5
 +$as_echo_n "checking for wctype.h... " >&6; }
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ /* end confdefs.h.  */
+-#include <stdlib.h>
+-
 +#include <wctype.h>
  _ACEOF
 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -16477,11 +16536,11 @@
 -
 -( exit $ac_status )
 -ac_cv_header_stdc=no
-+  ac_cv_lib_w_iswalnum=no
- fi
+-fi
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
++  ac_cv_lib_w_iswalnum=no
+ fi
 -
 -
 +rm -f core conftest.err conftest.$ac_objext \
@@ -16923,24 +16982,18 @@
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +    fi
-+fi
-+
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+ 
 +
 +
 +# Check whether --with-libpng was given.
 +if test "${with_libpng+set}" = set; then :
 +  withval=$with_libpng;
  fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
- 
-+
-+# Check whether --with-libjpeg was given.
-+if test "${with_libjpeg+set}" = set; then :
-+  withval=$with_libjpeg;
- fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
@@ -16949,16 +17002,16 @@
 -_ACEOF
  
 +
++# Check whether --with-libjpeg was given.
++if test "${with_libjpeg+set}" = set; then :
++  withval=$with_libjpeg;
+ fi
+ 
+-done
+ 
 +# Check whether --with-libtiff was given.
 +if test "${with_libtiff+set}" = set; then :
 +  withval=$with_libtiff;
- fi
- 
--done
- 
-+# Check whether --with-libjasper was given.
-+if test "${with_libjasper+set}" = set; then :
-+  withval=$with_libjasper;
 +fi
  
 -for ac_func in getpagesize
@@ -16968,6 +17021,12 @@
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
++
++# Check whether --with-libjasper was given.
++if test "${with_libjasper+set}" = set; then :
++  withval=$with_libjasper;
++fi
++
 +
 +# Check whether --enable-gdiplus was given.
 +if test "${enable_gdiplus+set}" = set; then :
@@ -17002,9 +17061,9 @@
 +  BUILD_GDIPLUS_LOADERS_TRUE='#'
 +  BUILD_GDIPLUS_LOADERS_FALSE=
 +fi
+ 
+-#undef $ac_func
 +
- 
--#undef $ac_func
 +if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
 +  if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFReadRGBAImageOriented in -ltiff" >&5
@@ -17019,7 +17078,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -24598,290 +21475,160 @@
+@@ -24598,290 +21486,93 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -17128,7 +17187,7 @@
 -$ac_includes_default
 -/* malloc might have been renamed as rpl_malloc. */
 -#undef malloc
- 
+-
 -/* Thanks to Mike Haertel and Jim Avera for this test.
 -   Here is a matrix of mmap possibilities:
 -	mmap private not fixed
@@ -17145,59 +17204,15 @@
 -   like early versions of FreeBSD and possibly contemporary NetBSD.)
 -   For shared mappings, we should conversely verify that changes get
 -   propagated back to all the places they're supposed to be.
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char TIFFWriteScanline ();
-+int
-+main ()
-+{
-+return TIFFWriteScanline ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_tiff_TIFFWriteScanline=yes
-+else
-+  ac_cv_lib_tiff_TIFFWriteScanline=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5
-+$as_echo "$ac_cv_lib_tiff_TIFFWriteScanline" >&6; }
-+if test "x$ac_cv_lib_tiff_TIFFWriteScanline" = x""yes; then :
-+  ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
-+if test "x$ac_cv_header_tiffio_h" = x""yes; then :
-+  TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz'
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5
-+$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;}
-+fi
  
 -   Grep wants private fixed already mapped.
 -   The main things grep needs to know about mmap are:
 -   * does it exist and is it safe to write into the mmap'd area
 -   * how to use it (BSD variants)  */
- 
+-
 -#include <fcntl.h>
 -#include <sys/mman.h>
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFFlushData in -ltiff34" >&5
-+$as_echo_n "checking for TIFFFlushData in -ltiff34... " >&6; }
-+if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltiff34 -ljpeg -lz -lm $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
+-
 -#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
 -char *malloc ();
 +/* Override any GCC internal prototype to avoid an error.
@@ -17244,7 +17259,7 @@
 -
 -#endif /* no HAVE_GETPAGESIZE */
 -
-+char TIFFFlushData ();
++char TIFFWriteScanline ();
  int
  main ()
  {
@@ -17299,7 +17314,7 @@
 -    if (*(data + i) != *(data3 + i))
 -      return 1;
 -  close (fd);
-+return TIFFFlushData ();
++return TIFFWriteScanline ();
 +  ;
    return 0;
  }
@@ -17328,7 +17343,7 @@
 -  (exit $ac_status); }; }; then
 -  ac_cv_func_mmap_fixed_mapped=yes
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_tiff34_TIFFFlushData=yes
++  ac_cv_lib_tiff_TIFFWriteScanline=yes
  else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
@@ -17336,14 +17351,134 @@
 -
 -( exit $ac_status )
 -ac_cv_func_mmap_fixed_mapped=no
++  ac_cv_lib_tiff_TIFFWriteScanline=no
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
+-$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
+-if test $ac_cv_func_mmap_fixed_mapped = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_MMAP 1
+-_ACEOF
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5
++$as_echo "$ac_cv_lib_tiff_TIFFWriteScanline" >&6; }
++if test "x$ac_cv_lib_tiff_TIFFWriteScanline" = x""yes; then :
++  ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
++if test "x$ac_cv_header_tiffio_h" = x""yes; then :
++  TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz'
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5
++$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;}
+ fi
+-rm -f conftest.mmap
+-
+ 
+ 
+-for ac_func in mallinfo
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFFlushData in -ltiff34" >&5
++$as_echo_n "checking for TIFFFlushData in -ltiff34... " >&6; }
++if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ltiff34 -ljpeg -lz -lm $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -24889,100 +21580,66 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
++char TIFFFlushData ();
+ int
+ main ()
+ {
+-return $ac_func ();
++return TIFFFlushData ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_tiff34_TIFFFlushData=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  ac_cv_lib_tiff34_TIFFFlushData=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5
 +$as_echo "$ac_cv_lib_tiff34_TIFFFlushData" >&6; }
 +if test "x$ac_cv_lib_tiff34_TIFFFlushData" = x""yes; then :
@@ -17353,27 +17488,41 @@
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5
 +$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;}
- fi
- 
- 
++fi
++
+ 
+-	eval "$as_ac_var=no"
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5
 +$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;}
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
--$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
--if test $ac_cv_func_mmap_fixed_mapped = yes; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_MMAP 1
--_ACEOF
-+fi
- 
- fi
--rm -f conftest.mmap
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+ 
+ fi
+-done
  
 +  fi
  
+-for ac_func in getresuid
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +  if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
 +     as_fn_error "
 +*** Checks for TIFF loader failed. You can build without it by passing
@@ -17381,13 +17530,7 @@
 +*** not work properly" "$LINENO" 5
 +  fi
 +fi
- 
--for ac_func in mallinfo
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++
 +if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
 +  if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_decompress in -ljpeg" >&5
@@ -17423,7 +17566,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -24889,100 +21636,64 @@
+@@ -24990,314 +21647,136 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -17506,29 +17649,65 @@
  fi
 -done
  
--
--for ac_func in getresuid
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
+-$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+-if test "${ac_cv_type_uid_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +    if test "$jpeg_ok" = yes; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeglib.h" >&5
 +$as_echo_n "checking for jpeglib.h... " >&6; }
 +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ /* end confdefs.h.  */
+-#include <sys/types.h>
+-
 +#include <stdio.h>
 +#undef PACKAGE
 +#undef VERSION
 +#undef HAVE_STDLIB_H
 +#include <jpeglib.h>
-+_ACEOF
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "uid_t" >/dev/null 2>&1; then
+-  ac_cv_type_uid_t=yes
 +if ac_fn_c_try_cpp "$LINENO"; then :
 +  jpeg_ok=yes
-+else
+ else
+-  ac_cv_type_uid_t=no
+-fi
+-rm -f conftest*
+-
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
+-$as_echo "$ac_cv_type_uid_t" >&6; }
+-if test $ac_cv_type_uid_t = no; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define uid_t int
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define gid_t int
+-_ACEOF
+-
 +  jpeg_ok=no
-+fi
+ fi
+-
+-
+-# Check if <sys/select.h> needs to be included for fd_set
+-{ $as_echo "$as_me:$LINENO: checking for fd_set" >&5
+-$as_echo_n "checking for fd_set... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +rm -f conftest.err conftest.$ac_ext
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jpeg_ok" >&5
 +$as_echo "$jpeg_ok" >&6; }
@@ -17537,195 +17716,10 @@
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_simple_progression in -ljpeg" >&5
 +$as_echo_n "checking for jpeg_simple_progression in -ljpeg... " >&6; }
 +if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ljpeg  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
- 
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-@@ -24990,387 +21701,164 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
-+char jpeg_simple_progression ();
- int
- main ()
- {
--return $ac_func ();
-+return jpeg_simple_progression ();
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_jpeg_jpeg_simple_progression=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+  ac_cv_lib_jpeg_jpeg_simple_progression=no
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
--done
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5
-+$as_echo "$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; }
-+if test "x$ac_cv_lib_jpeg_jpeg_simple_progression" = x""yes; then :
- 
--{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
--$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
--if test "${ac_cv_type_uid_t+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/types.h>
-+$as_echo "#define HAVE_PROGRESSIVE_JPEG 1" >>confdefs.h
- 
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "uid_t" >/dev/null 2>&1; then
--  ac_cv_type_uid_t=yes
- else
--  ac_cv_type_uid_t=no
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JPEG library does not support progressive saving." >&5
-+$as_echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;}
- fi
--rm -f conftest*
- 
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
--$as_echo "$ac_cv_type_uid_t" >&6; }
--if test $ac_cv_type_uid_t = no; then
--
--cat >>confdefs.h <<\_ACEOF
--#define uid_t int
--_ACEOF
--
--
--cat >>confdefs.h <<\_ACEOF
--#define gid_t int
--_ACEOF
-+      else
-+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5
-+$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;}
-+      fi
-+    fi
-+  fi
- 
-+  if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
-+     as_fn_error "
-+*** Checks for JPEG loader failed. You can build without it by passing
-+*** --without-libjpeg to configure but some programs using GTK+ may
-+*** not work properly" "$LINENO" 5
-+  fi
- fi
- 
--
--# Check if <sys/select.h> needs to be included for fd_set
--{ $as_echo "$as_me:$LINENO: checking for fd_set" >&5
--$as_echo_n "checking for fd_set... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  if test x$with_libpng != xno && test -z "$LIBPNG"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12" >&5
-+$as_echo_n "checking for libpng12... " >&6; }
-+    if $PKG_CONFIG --exists libpng12 ; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+        PNG='png'
-+	PNG_DEP_CFLAGS_PACKAGES=libpng12
-+	LIBPNG=`$PKG_CONFIG --libs libpng12`
-+    else
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng" >&5
-+$as_echo_n "checking for png_read_info in -lpng... " >&6; }
-+if test "${ac_cv_lib_png_png_read_info+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpng -lz -lm $LIBS"
++LIBS="-ljpeg  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -#include <sys/types.h>
@@ -17736,12 +17730,12 @@
 +#ifdef __cplusplus
 +extern "C"
 +#endif
-+char png_read_info ();
++char jpeg_simple_progression ();
  int
  main ()
  {
 -fd_set readMask, writeMask;
-+return png_read_info ();
++return jpeg_simple_progression ();
    ;
    return 0;
  }
@@ -17777,7 +17771,7 @@
 -    { $as_echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5
 -$as_echo "yes, found in sys/types.h" >&6; }
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_png_png_read_info=yes
++  ac_cv_lib_jpeg_jpeg_simple_progression=yes
  else
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -17791,8 +17785,7 @@
 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  $EGREP "fd_mask" >/dev/null 2>&1; then
 -  gtk_ok=yes
-+  ac_cv_lib_png_png_read_info=no
- fi
+-fi
 -rm -f conftest*
 -
 -    if test $gtk_ok = yes; then
@@ -17812,9 +17805,7 @@
 -	{ $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 -    fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
++  ac_cv_lib_jpeg_jpeg_simple_progression=no
  fi
 -
 -# `widechar' tests for gdki18n.h
@@ -17846,19 +17837,18 @@
 -	 test ! -s conftest.err
 -       }; then
 -  gdk_wchar_h=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_info" >&5
-+$as_echo "$ac_cv_lib_png_png_read_info" >&6; }
-+if test "x$ac_cv_lib_png_png_read_info" = x""yes; then :
-+  ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
-+if test "x$ac_cv_header_png_h" = x""yes; then :
-+  png_ok=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -  gdk_wchar_h=no
-+  png_ok=no
- fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5
++$as_echo "$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; }
++if test "x$ac_cv_lib_jpeg_jpeg_simple_progression" = x""yes; then :
  
 -rm -f conftest.err conftest.$ac_ext
 -if test $gdk_wchar_h = yes; then
@@ -17870,6 +17860,7 @@
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $gdk_wchar_h" >&5
 -$as_echo "$gdk_wchar_h" >&6; }
++$as_echo "#define HAVE_PROGRESSIVE_JPEG 1" >>confdefs.h
  
 -# Check for wctype.h (for iswalnum)
 -{ $as_echo "$as_me:$LINENO: checking for wctype.h" >&5
@@ -17905,17 +17896,29 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -  gdk_wctype_h=no
--fi
--
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JPEG library does not support progressive saving." >&5
++$as_echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;}
+ fi
+ 
 -rm -f conftest.err conftest.$ac_ext
 -if test $gdk_wctype_h = yes; then
 -
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_WCTYPE_H 1
 -_ACEOF
--
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5
-+$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;}
++      else
++          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5
++$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;}
++      fi
++    fi
++  fi
+ 
++  if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
++     as_fn_error "
++*** Checks for JPEG loader failed. You can build without it by passing
++*** --without-libjpeg to configure but some programs using GTK+ may
++*** not work properly" "$LINENO" 5
++  fi
  fi
 -{ $as_echo "$as_me:$LINENO: result: $gdk_wctype_h" >&5
 -$as_echo "$gdk_wctype_h" >&6; }
@@ -17925,17 +17928,31 @@
 -{ $as_echo "$as_me:$LINENO: checking for iswalnum" >&5
 -$as_echo_n "checking for iswalnum... " >&6; }
 -if test "${ac_cv_func_iswalnum+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++  if test x$with_libpng != xno && test -z "$LIBPNG"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12" >&5
++$as_echo_n "checking for libpng12... " >&6; }
++    if $PKG_CONFIG --exists libpng12 ; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++        PNG='png'
++	PNG_DEP_CFLAGS_PACKAGES=libpng12
++	LIBPNG=`$PKG_CONFIG --libs libpng12`
++    else
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng" >&5
++$as_echo_n "checking for png_read_info in -lpng... " >&6; }
++if test "${ac_cv_lib_png_png_read_info+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+      if test "$png_ok" = yes; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_structp in png.h" >&5
-+$as_echo_n "checking for png_structp in png.h... " >&6; }
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lpng -lz -lm $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -/* Define iswalnum to an innocuous variant, in case <limits.h> declares iswalnum.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
@@ -17953,13 +17970,13 @@
 -#endif
 -
 -#undef iswalnum
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -25305,72 +21784,92 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char iswalnum ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
@@ -17968,12 +17985,12 @@
 -choke me
 -#endif
 -
-+#include <png.h>
++char png_read_info ();
  int
  main ()
  {
 -return iswalnum ();
-+png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;
++return png_read_info ();
    ;
    return 0;
  }
@@ -18000,15 +18017,64 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_func_iswalnum=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_png_png_read_info=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_iswalnum=no
++  ac_cv_lib_png_png_read_info=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_info" >&5
++$as_echo "$ac_cv_lib_png_png_read_info" >&6; }
++if test "x$ac_cv_lib_png_png_read_info" = x""yes; then :
++  ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
++if test "x$ac_cv_header_png_h" = x""yes; then :
++  png_ok=yes
++else
++  png_ok=no
+ fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5
++$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;}
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5
+-$as_echo "$ac_cv_func_iswalnum" >&6; }
+-if test "x$ac_cv_func_iswalnum" = x""yes; then
+-  :
++
++      if test "$png_ok" = yes; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_structp in png.h" >&5
++$as_echo_n "checking for png_structp in png.h... " >&6; }
++        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <png.h>
++int
++main ()
++{
++png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;
++  ;
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  png_ok=yes
  else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_func_iswalnum=no
+-  { $as_echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5
+-$as_echo_n "checking for iswalnum in -lw... " >&6; }
+-if test "${ac_cv_lib_w_iswalnum+set}" = set; then
 +  png_ok=no
- fi
++fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_ok" >&5
 +$as_echo "$png_ok" >&6; }
@@ -18024,19 +18090,7 @@
 +      fi
 +    fi
 +  fi
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5
--$as_echo "$ac_cv_func_iswalnum" >&6; }
--if test "x$ac_cv_func_iswalnum" = x""yes; then
--  :
--else
--  { $as_echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5
--$as_echo_n "checking for iswalnum in -lw... " >&6; }
--if test "${ac_cv_lib_w_iswalnum+set}" = set; then
++
 +  if test x$with_libpng != xno && test -z "$LIBPNG"; then
 +     as_fn_error "
 +*** Checks for PNG loader failed. You can build without it by passing
@@ -18063,7 +18117,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -25379,980 +21867,663 @@
+@@ -25379,1212 +21878,663 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -18121,21 +18175,15 @@
 -$as_echo "$ac_cv_lib_w_iswalnum" >&6; }
 -if test "x$ac_cv_lib_w_iswalnum" = x""yes; then
 -  GDK_WLIBS=-lw
+-fi
+-
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jasper_jas_init" >&5
 +$as_echo "$ac_cv_lib_jasper_jas_init" >&6; }
 +if test "x$ac_cv_lib_jasper_jas_init" = x""yes; then :
 +  LIBJASPER=-ljasper
  fi
  
--fi
 +  fi
-+
-+  if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
-+     as_fn_error "
-+*** Checks for JPEG2000 loader failed. You can build without it by passing
-+*** --without-libjasper to configure" "$LINENO" 5
-+  fi
- 
  
 -oLIBS="$LIBS"
 -LIBS="$LIBS $GDK_WLIBS"
@@ -18152,7 +18200,7 @@
 -int
 -main ()
 -{
- 
+-
 -#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
 -#  ifdef HAVE_WCTYPE_H
 -#    include <wctype.h>
@@ -18165,6 +18213,11 @@
 -#  define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
 -#endif
 -iswalnum((wchar_t) 0);
++  if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
++     as_fn_error "
++*** Checks for JPEG2000 loader failed. You can build without it by passing
++*** --without-libjasper to configure" "$LINENO" 5
++  fi
  
 -  ;
 -  return 0;
@@ -18197,35 +18250,26 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	gdk_working_wctype=no
-+
+-fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS="$oLIBS"
+ 
+-if test $gdk_working_wctype = no; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BROKEN_WCTYPE 1
+-_ACEOF
+ 
+-   GDK_WLIBS=
 + if $dynworks; then
 +  BUILD_DYNAMIC_MODULES_TRUE=
 +  BUILD_DYNAMIC_MODULES_FALSE='#'
 +else
 +  BUILD_DYNAMIC_MODULES_TRUE='#'
 +  BUILD_DYNAMIC_MODULES_FALSE=
- fi
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS="$oLIBS"
- 
--if test $gdk_working_wctype = no; then
-+#
-+# Allow building some or all gdk-pixbuf loaders included
-+#
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pixbuf loaders to build" >&5
-+$as_echo_n "checking pixbuf loaders to build... " >&6; }
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_BROKEN_WCTYPE 1
--_ACEOF
- 
--   GDK_WLIBS=
-+# Check whether --with-included_loaders was given.
-+if test "${with_included_loaders+set}" = set; then :
-+  withval=$with_included_loaders;
  fi
 -{ $as_echo "$as_me:$LINENO: result: $gdk_working_wctype" >&5
 -$as_echo "$gdk_working_wctype" >&6; }
@@ -18260,68 +18304,44 @@
 -	 test ! -s conftest.err
 -       }; then
 -  gtk_uxtheme_h=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++#
++# Allow building some or all gdk-pixbuf loaders included
++#
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pixbuf loaders to build" >&5
++$as_echo_n "checking pixbuf loaders to build... " >&6; }
+ 
+-  gtk_uxtheme_h=no
+-fi
+ 
+-rm -f conftest.err conftest.$ac_ext
+-if test $gtk_uxtheme_h = yes; then
++# Check whether --with-included_loaders was given.
++if test "${with_included_loaders+set}" = set; then :
++  withval=$with_included_loaders;
++fi
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_UXTHEME_H 1
+-_ACEOF
+ 
 +if $dynworks; then
 +   :
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++else
 +   ## if the option was specified, leave it; otherwise disable included loaders
 +   if test x$with_included_loaders = xno; then
 +           with_included_loaders=yes
 +   fi
-+fi
- 
--  gtk_uxtheme_h=no
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5
+-$as_echo "$gtk_uxtheme_h" >&6; }
+ 
+-# Checks for gdkspawn
 +# Use the traditional png loader instead of the GDI+ one on Windows,
 +# because some important apps like GIMP need to read and write
 +# arbitrary tEXt chunks which doesn't seem to be possible through GDI+
-+
-+all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm"
-+if test x$with_libjasper != xno; then
-+  all_loaders="$all_loaders,jasper"
-+fi
-+if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then
-+  # Skip PNG, see comment above
-+  gdip_formats="bmp emf gif ico jpeg tiff wmf"
-+  for f in $gdip_formats; do
-+    all_loaders="$all_loaders,gdip-$f"
-+  done
-+else
-+  all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff"
-+fi
-+included_loaders=""
-+# If no loaders specified, include all
-+if test "x$with_included_loaders" = xyes ; then
-+  included_loaders="$all_loaders"
-+else
-+  included_loaders="$with_included_loaders"
- fi
- 
--rm -f conftest.err conftest.$ac_ext
--if test $gtk_uxtheme_h = yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $included_loaders" >&5
-+$as_echo "$included_loaders" >&6; }
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_UXTHEME_H 1
--_ACEOF
-+INCLUDED_LOADER_OBJ=
-+INCLUDED_LOADER_DEFINE=
- 
--fi
--{ $as_echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5
--$as_echo "$gtk_uxtheme_h" >&6; }
-+IFS="${IFS= 	}"; gtk_save_ifs="$IFS"; IFS=","
-+for loader in $included_loaders; do
-+ if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then
-+   :
-+ else
-+   as_fn_error "the specified loader $loader does not exist" "$LINENO" 5
-+ fi
- 
--# Checks for gdkspawn
-+ loader_underscores=`echo $loader | sed -e 's/-/_/g'`
-+ INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la"
  
 -for ac_header in crt_externs.h
 -do
@@ -18331,12 +18351,21 @@
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
--fi
++all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm"
++if test x$with_libjasper != xno; then
++  all_loaders="$all_loaders,jasper"
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--else
++if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then
++  # Skip PNG, see comment above
++  gdip_formats="bmp emf gif ico jpeg tiff wmf"
++  for f in $gdip_formats; do
++    all_loaders="$all_loaders,gdip-$f"
++  done
+ else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -18368,28 +18397,25 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
++  all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff"
++fi
++included_loaders=""
++# If no loaders specified, include all
++if test "x$with_included_loaders" = xyes ; then
++  included_loaders="$all_loaders"
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+ # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader
-+ case $loader in
-+   gdip-*) ;;
-+   *) INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader_underscores";;
-+ esac
-+ eval INCLUDE_$loader_underscores=yes
-+done
- 
+-
 -	ac_header_compiler=no
-+# Just define one -DINCLUDE_gdiplus for all the gdip-foo loaders
-+# (except gdip-png, which isn't built at all)
-+if test x"$INCLUDE_gdip_ico" = xyes; then
-+  INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_gdiplus"
++  included_loaders="$with_included_loaders"
  fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
-+IFS="$gtk_save_ifs"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $included_loaders" >&5
++$as_echo "$included_loaders" >&6; }
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -18420,37 +18446,27 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
-+
-+
-+ if test x"$INCLUDE_png" = xyes; then
-+  INCLUDE_PNG_TRUE=
-+  INCLUDE_PNG_FALSE='#'
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  INCLUDE_PNG_TRUE='#'
-+  INCLUDE_PNG_FALSE=
-+fi
++INCLUDED_LOADER_OBJ=
++INCLUDED_LOADER_DEFINE=
  
 -  ac_header_preproc=no
-+ if test x"$INCLUDE_bmp" = xyes; then
-+  INCLUDE_BMP_TRUE=
-+  INCLUDE_BMP_FALSE='#'
-+else
-+  INCLUDE_BMP_TRUE='#'
-+  INCLUDE_BMP_FALSE=
- fi
+-fi
++IFS="${IFS= 	}"; gtk_save_ifs="$IFS"; IFS=","
++for loader in $included_loaders; do
++ if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then
++   :
++ else
++   as_fn_error "the specified loader $loader does not exist" "$LINENO" 5
++ fi
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
-+ if test x"$INCLUDE_wbmp" = xyes; then
-+  INCLUDE_WBMP_TRUE=
-+  INCLUDE_WBMP_FALSE='#'
-+else
-+  INCLUDE_WBMP_TRUE='#'
-+  INCLUDE_WBMP_FALSE=
-+fi
++ loader_underscores=`echo $loader | sed -e 's/-/_/g'`
++ INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la"
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -18486,25 +18502,25 @@
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
-+ if test x"$INCLUDE_gif" = xyes; then
-+  INCLUDE_GIF_TRUE=
-+  INCLUDE_GIF_FALSE='#'
- else
+-else
 -  eval "$as_ac_Header=\$ac_header_preproc"
-+  INCLUDE_GIF_TRUE='#'
-+  INCLUDE_GIF_FALSE=
- fi
+-fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
- 
-+ if test x"$INCLUDE_ico" = xyes; then
-+  INCLUDE_ICO_TRUE=
-+  INCLUDE_ICO_FALSE='#'
-+else
-+  INCLUDE_ICO_TRUE='#'
-+  INCLUDE_ICO_FALSE=
++ # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader
++ case $loader in
++   gdip-*) ;;
++   *) INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader_underscores";;
++ esac
++ eval INCLUDE_$loader_underscores=yes
++done
+ 
++# Just define one -DINCLUDE_gdiplus for all the gdip-foo loaders
++# (except gdip-png, which isn't built at all)
++if test x"$INCLUDE_gdip_ico" = xyes; then
++  INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_gdiplus"
  fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
@@ -18513,30 +18529,11 @@
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
  
-+ if test x"$INCLUDE_ani" = xyes; then
-+  INCLUDE_ANI_TRUE=
-+  INCLUDE_ANI_FALSE='#'
-+else
-+  INCLUDE_ANI_TRUE='#'
-+  INCLUDE_ANI_FALSE=
- fi
+-fi
++IFS="$gtk_save_ifs"
  
 -done
-+ if test x"$INCLUDE_jpeg" = xyes; then
-+  INCLUDE_JPEG_TRUE=
-+  INCLUDE_JPEG_FALSE='#'
-+else
-+  INCLUDE_JPEG_TRUE='#'
-+  INCLUDE_JPEG_FALSE=
-+fi
- 
-+ if test x"$INCLUDE_pnm" = xyes; then
-+  INCLUDE_PNM_TRUE=
-+  INCLUDE_PNM_FALSE='#'
-+else
-+  INCLUDE_PNM_TRUE='#'
-+  INCLUDE_PNM_FALSE=
-+fi
+ 
  
 -for ac_func in _NSGetEnviron
 -do
@@ -18545,9 +18542,9 @@
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
-+ if test x"$INCLUDE_ras" = xyes; then
-+  INCLUDE_RAS_TRUE=
-+  INCLUDE_RAS_FALSE='#'
++ if test x"$INCLUDE_png" = xyes; then
++  INCLUDE_PNG_TRUE=
++  INCLUDE_PNG_FALSE='#'
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -18558,21 +18555,28 @@
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
-+  INCLUDE_RAS_TRUE='#'
-+  INCLUDE_RAS_FALSE=
-+fi
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++  INCLUDE_PNG_TRUE='#'
++  INCLUDE_PNG_FALSE=
++fi
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++ if test x"$INCLUDE_bmp" = xyes; then
++  INCLUDE_BMP_TRUE=
++  INCLUDE_BMP_FALSE='#'
++else
++  INCLUDE_BMP_TRUE='#'
++  INCLUDE_BMP_FALSE=
++fi
+ 
 -#undef $ac_func
 -
 -/* Override any GCC internal prototype to avoid an error.
@@ -18619,27 +18623,27 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+ if test x"$INCLUDE_tiff" = xyes; then
-+  INCLUDE_TIFF_TRUE=
-+  INCLUDE_TIFF_FALSE='#'
++ if test x"$INCLUDE_wbmp" = xyes; then
++  INCLUDE_WBMP_TRUE=
++  INCLUDE_WBMP_FALSE='#'
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
-+  INCLUDE_TIFF_TRUE='#'
-+  INCLUDE_TIFF_FALSE=
++  INCLUDE_WBMP_TRUE='#'
++  INCLUDE_WBMP_FALSE=
  fi
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+ if test x"$INCLUDE_xpm" = xyes; then
-+  INCLUDE_XPM_TRUE=
-+  INCLUDE_XPM_FALSE='#'
++ if test x"$INCLUDE_gif" = xyes; then
++  INCLUDE_GIF_TRUE=
++  INCLUDE_GIF_FALSE='#'
 +else
-+  INCLUDE_XPM_TRUE='#'
-+  INCLUDE_XPM_FALSE=
++  INCLUDE_GIF_TRUE='#'
++  INCLUDE_GIF_FALSE=
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -18652,6 +18656,75 @@
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
  
++ if test x"$INCLUDE_ico" = xyes; then
++  INCLUDE_ICO_TRUE=
++  INCLUDE_ICO_FALSE='#'
++else
++  INCLUDE_ICO_TRUE='#'
++  INCLUDE_ICO_FALSE=
+ fi
+-done
+-
+ 
++ if test x"$INCLUDE_ani" = xyes; then
++  INCLUDE_ANI_TRUE=
++  INCLUDE_ANI_FALSE='#'
++else
++  INCLUDE_ANI_TRUE='#'
++  INCLUDE_ANI_FALSE=
++fi
+ 
+-##################################################
+-# Checks for gdk-pixbuf
+-##################################################
++ if test x"$INCLUDE_jpeg" = xyes; then
++  INCLUDE_JPEG_TRUE=
++  INCLUDE_JPEG_FALSE='#'
++else
++  INCLUDE_JPEG_TRUE='#'
++  INCLUDE_JPEG_FALSE=
++fi
+ 
++ if test x"$INCLUDE_pnm" = xyes; then
++  INCLUDE_PNM_TRUE=
++  INCLUDE_PNM_FALSE='#'
++else
++  INCLUDE_PNM_TRUE='#'
++  INCLUDE_PNM_FALSE=
++fi
+ 
+-use_la_modules=false
+-case $host in
+-  *-aix*) use_la_modules=true
+-esac
++ if test x"$INCLUDE_ras" = xyes; then
++  INCLUDE_RAS_TRUE=
++  INCLUDE_RAS_FALSE='#'
++else
++  INCLUDE_RAS_TRUE='#'
++  INCLUDE_RAS_FALSE=
++fi
+ 
+-if $use_la_modules ; then
++ if test x"$INCLUDE_tiff" = xyes; then
++  INCLUDE_TIFF_TRUE=
++  INCLUDE_TIFF_FALSE='#'
++else
++  INCLUDE_TIFF_TRUE='#'
++  INCLUDE_TIFF_FALSE=
++fi
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define USE_LA_MODULES 1
+-_ACEOF
++ if test x"$INCLUDE_xpm" = xyes; then
++  INCLUDE_XPM_TRUE=
++  INCLUDE_XPM_FALSE='#'
++else
++  INCLUDE_XPM_TRUE='#'
++  INCLUDE_XPM_FALSE=
++fi
+ 
 + if test x"$INCLUDE_xbm" = xyes; then
 +  INCLUDE_XBM_TRUE=
 +  INCLUDE_XBM_FALSE='#'
@@ -18659,25 +18732,7 @@
 +  INCLUDE_XBM_TRUE='#'
 +  INCLUDE_XBM_FALSE=
  fi
--done
--
--
--
--##################################################
--# Checks for gdk-pixbuf
--##################################################
--
- 
--use_la_modules=false
--case $host in
--  *-aix*) use_la_modules=true
--esac
--
--if $use_la_modules ; then
--
--cat >>confdefs.h <<\_ACEOF
--#define USE_LA_MODULES 1
--_ACEOF
+ 
 + if test x"$INCLUDE_tga" = xyes; then
 +  INCLUDE_TGA_TRUE=
 +  INCLUDE_TGA_FALSE='#'
@@ -18686,24 +18741,27 @@
 +  INCLUDE_TGA_FALSE=
 +fi
  
+-{ $as_echo "$as_me:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5
+-$as_echo_n "checking whether to build gmodulized gdk-pixbuf... " >&6; }
 + if test x"$INCLUDE_pcx" = xyes; then
 +  INCLUDE_PCX_TRUE=
 +  INCLUDE_PCX_FALSE='#'
 +else
 +  INCLUDE_PCX_TRUE='#'
 +  INCLUDE_PCX_FALSE=
- fi
- 
++fi
+ 
+-# Check whether --enable-modules was given.
+-if test "${enable_modules+set}" = set; then
+-  enableval=$enable_modules;
 + if test x"$INCLUDE_icns" = xyes; then
 +  INCLUDE_ICNS_TRUE=
 +  INCLUDE_ICNS_FALSE='#'
 +else
 +  INCLUDE_ICNS_TRUE='#'
 +  INCLUDE_ICNS_FALSE=
-+fi
- 
--{ $as_echo "$as_me:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5
--$as_echo_n "checking whether to build gmodulized gdk-pixbuf... " >&6; }
+ fi
+ 
 + if test x"$INCLUDE_jasper" = xyes; then
 +  INCLUDE_JASPER_TRUE=
 +  INCLUDE_JASPER_FALSE='#'
@@ -18712,25 +18770,43 @@
 +  INCLUDE_JASPER_FALSE=
 +fi
  
--# Check whether --enable-modules was given.
--if test "${enable_modules+set}" = set; then
--  enableval=$enable_modules;
+-dynworks=false
+-deps=
+-if test x$enable_modules = xno; then
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
 +# As all GDI+ loaders are either built-in or not, arbitrarily just
 +# check one of the variables here
 + if test x"$INCLUDE_gdip_ico" = xyes; then
 +  INCLUDE_GDIPLUS_TRUE=
 +  INCLUDE_GDIPLUS_FALSE='#'
-+else
+ else
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-    { $as_echo "$as_me:$LINENO: checking whether dynamic modules work" >&5
+-$as_echo_n "checking whether dynamic modules work... " >&6; }
+-    ## for loop is to strip newline
+-    tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0`
+-    for I in $tmp; do
+-        dynworks=$I
+-    done
 +  INCLUDE_GDIPLUS_TRUE='#'
 +  INCLUDE_GDIPLUS_FALSE=
- fi
- 
- 
--dynworks=false
--deps=
--if test x$enable_modules = xno; then
--    { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
++fi
+ 
+-            if $dynworks; then
+-        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
+-        pixbuf_deplibs_check=`$pixbuf_libtool_config | \
+-            grep '^[a-z_]*check[a-z_]*_method=['\''"]' | \
+-            sed 's/.*['\''"]\(.*\)['\''"]$/\1/'`
+-        if test "x$pixbuf_deplibs_check" = "xnone" || \
+-           test "x$pixbuf_deplibs_check" = "xunknown" || \
+-           test "x$pixbuf_deplibs_check" = "x"; then
+-            dynworks=false
+-        fi
+-    fi
+ 
+-    if $dynworks; then
 +if test x$gio_can_sniff = x; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gio can sniff png" >&5
 +$as_echo_n "checking if gio can sniff png... " >&6; }
@@ -18743,30 +18819,12 @@
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error "cannot run test program while cross compiling
 +See \`config.log' for more details." "$LINENO" 5; }
- else
--    { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--    { $as_echo "$as_me:$LINENO: checking whether dynamic modules work" >&5
--$as_echo_n "checking whether dynamic modules work... " >&6; }
--    ## for loop is to strip newline
--    tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0`
--    for I in $tmp; do
--        dynworks=$I
--    done
++else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
  
--            if $dynworks; then
--        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
--        pixbuf_deplibs_check=`$pixbuf_libtool_config | \
--            grep '^[a-z_]*check[a-z_]*_method=['\''"]' | \
--            sed 's/.*['\''"]\(.*\)['\''"]$/\1/'`
--        if test "x$pixbuf_deplibs_check" = "xnone" || \
--           test "x$pixbuf_deplibs_check" = "xunknown" || \
--           test "x$pixbuf_deplibs_check" = "x"; then
--            dynworks=false
--        fi
--    fi
+-cat >>confdefs.h <<\_ACEOF
+-#define USE_GMODULE 1
 +  #include <gio/gio.h>
 +  static const gsize data_size = 159;
 +  static const guint8 data[] =
@@ -18795,22 +18853,9 @@
 +    image_png = g_content_type_from_mime_type ("image/png");
 +    return !!strcmp (content_type, image_png);
 +  }
-+_ACEOF
+ _ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +  gio_can_sniff=yes
- 
--    if $dynworks; then
-+$as_echo "#define GDK_PIXBUF_USE_GIO_MIME 1" >>confdefs.h
- 
--cat >>confdefs.h <<\_ACEOF
--#define USE_GMODULE 1
--_ACEOF
-+else
-+  gio_can_sniff=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
  
 -        { $as_echo "$as_me:$LINENO: result: yes" >&5
 -$as_echo "yes" >&6; }
@@ -18818,6 +18863,30 @@
 -        { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 -    fi
+-fi
+-
+-
++$as_echo "#define GDK_PIXBUF_USE_GIO_MIME 1" >>confdefs.h
+ 
+-# Check whether --with-libpng was given.
+-if test "${with_libpng+set}" = set; then
+-  withval=$with_libpng;
++else
++  gio_can_sniff=no
+ fi
+-
+-
+-# Check whether --with-libjpeg was given.
+-if test "${with_libjpeg+set}" = set; then
+-  withval=$with_libjpeg;
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
+-
+-# Check whether --with-libtiff was given.
+-if test "${with_libtiff+set}" = set; then
+-  withval=$with_libtiff;
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gio_can_sniff" >&5
 +$as_echo "$gio_can_sniff" >&6; }
 +  LIBS="$gtk_save_LIBS"
@@ -18829,23 +18898,24 @@
 +#
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking immodules to build" >&5
 +$as_echo_n "checking immodules to build... " >&6; }
- 
- 
--# Check whether --with-libpng was given.
--if test "${with_libpng+set}" = set; then
--  withval=$with_libpng;
++
+ 
+-# Check whether --with-libjasper was given.
+-if test "${with_libjasper+set}" = set; then
+-  withval=$with_libjasper;
 +# Check whether --with-included_immodules was given.
 +if test "${with_included_immodules+set}" = set; then :
 +  withval=$with_included_immodules;
  fi
  
  
--# Check whether --with-libjpeg was given.
--if test "${with_libjpeg+set}" = set; then
--  withval=$with_libjpeg;
+-# Check whether --enable-gdiplus was given.
+-if test "${enable_gdiplus+set}" = set; then
+-  enableval=$enable_gdiplus;
 +if $dynworks; then
 +   :
-+else
+ else
+-  enable_gdiplus=no
 +   ## if the option was specified, leave it; otherwise disable included immodules
 +   if test x$with_included_immodules = xno; then
 +           with_included_immodules=yes
@@ -18853,60 +18923,33 @@
  fi
  
 -
--# Check whether --with-libtiff was given.
--if test "${with_libtiff+set}" = set; then
--  withval=$with_libtiff;
+- if  test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then
+-  BUILD_GDIPLUS_LOADERS_TRUE=
+-  BUILD_GDIPLUS_LOADERS_FALSE='#'
+-else
+-  BUILD_GDIPLUS_LOADERS_TRUE='#'
+-  BUILD_GDIPLUS_LOADERS_FALSE=
 +all_immodules="am-et,cedilla,cyrillic-translit"
 +if test "$gdktarget" = "win32"; then
 +   all_immodules="${all_immodules},ime"
- fi
--
--
--# Check whether --with-libjasper was given.
--if test "${with_libjasper+set}" = set; then
--  withval=$with_libjasper;
++fi
 +all_immodules="${all_immodules},inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr"
 +if test "$gdktarget" = "x11"; then
 +   all_immodules="${all_immodules},xim"
  fi
  
 -
--# Check whether --enable-gdiplus was given.
--if test "${enable_gdiplus+set}" = set; then
--  enableval=$enable_gdiplus;
-+included_immodules=""
-+# If the switch specified without listing any specific ones, include all
-+if test "x$with_included_immodules" = xyes ; then
-+  included_immodules="$all_immodules"
- else
--  enable_gdiplus=no
-+  included_immodules="$with_included_immodules"
- fi
- 
--
-- if  test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then
--  BUILD_GDIPLUS_LOADERS_TRUE=
--  BUILD_GDIPLUS_LOADERS_FALSE='#'
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $included_immodules" >&5
-+$as_echo "$included_immodules" >&6; }
-+ if test "x$included_immodules" != x; then
-+  HAVE_INCLUDED_IMMMODULES_TRUE=
-+  HAVE_INCLUDED_IMMMODULES_FALSE='#'
- else
--  BUILD_GDIPLUS_LOADERS_TRUE='#'
--  BUILD_GDIPLUS_LOADERS_FALSE=
-+  HAVE_INCLUDED_IMMMODULES_TRUE='#'
-+  HAVE_INCLUDED_IMMMODULES_FALSE=
- fi
- 
- 
 -if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
 -  if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
 -    { $as_echo "$as_me:$LINENO: checking for TIFFReadRGBAImageOriented in -ltiff" >&5
 -$as_echo_n "checking for TIFFReadRGBAImageOriented in -ltiff... " >&6; }
 -if test "${ac_cv_lib_tiff_TIFFReadRGBAImageOriented+set}" = set; then
 -  $as_echo_n "(cached) " >&6
--else
++included_immodules=""
++# If the switch specified without listing any specific ones, include all
++if test "x$with_included_immodules" = xyes ; then
++  included_immodules="$all_immodules"
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ltiff -lm $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
@@ -18915,8 +18958,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+INCLUDED_IMMODULE_OBJ=
-+INCLUDED_IMMODULE_DEFINE=
++  included_immodules="$with_included_immodules"
++fi
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -18955,9 +18998,28 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $included_immodules" >&5
++$as_echo "$included_immodules" >&6; }
++ if test "x$included_immodules" != x; then
++  HAVE_INCLUDED_IMMMODULES_TRUE=
++  HAVE_INCLUDED_IMMMODULES_FALSE='#'
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no
++  HAVE_INCLUDED_IMMMODULES_TRUE='#'
++  HAVE_INCLUDED_IMMMODULES_FALSE=
+ fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
++
++INCLUDED_IMMODULE_OBJ=
++INCLUDED_IMMODULE_DEFINE=
++
 +IFS="${IFS= 	}"; gtk_save_ifs="$IFS"; IFS=","
 +for immodule in $included_immodules; do
 + immodule_underscores=`echo $immodule | sed -e 's/-/_/g'`
@@ -18966,19 +19028,13 @@
 + else
 +   as_fn_error "the specified input method $immodule does not exist" "$LINENO" 5
 + fi
- 
--	ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no
--fi
++
 + INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la"
 + INCLUDED_IMMODULE_DEFINE="$INCLUDED_IMMODULE_DEFINE -DINCLUDE_IM_$immodule_underscores"
 + eval INCLUDE_$immodule_underscores=yes
 +done
 +IFS="$gtk_save_ifs"
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
++
 +
 +
 + if test x"$INCLUDE_am_et" = xyes; then
@@ -19289,319 +19345,10 @@
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5
 -$as_echo "$ac_cv_lib_tiff_TIFFWriteScanline" >&6; }
 -if test "x$ac_cv_lib_tiff_TIFFWriteScanline" = x""yes; then
--  if test "${ac_cv_header_tiffio_h+set}" = set; then
--  { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5
--$as_echo_n "checking for tiffio.h... " >&6; }
--if test "${ac_cv_header_tiffio_h+set}" = set; then
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-+$as_echo_n "checking return type of signal handlers... " >&6; }
-+if test "${ac_cv_type_signal+set}" = set; then :
-   $as_echo_n "(cached) " >&6
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
--$as_echo "$ac_cv_header_tiffio_h" >&6; }
- else
--  # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5
--$as_echo_n "checking tiffio.h usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--$ac_includes_default
--#include <tiffio.h>
-+#include <sys/types.h>
-+#include <signal.h>
-+
-+int
-+main ()
-+{
-+return *(signal (0, 0)) (0) == 1;
-+  ;
-+  return 0;
-+}
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_header_compiler=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_type_signal=int
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_header_compiler=no
-+  ac_cv_type_signal=void
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-+$as_echo "$ac_cv_type_signal" >&6; }
- 
--# Is the header present?
--{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5
--$as_echo_n "checking tiffio.h presence... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
-+cat >>confdefs.h <<_ACEOF
-+#define RETSIGTYPE $ac_cv_type_signal
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <tiffio.h>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  ac_header_preproc=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--  ac_header_preproc=no
--fi
- 
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
- 
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--  yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h:     check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: tiffio.h:     check for missing prerequisite headers?" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h:     section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: tiffio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;}
--    ( cat <<\_ASBOX
--## --------------------------------------------------------------------- ##
--## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ##
--## --------------------------------------------------------------------- ##
--_ASBOX
--     ) | sed "s/^/$as_me: WARNING:     /" >&2
--    ;;
--esac
--{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5
--$as_echo_n "checking for tiffio.h... " >&6; }
--if test "${ac_cv_header_tiffio_h+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+ if test "x$LIBTIFF" != x; then
-+  HAVE_TIFF_TRUE=
-+  HAVE_TIFF_FALSE='#'
- else
--  ac_cv_header_tiffio_h=$ac_header_preproc
-+  HAVE_TIFF_TRUE='#'
-+  HAVE_TIFF_FALSE=
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
--$as_echo "$ac_cv_header_tiffio_h" >&6; }
- 
-+ if test "x$LIBPNG" != x; then
-+  HAVE_PNG_TRUE=
-+  HAVE_PNG_FALSE='#'
-+else
-+  HAVE_PNG_TRUE='#'
-+  HAVE_PNG_FALSE=
- fi
--if test "x$ac_cv_header_tiffio_h" = x""yes; then
--  TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz'
-+
-+ if test "x$LIBJPEG" != x; then
-+  HAVE_JPEG_TRUE=
-+  HAVE_JPEG_FALSE='#'
- else
--  { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5
--$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;}
-+  HAVE_JPEG_TRUE='#'
-+  HAVE_JPEG_FALSE=
-+fi
-+
-+ if test "x$LIBJASPER" != x; then
-+  HAVE_JASPER_TRUE=
-+  HAVE_JASPER_FALSE='#'
-+else
-+  HAVE_JASPER_TRUE='#'
-+  HAVE_JASPER_FALSE=
- fi
- 
- 
-+if $dynworks ; then
-+  STATIC_LIB_DEPS=
-+  if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then
-+    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF"
-+  fi
-+  if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then
-+    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG"
-+  fi
-+  if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
-+    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
-+  fi
-+  if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
-+    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
-+  fi
- else
--  { $as_echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5
--$as_echo_n "checking for TIFFFlushData in -ltiff34... " >&6; }
--if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then
-+  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
-+fi
-+
-+# Checks to see whether we should include mediaLib
-+# support.
-+#
-+ac_fn_c_check_header_mongrel "$LINENO" "sys/systeminfo.h" "ac_cv_header_sys_systeminfo_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_systeminfo_h" = x""yes; then :
-+
-+$as_echo "#define HAVE_SYS_SYSTEMINFO_H 1" >>confdefs.h
-+
-+fi
-+
-+
-+ac_fn_c_check_header_mongrel "$LINENO" "sys/sysinfo.h" "ac_cv_header_sys_sysinfo_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then :
-+
-+$as_echo "#define HAVE_SYS_SYSINFO_H 1" >>confdefs.h
-+
-+fi
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mediaLib 2.3" >&5
-+$as_echo_n "checking for mediaLib 2.3... " >&6; }
-+use_mlib25=no
-+# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib
-+# patch requires.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mlib_ImageSetStruct in -lmlib" >&5
-+$as_echo_n "checking for mlib_ImageSetStruct in -lmlib... " >&6; }
-+if test "${ac_cv_lib_mlib_mlib_ImageSetStruct+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltiff34 -ljpeg -lz -lm $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lmlib  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -26361,230 +22532,50 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char TIFFFlushData ();
-+char mlib_ImageSetStruct ();
- int
- main ()
- {
--return TIFFFlushData ();
-+return mlib_ImageSetStruct ();
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  ac_cv_lib_tiff34_TIFFFlushData=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_mlib_mlib_ImageSetStruct=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_tiff34_TIFFFlushData=no
-+  ac_cv_lib_mlib_mlib_ImageSetStruct=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5
--$as_echo "$ac_cv_lib_tiff34_TIFFFlushData" >&6; }
--if test "x$ac_cv_lib_tiff34_TIFFFlushData" = x""yes; then
 -  if test "${ac_cv_header_tiffio_h+set}" = set; then
 -  { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5
 -$as_echo_n "checking for tiffio.h... " >&6; }
@@ -19735,30 +19482,290 @@
 -
 -fi
 -if test "x$ac_cv_header_tiffio_h" = x""yes; then
--  TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz'
+-  TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz'
 -else
 -  { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5
 -$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;}
+ fi
+ 
+ 
+-else
+-  { $as_echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5
+-$as_echo_n "checking for TIFFFlushData in -ltiff34... " >&6; }
+-if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
++$as_echo_n "checking return type of signal handlers... " >&6; }
++if test "${ac_cv_type_signal+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ltiff34 -ljpeg -lz -lm $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include <sys/types.h>
++#include <signal.h>
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char TIFFFlushData ();
+ int
+ main ()
+ {
+-return TIFFFlushData ();
++return *(signal (0, 0)) (0) == 1;
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_lib_tiff34_TIFFFlushData=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_type_signal=int
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_tiff34_TIFFFlushData=no
 -fi
 -
--
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5
-+$as_echo "$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; }
-+if test "x$ac_cv_lib_mlib_mlib_ImageSetStruct" = x""yes; then :
-+  use_mlib=yes
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
++  ac_cv_type_signal=void
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5
+-$as_echo "$ac_cv_lib_tiff34_TIFFFlushData" >&6; }
+-if test "x$ac_cv_lib_tiff34_TIFFFlushData" = x""yes; then
+-  if test "${ac_cv_header_tiffio_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5
+-$as_echo_n "checking for tiffio.h... " >&6; }
+-if test "${ac_cv_header_tiffio_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
+-$as_echo "$ac_cv_header_tiffio_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5
+-$as_echo_n "checking tiffio.h usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <tiffio.h>
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
++$as_echo "$ac_cv_type_signal" >&6; }
++
++cat >>confdefs.h <<_ACEOF
++#define RETSIGTYPE $ac_cv_type_signal
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_header_compiler=no
+-fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+ 
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5
+-$as_echo_n "checking tiffio.h presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <tiffio.h>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  ac_header_preproc=yes
++ if test "x$LIBTIFF" != x; then
++  HAVE_TIFF_TRUE=
++  HAVE_TIFF_FALSE='#'
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
++  HAVE_TIFF_TRUE='#'
++  HAVE_TIFF_FALSE=
+ fi
+ 
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: tiffio.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: tiffio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## --------------------------------------------------------------------- ##
+-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ##
+-## --------------------------------------------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5
+-$as_echo_n "checking for tiffio.h... " >&6; }
+-if test "${ac_cv_header_tiffio_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++ if test "x$LIBPNG" != x; then
++  HAVE_PNG_TRUE=
++  HAVE_PNG_FALSE='#'
+ else
+-  ac_cv_header_tiffio_h=$ac_header_preproc
++  HAVE_PNG_TRUE='#'
++  HAVE_PNG_FALSE=
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
+-$as_echo "$ac_cv_header_tiffio_h" >&6; }
+ 
++ if test "x$LIBJPEG" != x; then
++  HAVE_JPEG_TRUE=
++  HAVE_JPEG_FALSE='#'
++else
++  HAVE_JPEG_TRUE='#'
++  HAVE_JPEG_FALSE=
+ fi
+-if test "x$ac_cv_header_tiffio_h" = x""yes; then
+-  TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz'
++
++ if test "x$LIBJASPER" != x; then
++  HAVE_JASPER_TRUE=
++  HAVE_JASPER_FALSE='#'
+ else
+-  { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5
+-$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;}
++  HAVE_JASPER_TRUE='#'
++  HAVE_JASPER_FALSE=
+ fi
+ 
+ 
++if $dynworks ; then
++  STATIC_LIB_DEPS=
++  if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then
++    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF"
++  fi
++  if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then
++    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG"
++  fi
++  if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
++    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
++  fi
++  if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
++    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
++  fi
  else
 -  { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5
 -$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;}
++  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
+ fi
+ 
 -fi
--
-+  use_mlib=no
- fi
- 
--fi
-+if test $use_mlib = yes; then
++# Checks to see whether we should include mediaLib
++# support.
++#
++ac_fn_c_check_header_mongrel "$LINENO" "sys/systeminfo.h" "ac_cv_header_sys_systeminfo_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_systeminfo_h" = x""yes; then :
++
++$as_echo "#define HAVE_SYS_SYSTEMINFO_H 1" >>confdefs.h
+ 
+ fi
  
 -  fi
-+$as_echo "#define USE_MEDIALIB 1" >>confdefs.h
  
 -  if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
 -     { { $as_echo "$as_me:$LINENO: error:
@@ -19771,21 +19778,28 @@
 -*** not work properly" >&2;}
 -   { (exit 1); exit 1; }; }
 -  fi
--fi
-+    MEDIA_LIB=-lmlib
++ac_fn_c_check_header_mongrel "$LINENO" "sys/sysinfo.h" "ac_cv_header_sys_sysinfo_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then :
++
++$as_echo "#define HAVE_SYS_SYSINFO_H 1" >>confdefs.h
++
+ fi
  
 -if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
 -  if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
 -    { $as_echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5
 -$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; }
 -if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mediaLib 2.5" >&5
-+$as_echo_n "checking for mediaLib 2.5... " >&6; }
-+    # Check for a mediaLib 2.5 function since that is what is needed for
-+    # gdk_rgb_convert integration.
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5
-+$as_echo_n "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... " >&6; }
-+if test "${ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint+set}" = set; then :
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mediaLib 2.3" >&5
++$as_echo_n "checking for mediaLib 2.3... " >&6; }
++use_mlib25=no
++# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib
++# patch requires.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mlib_ImageSetStruct in -lmlib" >&5
++$as_echo_n "checking for mlib_ImageSetStruct in -lmlib... " >&6; }
++if test "${ac_cv_lib_mlib_mlib_ImageSetStruct+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -19800,17 +19814,17 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -26593,3494 +22584,554 @@
+@@ -26593,116 +22543,50 @@
  #ifdef __cplusplus
  extern "C"
  #endif
 -char jpeg_destroy_decompress ();
-+char mlib_VideoColorRGBint_to_BGRAint ();
++char mlib_ImageSetStruct ();
  int
  main ()
  {
 -return jpeg_destroy_decompress ();
-+return mlib_VideoColorRGBint_to_BGRAint ();
++return mlib_ImageSetStruct ();
    ;
    return 0;
  }
@@ -19838,13 +19852,13 @@
 -       }; then
 -  ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes
++  ac_cv_lib_mlib_mlib_ImageSetStruct=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_lib_jpeg_jpeg_destroy_decompress=no
-+  ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no
++  ac_cv_lib_mlib_mlib_ImageSetStruct=no
  fi
 -
 -rm -rf conftest.dSYM
@@ -19858,15 +19872,16 @@
 -$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; }
 -if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then
 -  jpeg_ok=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5
-+$as_echo "$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; }
-+if test "x$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" = x""yes; then :
-+  use_mlib25=yes
- else
+-else
 -  jpeg_ok=no
 -      { $as_echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&5
 -$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&2;}
-+  use_mlib25=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5
++$as_echo "$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; }
++if test "x$ac_cv_lib_mlib_mlib_ImageSetStruct" = x""yes; then :
++  use_mlib=yes
++else
++  use_mlib=no
  fi
  
 -    if test "$jpeg_ok" = yes; then
@@ -19905,11 +19920,11 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+    if test $use_mlib25 = yes; then
++if test $use_mlib = yes; then
  
 -  jpeg_ok=no
 -fi
-+$as_echo "#define USE_MEDIALIB25 1" >>confdefs.h
++$as_echo "#define USE_MEDIALIB 1" >>confdefs.h
  
 -rm -f conftest.err conftest.$ac_ext
 -      { $as_echo "$as_me:$LINENO: result: $jpeg_ok" >&5
@@ -19919,40 +19934,44 @@
 -        { $as_echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5
 -$as_echo_n "checking for jpeg_simple_progression in -ljpeg... " >&6; }
 -if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+    fi
-+fi
-+ if test $use_mlib = yes; then
-+  USE_MEDIALIB_TRUE=
-+  USE_MEDIALIB_FALSE='#'
- else
--  ac_check_lib_save_LIBS=$LIBS
++    MEDIA_LIB=-lmlib
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mediaLib 2.5" >&5
++$as_echo_n "checking for mediaLib 2.5... " >&6; }
++    # Check for a mediaLib 2.5 function since that is what is needed for
++    # gdk_rgb_convert integration.
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5
++$as_echo_n "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... " >&6; }
++if test "${ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ljpeg  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+  USE_MEDIALIB_TRUE='#'
-+  USE_MEDIALIB_FALSE=
-+fi
- 
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
++LIBS="-lmlib  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -26711,3376 +22595,554 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char jpeg_simple_progression ();
--int
--main ()
--{
++char mlib_VideoColorRGBint_to_BGRAint ();
+ int
+ main ()
+ {
 -return jpeg_simple_progression ();
--  ;
--  return 0;
--}
--_ACEOF
++return mlib_VideoColorRGBint_to_BGRAint ();
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -19975,72 +19994,48 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_lib_jpeg_jpeg_simple_progression=yes
-+ if test $use_mlib25 = yes; then
-+  USE_MEDIALIB25_TRUE=
-+  USE_MEDIALIB25_FALSE='#'
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_lib_jpeg_jpeg_simple_progression=no
-+  USE_MEDIALIB25_TRUE='#'
-+  USE_MEDIALIB25_FALSE=
- fi
- 
++  ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no
+ fi
+-
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5
 -$as_echo "$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; }
 -if test "x$ac_cv_lib_jpeg_jpeg_simple_progression" = x""yes; then
- 
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_PROGRESSIVE_JPEG 1
 -_ACEOF
-+# Checks to see if we should compile in MMX support (there will be
-+# a runtime test when the code is actually run to see if it should
-+# be used - this just checks if we can compile it.)
-+#
-+# This code is partially taken from Mesa
-+#
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 platform" >&5
-+$as_echo_n "checking for x86 platform... " >&6; }
-+case $host_cpu in
-+  i386|i486|i586|i686|i786|k6|k7)
-+	use_x86_asm=yes
-+        ;;
-+   *)
-+  	use_x86_asm=no
-+esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_x86_asm" >&5
-+$as_echo "$use_x86_asm" >&6; }
- 
--else
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5
++$as_echo "$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; }
++if test "x$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" = x""yes; then :
++  use_mlib25=yes
+ else
 -  { $as_echo "$as_me:$LINENO: WARNING: JPEG library does not support progressive saving." >&5
 -$as_echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;}
--fi
-+use_mmx_asm=no
-+if test $use_x86_asm = yes; then
-+    save_ac_ext=$ac_ext
-+    ac_ext=S
++  use_mlib25=no
+ fi
  
 -      else
 -          { $as_echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5
 -$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;}
 -      fi
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler support for MMX" >&5
-+$as_echo_n "checking compiler support for MMX... " >&6; }
-+    cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S
-+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+        use_mmx_asm=yes
-     fi
+-    fi
 -  fi
++    if test $use_mlib25 = yes; then
  
 -  if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
 -     { { $as_echo "$as_me:$LINENO: error:
@@ -20054,32 +20049,30 @@
 -   { (exit 1); exit 1; }; }
 -  fi
 -fi
-+    rm -rf conftest*
++$as_echo "#define USE_MEDIALIB25 1" >>confdefs.h
  
 -  if test x$with_libpng != xno && test -z "$LIBPNG"; then
 -    { $as_echo "$as_me:$LINENO: checking for libpng12" >&5
 -$as_echo_n "checking for libpng12... " >&6; }
 -    if $PKG_CONFIG --exists libpng12 ; then
 -        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+    ac_ext=$save_ac_ext
-+    if test $use_mmx_asm = yes; then
-+
-+$as_echo "#define USE_MMX 1" >>confdefs.h
-+
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
+-$as_echo "yes" >&6; }
 -        PNG='png'
 -	PNG_DEP_CFLAGS_PACKAGES=libpng12
 -	LIBPNG=`$PKG_CONFIG --libs libpng12`
-     else
+-    else
 -      { $as_echo "$as_me:$LINENO: result: no" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
+-$as_echo "no" >&6; }
 -      { $as_echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5
 -$as_echo_n "checking for png_read_info in -lpng... " >&6; }
 -if test "${ac_cv_lib_png_png_read_info+set}" = set; then
 -  $as_echo_n "(cached) " >&6
--else
++    fi
++fi
++ if test $use_mlib = yes; then
++  USE_MEDIALIB_TRUE=
++  USE_MEDIALIB_FALSE='#'
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpng -lz -lm $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
@@ -20088,7 +20081,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+    fi
++  USE_MEDIALIB_TRUE='#'
++  USE_MEDIALIB_FALSE=
 +fi
  
 -/* Override any GCC internal prototype to avoid an error.
@@ -20128,16 +20122,16 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_lib_png_png_read_info=yes
-+ if test x$use_mmx_asm = xyes; then
-+  USE_MMX_TRUE=
-+  USE_MMX_FALSE='#'
++ if test $use_mlib25 = yes; then
++  USE_MEDIALIB25_TRUE=
++  USE_MEDIALIB25_FALSE='#'
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_lib_png_png_read_info=no
-+  USE_MMX_TRUE='#'
-+  USE_MMX_FALSE=
++  USE_MEDIALIB25_TRUE='#'
++  USE_MEDIALIB25_FALSE=
  fi
  
 -rm -rf conftest.dSYM
@@ -20174,11 +20168,39 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
--esac
++
++# Checks to see if we should compile in MMX support (there will be
++# a runtime test when the code is actually run to see if it should
++# be used - this just checks if we can compile it.)
++#
++# This code is partially taken from Mesa
++#
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 platform" >&5
++$as_echo_n "checking for x86 platform... " >&6; }
++case $host_cpu in
++  i386|i486|i586|i686|i786|k6|k7)
++	use_x86_asm=yes
++        ;;
++   *)
++  	use_x86_asm=no
+ esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_x86_asm" >&5
++$as_echo "$use_x86_asm" >&6; }
++
++use_mmx_asm=no
++if test $use_x86_asm = yes; then
++    save_ac_ext=$ac_ext
++    ac_ext=S
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler support for MMX" >&5
++$as_echo_n "checking compiler support for MMX... " >&6; }
++    cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S
++    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
++  (eval $ac_compile) 2>&5
+   ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -20191,16 +20213,20 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++        use_mmx_asm=yes
++    fi
  
 -	ac_header_compiler=no
-+REBUILD_PNGS=
-+if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then
-+  REBUILD_PNGS=#
- fi
+-fi
++    rm -rf conftest*
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
++    ac_ext=$save_ac_ext
++    if test $use_mmx_asm = yes; then
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking png.h presence" >&5
@@ -20231,22 +20257,24 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
-+ if test $cross_compiling = yes; then
-+  CROSS_COMPILING_TRUE=
-+  CROSS_COMPILING_FALSE='#'
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define USE_MMX 1" >>confdefs.h
+ 
 -  ac_header_preproc=no
-+  CROSS_COMPILING_TRUE='#'
-+  CROSS_COMPILING_FALSE=
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++    else
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++    fi
  fi
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
- 
+-
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -20280,18 +20308,88 @@
 -{ $as_echo "$as_me:$LINENO: checking for png.h" >&5
 -$as_echo_n "checking for png.h... " >&6; }
 -if test "${ac_cv_header_png_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++ if test x$use_mmx_asm = xyes; then
++  USE_MMX_TRUE=
++  USE_MMX_FALSE='#'
+ else
+-  ac_cv_header_png_h=$ac_header_preproc
++  USE_MMX_TRUE='#'
++  USE_MMX_FALSE=
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
+-$as_echo "$ac_cv_header_png_h" >&6; }
+ 
+-fi
+-if test "x$ac_cv_header_png_h" = x""yes; then
+-  png_ok=yes
+-else
+-  png_ok=no
++
++REBUILD_PNGS=
++if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then
++  REBUILD_PNGS=#
+ fi
+ 
+ 
++ if test $cross_compiling = yes; then
++  CROSS_COMPILING_TRUE=
++  CROSS_COMPILING_FALSE='#'
+ else
+-  { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5
+-$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;}
++  CROSS_COMPILING_TRUE='#'
++  CROSS_COMPILING_FALSE=
+ fi
+ 
+-      if test "$png_ok" = yes; then
+-        { $as_echo "$as_me:$LINENO: checking for png_structp in png.h" >&5
+-$as_echo_n "checking for png_structp in png.h... " >&6; }
+-        cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <png.h>
+-int
+-main ()
+-{
+-png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  png_ok=yes
++
 +if test $cross_compiling = yes; then
 +  # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args.
 +set dummy gdk-pixbuf-csource; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_path_GDK_PIXBUF_CSOURCE+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  ac_cv_header_png_h=$ac_header_preproc
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
--$as_echo "$ac_cv_header_png_h" >&6; }
++  $as_echo_n "(cached) " >&6
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  case $GDK_PIXBUF_CSOURCE in
 +  [\\/]* | ?:[\\/]*)
 +  ac_cv_path_GDK_PIXBUF_CSOURCE="$GDK_PIXBUF_CSOURCE" # Let the user override the test with a path.
@@ -20312,14 +20410,11 @@
 +  done
 +IFS=$as_save_IFS
  
+-	png_ok=no
 +  test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="no"
 +  ;;
 +esac
- fi
--if test "x$ac_cv_header_png_h" = x""yes; then
--  png_ok=yes
--else
--  png_ok=no
++fi
 +GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE
 +if test -n "$GDK_PIXBUF_CSOURCE"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDK_PIXBUF_CSOURCE" >&5
@@ -20329,17 +20424,55 @@
 +$as_echo "no" >&6; }
  fi
  
- 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-        { $as_echo "$as_me:$LINENO: result: $png_ok" >&5
+-$as_echo "$png_ok" >&6; }
+-        if test "$png_ok" = yes; then
+-          PNG='png'; LIBPNG='-lpng -lz'
+-        else
+-          { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&5
+-$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&2;}
+-        fi
+-      else
+-       { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5
+-$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;}
+-      fi
+-    fi
+-  fi
+-
+-  if test x$with_libpng != xno && test -z "$LIBPNG"; then
+-     { { $as_echo "$as_me:$LINENO: error:
+-*** Checks for PNG loader failed. You can build without it by passing
+-*** --without-libpng to configure but many programs using GTK+ will
+-*** not work properly. The PNG loader is also needed if you are compiling
+-*** from CVS." >&5
+-$as_echo "$as_me: error:
+-*** Checks for PNG loader failed. You can build without it by passing
+-*** --without-libpng to configure but many programs using GTK+ will
+-*** not work properly. The PNG loader is also needed if you are compiling
+-*** from CVS." >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+ 
+-  if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
+-    { $as_echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5
+-$as_echo_n "checking for jas_init in -ljasper... " >&6; }
+-if test "${ac_cv_lib_jasper_jas_init+set}" = set; then
 +  # Extract the first word of "gtk-update-icon-cache", so it can be a program name with args.
 +set dummy gtk-update-icon-cache; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_path_GTK_UPDATE_ICON_CACHE+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
--  { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5
--$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;}
--fi
+   $as_echo_n "(cached) " >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ljasper -ljpeg $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 +  case $GTK_UPDATE_ICON_CACHE in
 +  [\\/]* | ?:[\\/]*)
 +  ac_cv_path_GTK_UPDATE_ICON_CACHE="$GTK_UPDATE_ICON_CACHE" # Let the user override the test with a path.
@@ -20360,106 +20493,6 @@
 +  done
 +IFS=$as_save_IFS
  
--      if test "$png_ok" = yes; then
--        { $as_echo "$as_me:$LINENO: checking for png_structp in png.h" >&5
--$as_echo_n "checking for png_structp in png.h... " >&6; }
--        cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <png.h>
--int
--main ()
--{
--png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
-+  test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE" && ac_cv_path_GTK_UPDATE_ICON_CACHE="no"
-+  ;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  png_ok=yes
-+fi
-+GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE
-+if test -n "$GTK_UPDATE_ICON_CACHE"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_UPDATE_ICON_CACHE" >&5
-+$as_echo "$GTK_UPDATE_ICON_CACHE" >&6; }
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	png_ok=no
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--        { $as_echo "$as_me:$LINENO: result: $png_ok" >&5
--$as_echo "$png_ok" >&6; }
--        if test "$png_ok" = yes; then
--          PNG='png'; LIBPNG='-lpng -lz'
--        else
--          { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&5
--$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&2;}
--        fi
--      else
--       { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5
--$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;}
--      fi
--    fi
--  fi
- 
--  if test x$with_libpng != xno && test -z "$LIBPNG"; then
--     { { $as_echo "$as_me:$LINENO: error:
--*** Checks for PNG loader failed. You can build without it by passing
--*** --without-libpng to configure but many programs using GTK+ will
--*** not work properly. The PNG loader is also needed if you are compiling
--*** from CVS." >&5
--$as_echo "$as_me: error:
--*** Checks for PNG loader failed. You can build without it by passing
--*** --without-libpng to configure but many programs using GTK+ will
--*** not work properly. The PNG loader is also needed if you are compiling
--*** from CVS." >&2;}
--   { (exit 1); exit 1; }; }
-+  if test x$GTK_UPDATE_ICON_CACHE = xno; then
-+    REBUILD_PNGS=#
-   fi
--
--  if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
--    { $as_echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5
--$as_echo_n "checking for jas_init in -ljasper... " >&6; }
--if test "${ac_cv_lib_jasper_jas_init+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ljasper -ljpeg $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -20480,7 +20513,9 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
--esac
++  test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE" && ac_cv_path_GTK_UPDATE_ICON_CACHE="no"
++  ;;
+ esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_link") 2>conftest.er1
@@ -20497,11 +20532,18 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_lib_jasper_jas_init=yes
--else
++fi
++GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE
++if test -n "$GTK_UPDATE_ICON_CACHE"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_UPDATE_ICON_CACHE" >&5
++$as_echo "$GTK_UPDATE_ICON_CACHE" >&6; }
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_lib_jasper_jas_init=no
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 -rm -rf conftest.dSYM
@@ -20513,15 +20555,12 @@
 -$as_echo "$ac_cv_lib_jasper_jas_init" >&6; }
 -if test "x$ac_cv_lib_jasper_jas_init" = x""yes; then
 -  LIBJASPER=-ljasper
-+if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
-+   test "x$REBUILD_PNGS" = "x#" ; then
-+     as_fn_error "
-+*** gtkbuiltincache.h is not in the tree, and cannot be built
-+*** because you don't have libpng, or (when cross-compiling) you
-+*** don't have a prebuilt gtk-update-icon-cache on the build system." "$LINENO" 5
- fi
- 
--  fi
+-fi
+ 
++  if test x$GTK_UPDATE_ICON_CACHE = xno; then
++    REBUILD_PNGS=#
+   fi
++fi
  
 -  if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
 -     { { $as_echo "$as_me:$LINENO: error:
@@ -20532,6 +20571,15 @@
 -*** --without-libjasper to configure" >&2;}
 -   { (exit 1); exit 1; }; }
 -  fi
++if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
++   test "x$REBUILD_PNGS" = "x#" ; then
++     as_fn_error "
++*** gtkbuiltincache.h is not in the tree, and cannot be built
++*** because you don't have libpng, or (when cross-compiling) you
++*** don't have a prebuilt gtk-update-icon-cache on the build system." "$LINENO" 5
++fi
+ 
+ 
  
 +GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
 +GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
@@ -20546,13 +20594,6 @@
 +GDK_PIXBUF_XLIB_PACKAGES=
 +GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
 +GDK_PIXBUF_XLIB_EXTRA_LIBS=
- 
-+GDK_EXTRA_LIBS="$GDK_WLIBS"
-+GDK_EXTRA_CFLAGS=
- 
-+# GTK+ uses some X calls, so needs to link against X directly
-+GTK_DEP_PACKAGES_FOR_X=
-+GTK_DEP_LIBS_FOR_X=
  
 - if $dynworks; then
 -  BUILD_DYNAMIC_MODULES_TRUE=
@@ -20561,6 +20602,18 @@
 -  BUILD_DYNAMIC_MODULES_TRUE='#'
 -  BUILD_DYNAMIC_MODULES_FALSE=
 -fi
++GDK_EXTRA_LIBS="$GDK_WLIBS"
++GDK_EXTRA_CFLAGS=
+ 
++# GTK+ uses some X calls, so needs to link against X directly
++GTK_DEP_PACKAGES_FOR_X=
++GTK_DEP_LIBS_FOR_X=
+ 
+-#
+-# Allow building some or all gdk-pixbuf loaders included
+-#
+-{ $as_echo "$as_me:$LINENO: checking pixbuf loaders to build" >&5
+-$as_echo_n "checking pixbuf loaders to build... " >&6; }
 +if test "x$gdktarget" = "xx11"; then
 +  X_PACKAGES=fontconfig
  
@@ -20573,11 +20626,10 @@
 +*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." "$LINENO" 5
 +  fi
  
--#
--# Allow building some or all gdk-pixbuf loaders included
--#
--{ $as_echo "$as_me:$LINENO: checking pixbuf loaders to build" >&5
--$as_echo_n "checking pixbuf loaders to build... " >&6; }
+-# Check whether --with-included_loaders was given.
+-if test "${with_included_loaders+set}" = set; then
+-  withval=$with_included_loaders;
+-fi
 +  #
 +  # Check for basic X packages; we use pkg-config if available
 +  #
@@ -20597,9 +20649,13 @@
 +      esac
 +    done
  
--# Check whether --with-included_loaders was given.
--if test "${with_included_loaders+set}" = set; then
--  withval=$with_included_loaders;
+-if $dynworks; then
+-   :
+-else
+-   ## if the option was specified, leave it; otherwise disable included loaders
+-   if test x$with_included_loaders = xno; then
+-           with_included_loaders=yes
+-   fi
 -fi
 +    GDK_PIXBUF_XLIB_PACKAGES="x11"
 +    GTK_PACKAGES_FOR_X="x11"
@@ -20608,33 +20664,24 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
 +$as_echo_n "checking for X... " >&6; }
  
- 
--if $dynworks; then
--   :
--else
--   ## if the option was specified, leave it; otherwise disable included loaders
--   if test x$with_included_loaders = xno; then
--           with_included_loaders=yes
--   fi
+-# Use the traditional png loader instead of the GDI+ one on Windows,
+-# because some important apps like GIMP need to read and write
+-# arbitrary tEXt chunks which doesn't seem to be possible through GDI+
+ 
+-all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm"
+-if test x$with_libjasper != xno; then
+-  all_loaders="$all_loaders,jasper"
 +# Check whether --with-x was given.
 +if test "${with_x+set}" = set; then :
 +  withval=$with_x;
  fi
- 
--# Use the traditional png loader instead of the GDI+ one on Windows,
--# because some important apps like GIMP need to read and write
--# arbitrary tEXt chunks which doesn't seem to be possible through GDI+
--
--all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm"
--if test x$with_libjasper != xno; then
--  all_loaders="$all_loaders,jasper"
--fi
 -if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then
 -  # Skip PNG, see comment above
 -  gdip_formats="bmp emf gif ico jpeg tiff wmf"
 -  for f in $gdip_formats; do
 -    all_loaders="$all_loaders,gdip-$f"
 -  done
++
 +# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
 +if test "x$with_x" = xno; then
 +  # The user explicitly disabled X.
@@ -23717,7 +23764,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -30088,92 +23139,27 @@
+@@ -30088,92 +23150,27 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -23822,7 +23869,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -30181,200 +23167,100 @@
+@@ -30181,200 +23178,100 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -24086,7 +24133,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -30382,103 +23268,40 @@
+@@ -30382,103 +23279,40 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -24164,13 +24211,13 @@
 +  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
  fi
 -done
- 
+-
 -
 -  # Generic X11R6 check needed for XIM support; we could
 -  # probably use this to replace the above, but we'll
 -  # leave the separate checks for XConvertCase and XInternAtoms
 -  # for clarity
--
+ 
 -  have_x11r6=false
 -  { $as_echo "$as_me:$LINENO: checking for XAddConnectionWatch" >&5
 -$as_echo_n "checking for XAddConnectionWatch... " >&6; }
@@ -24209,7 +24256,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -30486,116 +23309,104 @@
+@@ -30486,116 +23320,104 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -24400,7 +24447,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -30603,99 +23414,48 @@
+@@ -30603,99 +23425,48 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -24525,7 +24572,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -30703,97 +23463,51 @@
+@@ -30703,97 +23474,51 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -24652,7 +24699,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -30801,224 +23515,238 @@
+@@ -30801,224 +23526,238 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -24780,10 +24827,10 @@
 +  as_fn_error "*** libXrender not found. Check 'config.log' for more details." "$LINENO" 5
 +fi
 +
+ 
+-#include <X11/extensions/sync.h>
++  # Check for xReply
 +
-+  # Check for xReply
- 
--#include <X11/extensions/sync.h>
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if <X11/extensions/XIproto.h> is needed for xReply" >&5
 +$as_echo_n "checking if <X11/extensions/XIproto.h> is needed for xReply... " >&6; }
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24837,10 +24884,10 @@
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
++
++$as_echo "#define NEED_XIPROTO_H_FOR_XREPLY 1" >>confdefs.h
  
 -	ac_cv_header_X11_extensions_sync_h=no
-+$as_echo "#define NEED_XIPROTO_H_FOR_XREPLY 1" >>confdefs.h
-+
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 +$as_echo "unknown" >&6; }
@@ -24853,11 +24900,11 @@
 -$as_echo "$ac_cv_header_X11_extensions_sync_h" >&6; }
 -if test "x$ac_cv_header_X11_extensions_sync_h" = x""yes; then
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+  # Check for XConvertCase, XInternAtoms (X11R6 specific)
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_XSYNC 1
++  # Check for XConvertCase, XInternAtoms (X11R6 specific)
++
 +  for ac_func in XConvertCase XInternAtoms
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -24872,13 +24919,13 @@
 -  :
  fi
 +done
- 
++
  
 +  # Generic X11R6 check needed for XIM support; we could
 +  # probably use this to replace the above, but we'll
 +  # leave the separate checks for XConvertCase and XInternAtoms
 +  # for clarity
-+
+ 
 +  have_x11r6=false
 +  ac_fn_c_check_func "$LINENO" "XAddConnectionWatch" "ac_cv_func_XAddConnectionWatch"
 +if test "x$ac_cv_func_XAddConnectionWatch" = x""yes; then :
@@ -25006,7 +25053,8 @@
 +  # X SYNC check
 +  gtk_save_CFLAGS="$CFLAGS"
 +  CFLAGS="$CFLAGS $x_cflags"
-+
+ 
+-	ac_cv_func_XShmAttach=no
 +  ac_fn_c_check_func "$LINENO" "XSyncQueryExtension" "ac_cv_func_XSyncQueryExtension"
 +if test "x$ac_cv_func_XSyncQueryExtension" = x""yes; then :
 +  ac_fn_c_check_header_compile "$LINENO" "X11/extensions/sync.h" "ac_cv_header_X11_extensions_sync_h" "#include <X11/Xlib.h>
@@ -25014,8 +25062,7 @@
 +if test "x$ac_cv_header_X11_extensions_sync_h" = x""yes; then :
 +
 +$as_echo "#define HAVE_XSYNC 1" >>confdefs.h
- 
--	ac_cv_func_XShmAttach=no
++
 +else
 +  :
  fi
@@ -25059,7 +25106,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -31036,336 +23764,45 @@
+@@ -31036,336 +23775,45 @@
    return 0;
  }
  _ACEOF
@@ -25107,7 +25154,7 @@
 -if test "x$ac_cv_lib_XextSam_XShmAttach" = x""yes; then
 +if test "x$ac_cv_lib_XextSam_XShmAttach" = x""yes; then :
     case "$x_extra_libs " in
--    *-lXextSam[\ \	]*)               ;;
+     *-lXextSam[\ \	]*)               ;;
 -    *)               x_extra_libs="-lXextSam $x_extra_libs" ;;
 -  esac
 -
@@ -25345,7 +25392,6 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+    *-lXextSam[\ \	]*)               ;;
 +    *)               x_extra_libs="-lXextSam $x_extra_libs" ;;
 +  esac
  
@@ -25420,7 +25466,7 @@
  
  else
    no_sys_shm=yes
-@@ -31375,18 +23812,14 @@
+@@ -31375,18 +23823,14 @@
  
      # Check for the X shared memory extension header file
      have_xshm=no
@@ -25441,7 +25487,7 @@
  /* end confdefs.h.  */
  
  #include <stdlib.h>
-@@ -31405,42 +23838,17 @@
+@@ -31405,42 +23849,17 @@
    return 0;
  }
  _ACEOF
@@ -25487,7 +25533,7 @@
  
      fi
    fi
-@@ -31451,7 +23859,7 @@
+@@ -31451,7 +23870,7 @@
      CPPFLAGS="$CPPFLAGS $x_cflags"
  
      # Check for XFree
@@ -25496,7 +25542,7 @@
  $as_echo_n "checking for Xinerama support on XFree86... " >&6; }
  
      have_xfree_xinerama=false
-@@ -31459,18 +23867,14 @@
+@@ -31459,18 +23878,14 @@
         have_xfree_xinerama=true
         X_PACKAGES="$X_PACKAGES xinerama"
      else
@@ -25518,7 +25564,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -31488,89 +23892,21 @@
+@@ -31488,89 +23903,21 @@
    return 0;
  }
  _ACEOF
@@ -25617,7 +25663,7 @@
     case "$x_extra_libs " in
      *-lXinerama[\ \	]*)               ;;
      *)               x_extra_libs="-lXinerama $x_extra_libs" ;;
-@@ -31588,160 +23924,29 @@
+@@ -31588,160 +23935,29 @@
  
      if $have_xfree_xinerama ; then
  
@@ -25788,7 +25834,7 @@
    have_solaris_xinerama=true
  else
    :
-@@ -31753,19 +23958,15 @@
+@@ -31753,19 +23969,15 @@
  
              if $have_solaris_xinerama ; then
  
@@ -25812,7 +25858,7 @@
  $as_echo "no" >&6; }
              fi
              ;;
-@@ -31779,9 +23980,7 @@
+@@ -31779,9 +23991,7 @@
  
    if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
  
@@ -25823,7 +25869,7 @@
  
  
      if $PKG_CONFIG --exists xi ; then
-@@ -31795,9 +23994,7 @@
+@@ -31795,9 +24005,7 @@
      fi
    else
  
@@ -25834,7 +25880,7 @@
  
    fi
  
-@@ -31813,9 +24010,7 @@
+@@ -31813,9 +24021,7 @@
    # Check for the RANDR extension
    if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
  
@@ -25845,7 +25891,7 @@
  
  
       X_PACKAGES="$X_PACKAGES xrandr"
-@@ -31825,9 +24020,7 @@
+@@ -31825,9 +24031,7 @@
  
    if $PKG_CONFIG --exists xcursor ; then
  
@@ -25856,7 +25902,7 @@
  
  
      X_PACKAGES="$X_PACKAGES xcursor"
-@@ -31837,9 +24030,7 @@
+@@ -31837,9 +24041,7 @@
  
    if $PKG_CONFIG --exists xfixes ; then
  
@@ -25867,7 +25913,7 @@
  
  
      X_PACKAGES="$X_PACKAGES xfixes"
-@@ -31850,9 +24041,7 @@
+@@ -31850,9 +24052,7 @@
  
    if $PKG_CONFIG --exists xcomposite ; then
  
@@ -25878,7 +25924,7 @@
  
  
      X_PACKAGES="$X_PACKAGES xcomposite"
-@@ -31863,9 +24052,7 @@
+@@ -31863,9 +24063,7 @@
  
    if $PKG_CONFIG --exists xdamage ; then
  
@@ -25889,7 +25935,7 @@
  
  
      X_PACKAGES="$X_PACKAGES xdamage"
-@@ -31971,45 +24158,49 @@
+@@ -31971,45 +24169,49 @@
  
  if test "x$gdktarget" = "xdirectfb"; then
    DIRECTFB_REQUIRED_VERSION=1.0.0
@@ -25959,7 +26005,7 @@
  fi
  
  
-@@ -32022,25 +24213,14 @@
+@@ -32022,25 +24224,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -25988,7 +26034,7 @@
  
  $DIRECTFB_PKG_ERRORS
  
-@@ -32050,22 +24230,11 @@
+@@ -32050,22 +24241,11 @@
  Alternatively, you may set the environment variables DIRECTFB_CFLAGS
  and DIRECTFB_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -26014,7 +26060,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -32074,12 +24243,11 @@
+@@ -32074,12 +24254,11 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -26029,7 +26075,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -32111,24 +24279,19 @@
+@@ -32111,24 +24290,19 @@
  	PANGO_PACKAGES="pango pangocairo"
  fi
  
@@ -26058,7 +26104,7 @@
  fi
  
  CFLAGS="$CFLAGS $PANGO_CFLAGS"
-@@ -32138,11 +24301,7 @@
+@@ -32138,11 +24312,7 @@
  else
  	gtk_save_LIBS="$LIBS"
          LIBS="$PANGO_LIBS $LIBS"
@@ -26071,7 +26117,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -32160,44 +24319,15 @@
+@@ -32160,60 +24330,33 @@
    return 0;
  }
  _ACEOF
@@ -26103,11 +26149,11 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	{ { $as_echo "$as_me:$LINENO: error:
+-*** Can't link to Pango. Pango is required to build
+-*** GTK+. For more information see http://www.pango.org" >&5
+-$as_echo "$as_me: error:
 +  as_fn_error "
  *** Can't link to Pango. Pango is required to build
--*** GTK+. For more information see http://www.pango.org" >&5
--$as_echo "$as_me: error:
--*** Can't link to Pango. Pango is required to build
 -*** GTK+. For more information see http://www.pango.org" >&2;}
 -   { (exit 1); exit 1; }; }
 +*** GTK+. For more information see http://www.pango.org" "$LINENO" 5
@@ -26121,7 +26167,35 @@
          LIBS="$gtk_save_LIBS"
  fi
  
-@@ -32228,24 +24358,19 @@
+ CFLAGS="$saved_cflags"
+ LDFLAGS="$saved_ldflags"
+ 
+-GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 $X_PACKAGES cairo-$cairo_backend"
+-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
+-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
++GDK_PACKAGES="$PANGO_PACKAGES gio-2.0"
++GDK_PRIVATE_PACKAGES="$X_PACKAGES cairo-$cairo_backend"
++GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
++GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
+ #
+ # If we aren't writing explicit dependencies, then don't put the extra libraries we need
+ # into the pkg-config files
+ #
+ if test $enable_explicit_deps != yes ; then
+-  GDK_PACKAGES="$PANGO_PACKAGES"
+   GDK_EXTRA_LIBS=
++else
++  GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES"
+ fi
+ 
+ 
+@@ -32223,29 +24366,25 @@
+ 
+ 
+ 
++
+ ########################################
+ # Check for Accessibility Toolkit flags
  ########################################
  
  ATK_PACKAGES=atk
@@ -26150,7 +26224,7 @@
  fi
  
  if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then
-@@ -32253,11 +24378,7 @@
+@@ -32253,11 +24392,7 @@
  else
  	gtk_save_LIBS="$LIBS"
          LIBS="$ATK_LIBS $LIBS"
@@ -26163,7 +26237,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -32275,44 +24396,15 @@
+@@ -32275,44 +24410,15 @@
    return 0;
  }
  _ACEOF
@@ -26195,11 +26269,11 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	{ { $as_echo "$as_me:$LINENO: error:
--                *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
++  as_fn_error "
+                 *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
 -                *** to build GTK+" >&5
 -$as_echo "$as_me: error:
-+  as_fn_error "
-                 *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
+-                *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
 -                *** to build GTK+" >&2;}
 -   { (exit 1); exit 1; }; }
 +                *** to build GTK+" "$LINENO" 5
@@ -26213,7 +26287,16 @@
          LIBS="$gtk_save_LIBS"
  fi
  
-@@ -32363,17 +24455,13 @@
+@@ -32335,7 +24441,7 @@
+ CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
+ 
+ if test $enable_explicit_deps != yes ; then
+-  GDK_PIXBUF_EXTRA_LIBS=
++  GDK_PIXBUF_EXTRA_LIBS="$MATH_LIB"
+ fi
+ 
+ 
+@@ -32363,17 +24469,13 @@
  ########################
  
  old_LIBS="$LIBS"
@@ -26234,11 +26317,10 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -32396,71 +24484,40 @@
-     ac_res="none required"
+@@ -32397,70 +24499,39 @@
    else
      ac_res=-l$ac_lib
--    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 -  fi
 -  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -26261,7 +26343,6 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 +  fi
 +  if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_search_gethostent=$ac_res
@@ -26319,7 +26400,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -32485,69 +24542,38 @@
+@@ -32485,69 +24556,38 @@
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
@@ -26400,7 +26481,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -32572,161 +24598,37 @@
+@@ -32572,161 +24612,37 @@
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
@@ -26573,7 +26654,7 @@
    struct_sockaddr_un_sun_len=true
  else
    struct_sockaddr_un_suin_len=false
-@@ -32754,7 +24656,7 @@
+@@ -32754,7 +24670,7 @@
  ################################################################
  
  # Check whether --enable-cups was given.
@@ -26582,7 +26663,7 @@
    enableval=$enable_cups;
  else
    enable_cups=auto
-@@ -32773,9 +24675,9 @@
+@@ -32773,9 +24689,9 @@
  else
    # Extract the first word of "cups-config", so it can be a program name with args.
  set dummy cups-config; ac_word=$2
@@ -26594,7 +26675,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $CUPS_CONFIG in
-@@ -32788,14 +24690,14 @@
+@@ -32788,14 +24704,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -26612,7 +26693,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_CUPS_CONFIG" && ac_cv_path_CUPS_CONFIG="no"
-@@ -32804,10 +24706,10 @@
+@@ -32804,10 +24720,10 @@
  fi
  CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
  if test -n "$CUPS_CONFIG"; then
@@ -26625,23 +26706,23 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -32823,13 +24725,9 @@
+@@ -32823,13 +24739,9 @@
  fi
  
      else
 -      { { $as_echo "$as_me:$LINENO: error:
--*** cups not found.
++      as_fn_error "
+ *** cups not found.
 -" >&5
 -$as_echo "$as_me: error:
-+      as_fn_error "
- *** cups not found.
+-*** cups not found.
 -" >&2;}
 -   { (exit 1); exit 1; }; }
 +" "$LINENO" 5
      fi
    else
      CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O0-9*//' | sed 's/-m^\t*//g'`
-@@ -32842,9 +24740,7 @@
+@@ -32842,9 +24754,7 @@
      if test $CUPS_API_MAJOR -gt 1 -o \
              $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
  
@@ -26652,7 +26733,7 @@
  
      fi
  
-@@ -32853,144 +24749,11 @@
+@@ -32853,144 +24763,11 @@
  
  
  
@@ -26800,7 +26881,7 @@
  fi
  
  
-@@ -33006,11 +24769,7 @@
+@@ -33006,11 +24783,7 @@
  
      gtk_save_cflags="$CFLAGS"
      CFLAGS="$CUPS_CFLAGS"
@@ -26813,7 +26894,7 @@
  /* end confdefs.h.  */
  #include <cups/http.h>
  int
-@@ -33021,36 +24780,11 @@
+@@ -33021,36 +24794,11 @@
    return 0;
  }
  _ACEOF
@@ -26852,7 +26933,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
      CFLAGS="$gtk_save_cflags"
  
-@@ -33058,102 +24792,12 @@
+@@ -33058,102 +24806,12 @@
  
      gtk_save_libs="$LIBS"
      LIBS="$CUPS_LIBS"
@@ -26960,7 +27041,7 @@
  _ACEOF
  
  fi
-@@ -33167,7 +24811,7 @@
+@@ -33167,7 +24825,7 @@
  #
  
  # Check whether --enable-papi was given.
@@ -26969,7 +27050,7 @@
    enableval=$enable_papi;
  else
    enable_papi=auto
-@@ -33184,20 +24828,16 @@
+@@ -33184,20 +24842,16 @@
  fi
  
  else
@@ -26994,7 +27075,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -33215,43 +24855,18 @@
+@@ -33215,43 +24869,18 @@
    return 0;
  }
  _ACEOF
@@ -27044,7 +27125,7 @@
    have_papi=yes
  else
    have_papi=no
-@@ -33259,9 +24874,7 @@
+@@ -33259,9 +24888,7 @@
  
    if test $have_papi = yes; then
  
@@ -27055,23 +27136,23 @@
  
    fi
     if test $have_papi = yes; then
-@@ -33273,13 +24886,9 @@
+@@ -33273,13 +24900,9 @@
  fi
  
    if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then
 -    { { $as_echo "$as_me:$LINENO: error:
--*** papi not found.
++    as_fn_error "
+ *** papi not found.
 -" >&5
 -$as_echo "$as_me: error:
-+    as_fn_error "
- *** papi not found.
+-*** papi not found.
 -" >&2;}
 -   { (exit 1); exit 1; }; }
 +" "$LINENO" 5
    fi
  fi
  
-@@ -33295,295 +24904,25 @@
+@@ -33295,295 +24918,25 @@
  gtk_save_cppflags="$CPPFLAGS"
  CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS"
  
@@ -27213,11 +27294,11 @@
 -  :
  else
 -  { { $as_echo "$as_me:$LINENO: error:
--*** Can't find cairo-pdf.h. You must build Cairo with the pdf
++  as_fn_error "
+ *** Can't find cairo-pdf.h. You must build Cairo with the pdf
 -*** backend enabled." >&5
 -$as_echo "$as_me: error:
-+  as_fn_error "
- *** Can't find cairo-pdf.h. You must build Cairo with the pdf
+-*** Can't find cairo-pdf.h. You must build Cairo with the pdf
 -*** backend enabled." >&2;}
 -   { (exit 1); exit 1; }; }
 +*** backend enabled." "$LINENO" 5
@@ -27312,7 +27393,9 @@
 -
 -  ac_header_preproc=no
 -fi
--
++  ac_fn_c_check_header_mongrel "$LINENO" "cairo-ps.h" "ac_cv_header_cairo_ps_h" "$ac_includes_default"
++if test "x$ac_cv_header_cairo_ps_h" = x""yes; then :
+ 
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
@@ -27356,26 +27439,24 @@
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5
 -$as_echo "$ac_cv_header_cairo_ps_h" >&6; }
-+  ac_fn_c_check_header_mongrel "$LINENO" "cairo-ps.h" "ac_cv_header_cairo_ps_h" "$ac_includes_default"
-+if test "x$ac_cv_header_cairo_ps_h" = x""yes; then :
- 
+-
 -fi
 -if test "x$ac_cv_header_cairo_ps_h" = x""yes; then
 -  :
  else
 -  { { $as_echo "$as_me:$LINENO: error:
--*** Can't find cairo-ps.h. You must build Cairo with the
++  as_fn_error "
+ *** Can't find cairo-ps.h. You must build Cairo with the
 -*** postscript backend enabled." >&5
 -$as_echo "$as_me: error:
-+  as_fn_error "
- *** Can't find cairo-ps.h. You must build Cairo with the
+-*** Can't find cairo-ps.h. You must build Cairo with the
 -*** postscript backend enabled." >&2;}
 -   { (exit 1); exit 1; }; }
 +*** postscript backend enabled." "$LINENO" 5
  fi
  
  
-@@ -33593,7 +24932,7 @@
+@@ -33593,7 +24946,7 @@
  
  
  # Check whether --enable-test-print-backend was given.
@@ -27384,7 +27465,7 @@
    enableval=$enable_test_print_backend;
  else
    enable_test_print_backend=no
-@@ -33638,136 +24977,8 @@
+@@ -33638,136 +24991,8 @@
  
  
  
@@ -27522,7 +27603,7 @@
    withval=$with_html_dir;
  else
    with_html_dir='${datadir}/gtk-doc/html'
-@@ -33777,7 +24988,7 @@
+@@ -33777,7 +25002,7 @@
  
  
      # Check whether --enable-gtk-doc was given.
@@ -27531,7 +27612,7 @@
    enableval=$enable_gtk_doc;
  else
    enable_gtk_doc=no
-@@ -33786,42 +24997,66 @@
+@@ -33786,42 +25011,66 @@
  
    if test x$enable_gtk_doc = xyes; then
      if test -n "$PKG_CONFIG" && \
@@ -27622,7 +27703,7 @@
  
  
     if test x$enable_gtk_doc = xyes; then
-@@ -33832,22 +25067,6 @@
+@@ -33832,22 +25081,6 @@
    ENABLE_GTK_DOC_FALSE=
  fi
  
@@ -27645,7 +27726,7 @@
     if test -n "$LIBTOOL"; then
    GTK_DOC_USE_LIBTOOL_TRUE=
    GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -33856,21 +25075,13 @@
+@@ -33856,21 +25089,13 @@
    GTK_DOC_USE_LIBTOOL_FALSE=
  fi
  
@@ -27669,7 +27750,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DB2HTML"; then
-@@ -33881,14 +25092,14 @@
+@@ -33881,14 +25106,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -27687,7 +27768,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_prog_DB2HTML" && ac_cv_prog_DB2HTML="false"
-@@ -33896,10 +25107,10 @@
+@@ -33896,10 +25121,10 @@
  fi
  DB2HTML=$ac_cv_prog_DB2HTML
  if test -n "$DB2HTML"; then
@@ -27700,7 +27781,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -33914,7 +25125,7 @@
+@@ -33914,7 +25139,7 @@
  
  
  # Check whether --enable-man was given.
@@ -27709,7 +27790,7 @@
    enableval=$enable_man; enable_man=yes
  else
    enable_man=no
-@@ -33924,9 +25135,9 @@
+@@ -33924,9 +25149,9 @@
  if test "${enable_man}" != no; then
          # Extract the first word of "xsltproc", so it can be a program name with args.
  set dummy xsltproc; ac_word=$2
@@ -27721,7 +27802,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $XSLTPROC in
-@@ -33939,14 +25150,14 @@
+@@ -33939,14 +25164,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -27739,7 +27820,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -33954,10 +25165,10 @@
+@@ -33954,10 +25179,10 @@
  fi
  XSLTPROC=$ac_cv_path_XSLTPROC
  if test -n "$XSLTPROC"; then
@@ -27752,7 +27833,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -33970,7 +25181,7 @@
+@@ -33970,7 +25195,7 @@
    # check for the presence of the XML catalog
  
  # Check whether --with-xml-catalog was given.
@@ -27761,7 +27842,7 @@
    withval=$with_xml_catalog;
  else
    with_xml_catalog=/etc/xml/catalog
-@@ -33979,23 +25190,23 @@
+@@ -33979,23 +25204,23 @@
    jh_found_xmlcatalog=true
    XML_CATALOG_FILE="$with_xml_catalog"
  
@@ -27790,7 +27871,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $XMLCATALOG in
-@@ -34008,14 +25219,14 @@
+@@ -34008,14 +25233,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -27808,7 +27889,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no"
-@@ -34024,10 +25235,10 @@
+@@ -34024,10 +25249,10 @@
  fi
  XMLCATALOG=$ac_cv_path_XMLCATALOG
  if test -n "$XMLCATALOG"; then
@@ -27821,7 +27902,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -34043,35 +25254,35 @@
+@@ -34043,35 +25268,35 @@
    fi
  
  
@@ -27869,7 +27950,7 @@
  $as_echo "not found" >&6; }
      enable_man=no
    fi
-@@ -34125,13 +25336,13 @@
+@@ -34125,13 +25350,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -27885,7 +27966,7 @@
        esac ;;
      esac
    done
-@@ -34139,8 +25350,8 @@
+@@ -34139,8 +25364,8 @@
    (set) 2>&1 |
      case $as_nl`(ac_space=' '; set) 2>&1` in #(
      *${as_nl}ac_space=\ *)
@@ -27896,7 +27977,7 @@
        sed -n \
  	"s/'/'\\\\''/g;
  	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -34163,11 +25374,11 @@
+@@ -34163,11 +25388,11 @@
  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    if test -w "$cache_file"; then
      test "x$cache_file" != "x/dev/null" &&
@@ -27910,7 +27991,7 @@
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
-@@ -34187,8 +25398,8 @@
+@@ -34187,8 +25412,8 @@
    ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
    # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
    #    will be set to the directory where LIBOBJS objects are built.
@@ -27921,7 +28002,7 @@
  done
  LIBOBJS=$ac_libobjs
  
-@@ -34204,580 +25415,326 @@
+@@ -34204,580 +25429,330 @@
  fi
  
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -27940,6 +28021,10 @@
 -Usually this means the macro was only invoked conditionally." >&2;}
 -   { (exit 1); exit 1; }; }
 +  as_fn_error "conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
++if test -z "${ENABLE_STATIC_TRUE}" && test -z "${ENABLE_STATIC_FALSE}"; then
++  as_fn_error "conditional \"ENABLE_STATIC\" was never defined.
 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
  if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
@@ -28661,7 +28746,7 @@
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -34787,17 +25744,18 @@
+@@ -34787,17 +25762,18 @@
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
@@ -28687,7 +28772,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -34805,23 +25763,15 @@
+@@ -34805,23 +25781,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -28716,7 +28801,7 @@
  as_nl='
  '
  export as_nl
-@@ -34829,7 +25779,13 @@
+@@ -34829,7 +25797,13 @@
  as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -28731,7 +28816,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -34840,7 +25796,7 @@
+@@ -34840,7 +25814,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -28740,7 +28825,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -34863,13 +25819,6 @@
+@@ -34863,13 +25837,6 @@
    }
  fi
  
@@ -28754,7 +28839,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -34879,15 +25828,15 @@
+@@ -34879,15 +25846,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -28773,7 +28858,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -34899,12 +25848,16 @@
+@@ -34899,12 +25866,16 @@
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -28794,7 +28879,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -34916,7 +25869,89 @@
+@@ -34916,7 +25887,89 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -28885,7 +28970,7 @@
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-@@ -34930,8 +25965,12 @@
+@@ -34930,8 +25983,12 @@
    as_basename=false
  fi
  
@@ -28899,7 +28984,7 @@
  as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
-@@ -34951,76 +25990,25 @@
+@@ -34951,76 +26008,25 @@
  	  }
  	  s/.*/./; q'`
  
@@ -28987,7 +29072,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -35049,8 +26037,56 @@
+@@ -35049,8 +26055,56 @@
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
  
@@ -29045,7 +29130,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -35069,10 +26105,10 @@
+@@ -35069,10 +26123,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -29058,7 +29143,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -35087,13 +26123,19 @@
+@@ -35087,13 +26141,19 @@
  
  
  exec 6>&1
@@ -29080,7 +29165,7 @@
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -35125,13 +26167,15 @@
+@@ -35125,13 +26185,15 @@
  
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
@@ -29099,7 +29184,7 @@
    -q, --quiet, --silent
                     do not print progress messages
    -d, --debug      don't remove temporary files
-@@ -35150,16 +26194,17 @@
+@@ -35150,16 +26212,17 @@
  Configuration commands:
  $config_commands
  
@@ -29121,7 +29206,7 @@
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
-@@ -35195,6 +26240,8 @@
+@@ -35195,6 +26258,8 @@
      ac_cs_recheck=: ;;
    --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
      $as_echo "$ac_cs_version"; exit ;;
@@ -29130,7 +29215,7 @@
    --debug | --debu | --deb | --de | --d | -d )
      debug=: ;;
    --file | --fil | --fi | --f )
-@@ -35202,20 +26249,19 @@
+@@ -35202,20 +26267,19 @@
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
@@ -29155,7 +29240,7 @@
    --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -35223,11 +26269,10 @@
+@@ -35223,11 +26287,10 @@
      ac_cs_silent=: ;;
  
    # This is an error.
@@ -29170,7 +29255,7 @@
       ac_need_defaults=false ;;
  
    esac
-@@ -35742,9 +26787,7 @@
+@@ -35742,9 +26805,7 @@
      "contrib/gdk-pixbuf-xlib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/Makefile" ;;
      "contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ;;
  
@@ -29181,7 +29266,7 @@
    esac
  done
  
-@@ -35771,7 +26814,7 @@
+@@ -35771,7 +26832,7 @@
    trap 'exit_status=$?
    { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  ' 0
@@ -29190,7 +29275,7 @@
  }
  # Create a (secure) tmp directory for tmp files.
  
-@@ -35782,11 +26825,7 @@
+@@ -35782,11 +26843,7 @@
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
@@ -29203,7 +29288,7 @@
  
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
-@@ -35794,10 +26833,16 @@
+@@ -35794,10 +26851,16 @@
  if test -n "$CONFIG_FILES"; then
  
  
@@ -29222,7 +29307,7 @@
  else
    ac_cs_awk_cr=$ac_cr
  fi
-@@ -35811,24 +26856,18 @@
+@@ -35811,24 +26874,18 @@
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
  } >conf$$subs.sh ||
@@ -29250,7 +29335,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -35850,7 +26889,7 @@
+@@ -35850,7 +26907,7 @@
  t delim
  :nl
  h
@@ -29259,7 +29344,7 @@
  t more1
  s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
  p
-@@ -35864,7 +26903,7 @@
+@@ -35864,7 +26921,7 @@
  t nl
  :delim
  h
@@ -29268,7 +29353,7 @@
  t more2
  s/["\\]/\\&/g; s/^/"/; s/$/"/
  p
-@@ -35917,9 +26956,7 @@
+@@ -35917,9 +26974,7 @@
  else
    cat
  fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -29279,7 +29364,7 @@
  _ACEOF
  
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -35960,9 +26997,7 @@
+@@ -35960,9 +27015,7 @@
    if test -z "$ac_t"; then
      break
    elif $ac_last_try; then
@@ -29290,7 +29375,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -36047,9 +27082,7 @@
+@@ -36047,9 +27100,7 @@
  _ACAWK
  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -29301,7 +29386,7 @@
  fi # test -n "$CONFIG_HEADERS"
  
  
-@@ -36062,9 +27095,7 @@
+@@ -36062,9 +27113,7 @@
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -29312,7 +29397,7 @@
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -36092,12 +27123,10 @@
+@@ -36092,12 +27141,10 @@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -29327,7 +29412,7 @@
      done
  
      # Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -36108,7 +27137,7 @@
+@@ -36108,7 +27155,7 @@
  	`' by configure.'
      if test x"$ac_file" != x-; then
        configure_input="$ac_file.  $configure_input"
@@ -29336,7 +29421,7 @@
  $as_echo "$as_me: creating $ac_file" >&6;}
      fi
      # Neutralize special characters interpreted by sed in replacement strings.
-@@ -36121,9 +27150,7 @@
+@@ -36121,9 +27168,7 @@
  
      case $ac_tag in
      *:-:* | *:-) cat >"$tmp/stdin" \
@@ -29347,7 +29432,7 @@
      esac
      ;;
    esac
-@@ -36151,47 +27178,7 @@
+@@ -36151,47 +27196,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -29396,7 +29481,7 @@
    ac_builddir=.
  
  case "$ac_dir" in
-@@ -36248,7 +27235,6 @@
+@@ -36248,7 +27253,6 @@
  # If the template does not know about datarootdir, expand it.
  # FIXME: This hack should be removed a few years after 2.60.
  ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -29404,7 +29489,7 @@
  ac_sed_dataroot='
  /datarootdir/ {
    p
-@@ -36258,12 +27244,11 @@
+@@ -36258,12 +27262,11 @@
  /@docdir@/p
  /@infodir@/p
  /@localedir@/p
@@ -29419,7 +29504,7 @@
  $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -36273,7 +27258,7 @@
+@@ -36273,7 +27276,7 @@
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
@@ -29428,7 +29513,7 @@
  esac
  _ACEOF
  
-@@ -36302,14 +27287,12 @@
+@@ -36302,14 +27305,12 @@
  $ac_datarootdir_hack
  "
  eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -29445,7 +29530,7 @@
  which seems to be undefined.  Please make sure it is defined." >&5
  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  which seems to be undefined.  Please make sure it is defined." >&2;}
-@@ -36319,9 +27302,7 @@
+@@ -36319,9 +27320,7 @@
    -) cat "$tmp/out" && rm -f "$tmp/out";;
    *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    esac \
@@ -29456,7 +29541,7 @@
   ;;
    :H)
    #
-@@ -36332,25 +27313,19 @@
+@@ -36332,25 +27331,19 @@
        $as_echo "/* $configure_input  */" \
        && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
      } >"$tmp/config.h" \
@@ -29486,7 +29571,7 @@
    fi
  # Compute "$ac_file"'s index in $config_headers.
  _am_arg="$ac_file"
-@@ -36388,7 +27363,7 @@
+@@ -36388,7 +27381,7 @@
  	  s/.*/./; q'`/stamp-h$_am_stamp_count
   ;;
  
@@ -29495,7 +29580,7 @@
  $as_echo "$as_me: executing $ac_file commands" >&6;}
   ;;
    esac
-@@ -36483,47 +27458,7 @@
+@@ -36483,47 +27476,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -29544,7 +29629,7 @@
        # echo "creating $dirpart/$file"
        echo '# dummy' > "$dirpart/$file"
      done
-@@ -37386,7 +28321,7 @@
+@@ -37386,7 +28339,7 @@
  
  
  	if cmp -s $outfile gdk/gdkconfig.h; then
@@ -29553,7 +29638,7 @@
  $as_echo "$as_me: gdk/gdkconfig.h is unchanged" >&6;}
  	  rm -f $outfile
  	else
-@@ -37398,15 +28333,12 @@
+@@ -37398,15 +28351,12 @@
  done # for ac_tag
  
  
@@ -29571,7 +29656,7 @@
  
  
  # configure is writing to config.log, and then calls config.status.
-@@ -37427,10 +28359,10 @@
+@@ -37427,10 +28377,10 @@
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
@@ -29584,9 +29669,9 @@
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.18.4/contrib/gdk-pixbuf-xlib/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.18.4/contrib/gdk-pixbuf-xlib/Makefile.in
 --- gtk+2.0-2.18.4.old/contrib/gdk-pixbuf-xlib/Makefile.in	2009-12-01 05:08:43.000000000 +0100
-+++ gtk+2.0-2.18.4/contrib/gdk-pixbuf-xlib/Makefile.in	2009-12-01 08:07:57.474222066 +0100
++++ gtk+2.0-2.18.4/contrib/gdk-pixbuf-xlib/Makefile.in	2009-12-01 13:03:30.324290233 +0100
 @@ -48,7 +48,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -29596,7 +29681,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = gdk-pixbuf-xlib-2.0.pc
  CONFIG_CLEAN_VPATH_FILES =
-@@ -209,8 +209,6 @@
+@@ -197,6 +197,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -209,8 +210,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -29605,7 +29698,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -274,6 +272,7 @@
+@@ -274,6 +273,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -29613,9 +29706,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/contrib/Makefile.in gtk+2.0-2.18.4/contrib/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/contrib/Makefile.in gtk+2.0-2.18.4/contrib/Makefile.in
 --- gtk+2.0-2.18.4.old/contrib/Makefile.in	2009-12-01 05:08:42.000000000 +0100
-+++ gtk+2.0-2.18.4/contrib/Makefile.in	2009-12-01 08:07:57.374221992 +0100
++++ gtk+2.0-2.18.4/contrib/Makefile.in	2009-12-01 13:03:30.220289792 +0100
 @@ -44,7 +44,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -29625,7 +29718,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -182,8 +182,6 @@
+@@ -170,6 +170,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -182,8 +183,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -29634,7 +29735,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -247,6 +245,7 @@
+@@ -247,6 +246,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -29642,9 +29743,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/demos/gtk-demo/Makefile.in gtk+2.0-2.18.4/demos/gtk-demo/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/demos/gtk-demo/Makefile.in gtk+2.0-2.18.4/demos/gtk-demo/Makefile.in
 --- gtk+2.0-2.18.4.old/demos/gtk-demo/Makefile.in	2009-12-01 05:08:43.000000000 +0100
-+++ gtk+2.0-2.18.4/demos/gtk-demo/Makefile.in	2009-12-01 08:07:57.682221975 +0100
++++ gtk+2.0-2.18.4/demos/gtk-demo/Makefile.in	2009-12-01 13:03:30.536290618 +0100
 @@ -46,7 +46,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -29654,7 +29755,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = geninclude.pl
  CONFIG_CLEAN_VPATH_FILES =
-@@ -213,8 +213,6 @@
+@@ -201,6 +201,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -213,8 +214,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -29663,7 +29772,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -278,6 +276,7 @@
+@@ -278,6 +277,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -29671,9 +29780,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/demos/Makefile.in gtk+2.0-2.18.4/demos/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/demos/Makefile.in gtk+2.0-2.18.4/demos/Makefile.in
 --- gtk+2.0-2.18.4.old/demos/Makefile.in	2009-12-01 05:08:43.000000000 +0100
-+++ gtk+2.0-2.18.4/demos/Makefile.in	2009-12-01 08:07:57.578222510 +0100
++++ gtk+2.0-2.18.4/demos/Makefile.in	2009-12-01 13:03:30.428291169 +0100
 @@ -50,7 +50,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -29683,7 +29792,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -232,8 +232,6 @@
+@@ -220,6 +220,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -232,8 +233,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -29692,7 +29809,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -297,6 +295,7 @@
+@@ -297,6 +296,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -29700,9 +29817,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/docs/faq/Makefile.in gtk+2.0-2.18.4/docs/faq/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/docs/faq/Makefile.in gtk+2.0-2.18.4/docs/faq/Makefile.in
 --- gtk+2.0-2.18.4.old/docs/faq/Makefile.in	2009-12-01 05:08:43.000000000 +0100
-+++ gtk+2.0-2.18.4/docs/faq/Makefile.in	2009-12-01 08:07:57.834222497 +0100
++++ gtk+2.0-2.18.4/docs/faq/Makefile.in	2009-12-01 13:03:30.688289560 +0100
 @@ -43,7 +43,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -29712,7 +29829,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -141,8 +141,6 @@
+@@ -129,6 +129,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -141,8 +142,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -29721,7 +29846,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -206,6 +204,7 @@
+@@ -206,6 +205,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -29729,9 +29854,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/docs/Makefile.in gtk+2.0-2.18.4/docs/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/docs/Makefile.in gtk+2.0-2.18.4/docs/Makefile.in
 --- gtk+2.0-2.18.4.old/docs/Makefile.in	2009-12-01 05:08:43.000000000 +0100
-+++ gtk+2.0-2.18.4/docs/Makefile.in	2009-12-01 08:07:57.762222921 +0100
++++ gtk+2.0-2.18.4/docs/Makefile.in	2009-12-01 13:03:30.612289429 +0100
 @@ -43,7 +43,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -29741,7 +29866,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -181,8 +181,6 @@
+@@ -169,6 +169,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -181,8 +182,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -29750,7 +29883,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -246,6 +244,7 @@
+@@ -246,6 +245,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -29758,9 +29891,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/docs/reference/gdk/Makefile.in gtk+2.0-2.18.4/docs/reference/gdk/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/docs/reference/gdk/Makefile.in gtk+2.0-2.18.4/docs/reference/gdk/Makefile.in
 --- gtk+2.0-2.18.4.old/docs/reference/gdk/Makefile.in	2009-12-01 05:08:44.000000000 +0100
-+++ gtk+2.0-2.18.4/docs/reference/gdk/Makefile.in	2009-12-01 08:07:58.122225452 +0100
++++ gtk+2.0-2.18.4/docs/reference/gdk/Makefile.in	2009-12-01 13:03:30.960289614 +0100
 @@ -50,7 +50,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -29770,7 +29903,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = version.xml
  CONFIG_CLEAN_VPATH_FILES =
-@@ -148,8 +148,6 @@
+@@ -136,6 +136,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -148,8 +149,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -29779,7 +29920,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -213,6 +211,7 @@
+@@ -213,6 +212,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -29787,7 +29928,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -480,10 +479,10 @@
+@@ -480,10 +480,10 @@
  	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
  
  @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -29801,7 +29942,7 @@
  @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
  
  # We set GPATH here; this gives us semantics for GNU make
-@@ -494,9 +493,7 @@
+@@ -494,9 +494,7 @@
  GPATH = $(srcdir)
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
  DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
@@ -29812,7 +29953,7 @@
  
  SCANOBJ_FILES = \
  	$(DOC_MODULE).args 	 \
-@@ -511,10 +508,6 @@
+@@ -511,10 +509,6 @@
  	$(DOC_MODULE)-unused.txt
  
  CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
@@ -29823,7 +29964,7 @@
  all: all-am
  
  .SUFFIXES:
-@@ -764,10 +757,10 @@
+@@ -764,10 +758,10 @@
  # run make test as part of make check
  check-local: test
  
@@ -29836,7 +29977,7 @@
  
  $(REPORT_FILES): sgml-build.stamp
  
-@@ -776,9 +769,9 @@
+@@ -776,9 +770,9 @@
  scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
  	@echo 'gtk-doc: Scanning header files'
  	@-chmod -R u+w $(srcdir)
@@ -29848,7 +29989,7 @@
  	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
  	else \
  	    cd $(srcdir) ; \
-@@ -786,7 +779,7 @@
+@@ -786,7 +780,7 @@
                 test -f $$i || touch $$i ; \
  	    done \
  	fi
@@ -29857,7 +29998,7 @@
  
  $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
  	@true
-@@ -796,23 +789,23 @@
+@@ -796,23 +790,23 @@
  tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
  	@echo 'gtk-doc: Rebuilding template files'
  	@-chmod -R u+w $(srcdir)
@@ -29887,7 +30028,7 @@
  
  sgml.stamp: sgml-build.stamp
  	@true
-@@ -822,37 +815,18 @@
+@@ -822,37 +816,18 @@
  html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
  	@echo 'gtk-doc: Building HTML'
  	@-chmod -R u+w $(srcdir)
@@ -29933,7 +30074,7 @@
  
  ##############
  
-@@ -862,14 +836,14 @@
+@@ -862,14 +837,14 @@
  
  distclean-local:
  	cd $(srcdir) && \
@@ -29950,7 +30091,7 @@
  	if test "$$installfiles" = '$(srcdir)/html/*'; \
  	then echo '-- Nothing to install' ; \
  	else \
-@@ -889,11 +863,12 @@
+@@ -889,11 +864,12 @@
  	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
  	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
  	  fi; \
@@ -29965,7 +30106,7 @@
  	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
  	else \
  	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -910,14 +885,16 @@
+@@ -910,14 +886,16 @@
  
  dist-hook: dist-check-gtkdoc dist-hook-local
  	mkdir $(distdir)/tmpl
@@ -29984,9 +30125,9 @@
  
  .PHONY : dist-hook-local docs
  
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.18.4/docs/reference/gdk-pixbuf/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.18.4/docs/reference/gdk-pixbuf/Makefile.in
 --- gtk+2.0-2.18.4.old/docs/reference/gdk-pixbuf/Makefile.in	2009-12-01 05:08:43.000000000 +0100
-+++ gtk+2.0-2.18.4/docs/reference/gdk-pixbuf/Makefile.in	2009-12-01 08:07:58.026223228 +0100
++++ gtk+2.0-2.18.4/docs/reference/gdk-pixbuf/Makefile.in	2009-12-01 13:03:30.864289185 +0100
 @@ -50,7 +50,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -29996,7 +30137,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = version.xml
  CONFIG_CLEAN_VPATH_FILES =
-@@ -173,8 +173,6 @@
+@@ -161,6 +161,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -173,8 +174,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -30005,7 +30154,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -238,6 +236,7 @@
+@@ -238,6 +237,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30013,7 +30162,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -423,10 +422,10 @@
+@@ -423,10 +423,10 @@
  	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib
  
  @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -30027,7 +30176,7 @@
  @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
  
  # We set GPATH here; this gives us semantics for GNU make
-@@ -437,9 +436,7 @@
+@@ -437,9 +437,7 @@
  GPATH = $(srcdir)
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
  DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
@@ -30038,7 +30187,7 @@
  
  SCANOBJ_FILES = \
  	$(DOC_MODULE).args 	 \
-@@ -454,10 +451,6 @@
+@@ -454,10 +452,6 @@
  	$(DOC_MODULE)-unused.txt
  
  CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
@@ -30049,7 +30198,7 @@
  
  ########################################################################
  @ENABLE_MAN_TRUE at man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 
-@@ -767,10 +760,10 @@
+@@ -767,10 +761,10 @@
  # run make test as part of make check
  check-local: test
  
@@ -30062,7 +30211,7 @@
  
  $(REPORT_FILES): sgml-build.stamp
  
-@@ -779,9 +772,9 @@
+@@ -779,9 +773,9 @@
  scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
  	@echo 'gtk-doc: Scanning header files'
  	@-chmod -R u+w $(srcdir)
@@ -30074,7 +30223,7 @@
  	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
  	else \
  	    cd $(srcdir) ; \
-@@ -789,7 +782,7 @@
+@@ -789,7 +783,7 @@
                 test -f $$i || touch $$i ; \
  	    done \
  	fi
@@ -30083,7 +30232,7 @@
  
  $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
  	@true
-@@ -799,23 +792,23 @@
+@@ -799,23 +793,23 @@
  tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
  	@echo 'gtk-doc: Rebuilding template files'
  	@-chmod -R u+w $(srcdir)
@@ -30113,7 +30262,7 @@
  
  sgml.stamp: sgml-build.stamp
  	@true
-@@ -825,37 +818,18 @@
+@@ -825,37 +819,18 @@
  html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
  	@echo 'gtk-doc: Building HTML'
  	@-chmod -R u+w $(srcdir)
@@ -30159,7 +30308,7 @@
  
  ##############
  
-@@ -865,14 +839,14 @@
+@@ -865,14 +840,14 @@
  
  distclean-local:
  	cd $(srcdir) && \
@@ -30176,7 +30325,7 @@
  	if test "$$installfiles" = '$(srcdir)/html/*'; \
  	then echo '-- Nothing to install' ; \
  	else \
-@@ -892,11 +866,12 @@
+@@ -892,11 +867,12 @@
  	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
  	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
  	  fi; \
@@ -30191,7 +30340,7 @@
  	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
  	else \
  	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -913,14 +888,16 @@
+@@ -913,14 +889,16 @@
  
  dist-hook: dist-check-gtkdoc dist-hook-local
  	mkdir $(distdir)/tmpl
@@ -30210,9 +30359,9 @@
  
  .PHONY : dist-hook-local docs
  
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.4/docs/reference/gtk/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.4/docs/reference/gtk/Makefile.in
 --- gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in	2009-12-01 05:08:44.000000000 +0100
-+++ gtk+2.0-2.18.4/docs/reference/gtk/Makefile.in	2009-12-01 08:07:58.238223224 +0100
++++ gtk+2.0-2.18.4/docs/reference/gtk/Makefile.in	2009-12-01 13:03:31.084290006 +0100
 @@ -50,7 +50,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30222,7 +30371,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = version.xml
  CONFIG_CLEAN_VPATH_FILES =
-@@ -173,8 +173,6 @@
+@@ -161,6 +161,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -173,8 +174,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -30231,7 +30388,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -238,6 +236,7 @@
+@@ -238,6 +237,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30239,7 +30396,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -713,10 +712,10 @@
+@@ -713,10 +713,10 @@
  	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
  
  @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -30253,7 +30410,7 @@
  @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
  
  # We set GPATH here; this gives us semantics for GNU make
-@@ -727,9 +726,7 @@
+@@ -727,9 +727,7 @@
  GPATH = $(srcdir)
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
  DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
@@ -30264,7 +30421,7 @@
  
  SCANOBJ_FILES = \
  	$(DOC_MODULE).args 	 \
-@@ -744,10 +741,6 @@
+@@ -744,10 +742,6 @@
  	$(DOC_MODULE)-unused.txt
  
  CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
@@ -30275,7 +30432,7 @@
  
  ########################################################################
  @ENABLE_MAN_TRUE at man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
-@@ -1057,10 +1050,10 @@
+@@ -1057,10 +1051,10 @@
  # run make test as part of make check
  check-local: test
  
@@ -30288,7 +30445,7 @@
  
  $(REPORT_FILES): sgml-build.stamp
  
-@@ -1069,9 +1062,9 @@
+@@ -1069,9 +1063,9 @@
  scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
  	@echo 'gtk-doc: Scanning header files'
  	@-chmod -R u+w $(srcdir)
@@ -30300,7 +30457,7 @@
  	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
  	else \
  	    cd $(srcdir) ; \
-@@ -1079,7 +1072,7 @@
+@@ -1079,7 +1073,7 @@
                 test -f $$i || touch $$i ; \
  	    done \
  	fi
@@ -30309,7 +30466,7 @@
  
  $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
  	@true
-@@ -1089,23 +1082,23 @@
+@@ -1089,23 +1083,23 @@
  tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
  	@echo 'gtk-doc: Rebuilding template files'
  	@-chmod -R u+w $(srcdir)
@@ -30339,7 +30496,7 @@
  
  sgml.stamp: sgml-build.stamp
  	@true
-@@ -1115,37 +1108,18 @@
+@@ -1115,37 +1109,18 @@
  html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
  	@echo 'gtk-doc: Building HTML'
  	@-chmod -R u+w $(srcdir)
@@ -30385,7 +30542,7 @@
  
  ##############
  
-@@ -1155,14 +1129,14 @@
+@@ -1155,14 +1130,14 @@
  
  distclean-local:
  	cd $(srcdir) && \
@@ -30402,7 +30559,7 @@
  	if test "$$installfiles" = '$(srcdir)/html/*'; \
  	then echo '-- Nothing to install' ; \
  	else \
-@@ -1182,11 +1156,12 @@
+@@ -1182,11 +1157,12 @@
  	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
  	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
  	  fi; \
@@ -30417,7 +30574,7 @@
  	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
  	else \
  	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -1203,14 +1178,16 @@
+@@ -1203,14 +1179,16 @@
  
  dist-hook: dist-check-gtkdoc dist-hook-local
  	mkdir $(distdir)/tmpl
@@ -30436,9 +30593,9 @@
  
  .PHONY : dist-hook-local docs
  
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.18.4/docs/reference/libgail-util/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.18.4/docs/reference/libgail-util/Makefile.in
 --- gtk+2.0-2.18.4.old/docs/reference/libgail-util/Makefile.in	2009-12-01 05:08:44.000000000 +0100
-+++ gtk+2.0-2.18.4/docs/reference/libgail-util/Makefile.in	2009-12-01 08:07:58.326222249 +0100
++++ gtk+2.0-2.18.4/docs/reference/libgail-util/Makefile.in	2009-12-01 13:03:31.176289476 +0100
 @@ -49,7 +49,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30448,7 +30605,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -147,8 +147,6 @@
+@@ -135,6 +135,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -147,8 +148,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -30457,7 +30622,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -212,6 +210,7 @@
+@@ -212,6 +211,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30465,7 +30630,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -360,10 +359,10 @@
+@@ -360,10 +360,10 @@
  content_files = 
  HTML_IMAGES = 
  @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -30479,7 +30644,7 @@
  @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
  
  # We set GPATH here; this gives us semantics for GNU make
-@@ -374,9 +373,7 @@
+@@ -374,9 +374,7 @@
  GPATH = $(srcdir)
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
  DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
@@ -30490,7 +30655,7 @@
  
  SCANOBJ_FILES = \
  	$(DOC_MODULE).args 	 \
-@@ -391,10 +388,6 @@
+@@ -391,10 +389,6 @@
  	$(DOC_MODULE)-unused.txt
  
  CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
@@ -30501,7 +30666,7 @@
  all: all-am
  
  .SUFFIXES:
-@@ -642,10 +635,10 @@
+@@ -642,10 +636,10 @@
  # run make test as part of make check
  check-local: test
  
@@ -30514,7 +30679,7 @@
  
  $(REPORT_FILES): sgml-build.stamp
  
-@@ -654,9 +647,9 @@
+@@ -654,9 +648,9 @@
  scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
  	@echo 'gtk-doc: Scanning header files'
  	@-chmod -R u+w $(srcdir)
@@ -30526,7 +30691,7 @@
  	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
  	else \
  	    cd $(srcdir) ; \
-@@ -664,7 +657,7 @@
+@@ -664,7 +658,7 @@
                 test -f $$i || touch $$i ; \
  	    done \
  	fi
@@ -30535,7 +30700,7 @@
  
  $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
  	@true
-@@ -674,23 +667,23 @@
+@@ -674,23 +668,23 @@
  tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
  	@echo 'gtk-doc: Rebuilding template files'
  	@-chmod -R u+w $(srcdir)
@@ -30565,7 +30730,7 @@
  
  sgml.stamp: sgml-build.stamp
  	@true
-@@ -700,37 +693,18 @@
+@@ -700,37 +694,18 @@
  html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
  	@echo 'gtk-doc: Building HTML'
  	@-chmod -R u+w $(srcdir)
@@ -30611,7 +30776,7 @@
  
  ##############
  
-@@ -740,14 +714,14 @@
+@@ -740,14 +715,14 @@
  
  distclean-local:
  	cd $(srcdir) && \
@@ -30628,7 +30793,7 @@
  	if test "$$installfiles" = '$(srcdir)/html/*'; \
  	then echo '-- Nothing to install' ; \
  	else \
-@@ -767,11 +741,12 @@
+@@ -767,11 +742,12 @@
  	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
  	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
  	  fi; \
@@ -30643,7 +30808,7 @@
  	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
  	else \
  	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -788,14 +763,16 @@
+@@ -788,14 +764,16 @@
  
  dist-hook: dist-check-gtkdoc dist-hook-local
  	mkdir $(distdir)/tmpl
@@ -30662,9 +30827,9 @@
  
  .PHONY : dist-hook-local docs
  
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/docs/reference/Makefile.in gtk+2.0-2.18.4/docs/reference/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/docs/reference/Makefile.in gtk+2.0-2.18.4/docs/reference/Makefile.in
 --- gtk+2.0-2.18.4.old/docs/reference/Makefile.in	2009-12-01 05:08:43.000000000 +0100
-+++ gtk+2.0-2.18.4/docs/reference/Makefile.in	2009-12-01 08:07:57.918222907 +0100
++++ gtk+2.0-2.18.4/docs/reference/Makefile.in	2009-12-01 13:03:30.768289524 +0100
 @@ -43,7 +43,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30674,7 +30839,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -181,8 +181,6 @@
+@@ -169,6 +169,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -181,8 +182,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -30683,7 +30856,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -246,6 +244,7 @@
+@@ -246,6 +245,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30691,9 +30864,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/docs/tools/Makefile.in gtk+2.0-2.18.4/docs/tools/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/docs/tools/Makefile.in gtk+2.0-2.18.4/docs/tools/Makefile.in
 --- gtk+2.0-2.18.4.old/docs/tools/Makefile.in	2009-12-01 05:08:44.000000000 +0100
-+++ gtk+2.0-2.18.4/docs/tools/Makefile.in	2009-12-01 08:07:58.430221988 +0100
++++ gtk+2.0-2.18.4/docs/tools/Makefile.in	2009-12-01 13:03:31.272289335 +0100
 @@ -45,7 +45,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30703,7 +30876,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -176,8 +176,6 @@
+@@ -164,6 +164,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -176,8 +177,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -30712,7 +30893,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -241,6 +239,7 @@
+@@ -241,6 +240,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30720,9 +30901,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/docs/tutorial/Makefile.in gtk+2.0-2.18.4/docs/tutorial/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/docs/tutorial/Makefile.in gtk+2.0-2.18.4/docs/tutorial/Makefile.in
 --- gtk+2.0-2.18.4.old/docs/tutorial/Makefile.in	2009-12-01 05:08:44.000000000 +0100
-+++ gtk+2.0-2.18.4/docs/tutorial/Makefile.in	2009-12-01 08:07:58.506222502 +0100
++++ gtk+2.0-2.18.4/docs/tutorial/Makefile.in	2009-12-01 13:03:31.360290164 +0100
 @@ -43,7 +43,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30732,7 +30913,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -141,8 +141,6 @@
+@@ -129,6 +129,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -141,8 +142,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -30741,7 +30930,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -206,6 +204,7 @@
+@@ -206,6 +205,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30749,9 +30938,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/gdk/directfb/Makefile.in gtk+2.0-2.18.4/gdk/directfb/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/gdk/directfb/Makefile.in gtk+2.0-2.18.4/gdk/directfb/Makefile.in
 --- gtk+2.0-2.18.4.old/gdk/directfb/Makefile.in	2009-12-01 05:08:45.000000000 +0100
-+++ gtk+2.0-2.18.4/gdk/directfb/Makefile.in	2009-12-01 08:07:59.226223027 +0100
++++ gtk+2.0-2.18.4/gdk/directfb/Makefile.in	2009-12-01 13:03:32.032291621 +0100
 @@ -45,7 +45,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30761,7 +30950,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -205,8 +205,6 @@
+@@ -193,6 +193,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -205,8 +206,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -30770,7 +30967,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -270,6 +268,7 @@
+@@ -270,6 +269,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30778,9 +30975,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/gdk/Makefile.in gtk+2.0-2.18.4/gdk/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/gdk/Makefile.in gtk+2.0-2.18.4/gdk/Makefile.in
 --- gtk+2.0-2.18.4.old/gdk/Makefile.in	2009-12-01 05:08:45.000000000 +0100
-+++ gtk+2.0-2.18.4/gdk/Makefile.in	2009-12-01 08:07:59.126222608 +0100
++++ gtk+2.0-2.18.4/gdk/Makefile.in	2009-12-01 13:03:31.928289354 +0100
 @@ -46,7 +46,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30790,7 +30987,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -327,8 +327,6 @@
+@@ -315,6 +315,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -327,8 +328,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -30799,7 +31004,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -392,6 +390,7 @@
+@@ -392,6 +391,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30807,9 +31012,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/gdk/quartz/Makefile.in gtk+2.0-2.18.4/gdk/quartz/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/gdk/quartz/Makefile.in gtk+2.0-2.18.4/gdk/quartz/Makefile.in
 --- gtk+2.0-2.18.4.old/gdk/quartz/Makefile.in	2009-12-01 05:08:45.000000000 +0100
-+++ gtk+2.0-2.18.4/gdk/quartz/Makefile.in	2009-12-01 08:07:59.326223017 +0100
++++ gtk+2.0-2.18.4/gdk/quartz/Makefile.in	2009-12-01 13:03:32.136289691 +0100
 @@ -45,7 +45,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30819,7 +31024,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -204,8 +204,6 @@
+@@ -192,6 +192,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -204,8 +205,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -30828,7 +31041,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -269,6 +267,7 @@
+@@ -269,6 +268,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30836,9 +31049,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/gdk/tests/Makefile.in gtk+2.0-2.18.4/gdk/tests/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/gdk/tests/Makefile.in gtk+2.0-2.18.4/gdk/tests/Makefile.in
 --- gtk+2.0-2.18.4.old/gdk/tests/Makefile.in	2009-12-01 05:08:45.000000000 +0100
-+++ gtk+2.0-2.18.4/gdk/tests/Makefile.in	2009-12-01 08:07:59.406222498 +0100
++++ gtk+2.0-2.18.4/gdk/tests/Makefile.in	2009-12-01 13:03:32.216291330 +0100
 @@ -45,7 +45,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30848,7 +31061,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -146,8 +146,6 @@
+@@ -134,6 +134,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -146,8 +147,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -30857,7 +31078,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -211,6 +209,7 @@
+@@ -211,6 +210,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30865,9 +31086,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/gdk/win32/Makefile.in gtk+2.0-2.18.4/gdk/win32/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/gdk/win32/Makefile.in gtk+2.0-2.18.4/gdk/win32/Makefile.in
 --- gtk+2.0-2.18.4.old/gdk/win32/Makefile.in	2009-12-01 05:08:45.000000000 +0100
-+++ gtk+2.0-2.18.4/gdk/win32/Makefile.in	2009-12-01 08:07:59.526222251 +0100
++++ gtk+2.0-2.18.4/gdk/win32/Makefile.in	2009-12-01 13:03:32.332289460 +0100
 @@ -45,7 +45,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30877,7 +31098,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -242,8 +242,6 @@
+@@ -230,6 +230,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -242,8 +243,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -30886,7 +31115,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -307,6 +305,7 @@
+@@ -307,6 +306,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30894,9 +31123,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/gdk/win32/rc/Makefile.in gtk+2.0-2.18.4/gdk/win32/rc/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/gdk/win32/rc/Makefile.in gtk+2.0-2.18.4/gdk/win32/rc/Makefile.in
 --- gtk+2.0-2.18.4.old/gdk/win32/rc/Makefile.in	2009-12-01 05:08:45.000000000 +0100
-+++ gtk+2.0-2.18.4/gdk/win32/rc/Makefile.in	2009-12-01 08:07:59.606222370 +0100
++++ gtk+2.0-2.18.4/gdk/win32/rc/Makefile.in	2009-12-01 13:03:32.408290995 +0100
 @@ -44,7 +44,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30906,7 +31135,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = gdk.rc
  CONFIG_CLEAN_VPATH_FILES =
-@@ -143,8 +143,6 @@
+@@ -131,6 +131,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -143,8 +144,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -30915,7 +31152,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -208,6 +206,7 @@
+@@ -208,6 +207,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30923,9 +31160,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/gdk/x11/Makefile.in gtk+2.0-2.18.4/gdk/x11/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/gdk/x11/Makefile.in gtk+2.0-2.18.4/gdk/x11/Makefile.in
 --- gtk+2.0-2.18.4.old/gdk/x11/Makefile.in	2009-12-01 05:08:45.000000000 +0100
-+++ gtk+2.0-2.18.4/gdk/x11/Makefile.in	2009-12-01 08:07:59.718223547 +0100
++++ gtk+2.0-2.18.4/gdk/x11/Makefile.in	2009-12-01 13:03:32.520291185 +0100
 @@ -50,7 +50,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30935,7 +31172,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -234,8 +234,6 @@
+@@ -222,6 +222,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -234,8 +235,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -30944,7 +31189,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -299,6 +297,7 @@
+@@ -299,6 +298,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30952,9 +31197,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/gdk-pixbuf/Makefile.in gtk+2.0-2.18.4/gdk-pixbuf/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/gdk-pixbuf/Makefile.in gtk+2.0-2.18.4/gdk-pixbuf/Makefile.in
 --- gtk+2.0-2.18.4.old/gdk-pixbuf/Makefile.in	2009-12-01 05:08:44.000000000 +0100
-+++ gtk+2.0-2.18.4/gdk-pixbuf/Makefile.in	2009-12-01 08:07:58.850223412 +0100
++++ gtk+2.0-2.18.4/gdk-pixbuf/Makefile.in	2009-12-01 13:03:31.648289566 +0100
 @@ -52,7 +52,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30964,7 +31209,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = gdk_pixbuf.rc gdk-pixbuf-features.h
  CONFIG_CLEAN_VPATH_FILES =
-@@ -764,8 +764,6 @@
+@@ -752,6 +752,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -764,8 +765,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -30973,7 +31226,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -829,6 +827,7 @@
+@@ -829,6 +828,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30981,9 +31234,26 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.18.4/gdk-pixbuf/pixops/Makefile.in
+@@ -961,6 +961,7 @@
+ 	libgdk_pixbuf-2.0.la
+ 
+ loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
++loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d
+ module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
+ 
+ #
+@@ -1320,7 +1321,7 @@
+ 	$(GDK_PIXBUF_DEP_CFLAGS)		\
+ 	-DGDK_PIXBUF_ENABLE_BACKEND
+ 
+-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
++AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
+ LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
+ test_gdk_pixbuf_LDADD = $(LDADDS)
+ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
+diff -Naur gtk+2.0-2.18.4.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.18.4/gdk-pixbuf/pixops/Makefile.in
 --- gtk+2.0-2.18.4.old/gdk-pixbuf/pixops/Makefile.in	2009-12-01 05:08:44.000000000 +0100
-+++ gtk+2.0-2.18.4/gdk-pixbuf/pixops/Makefile.in	2009-12-01 08:07:58.970222116 +0100
++++ gtk+2.0-2.18.4/gdk-pixbuf/pixops/Makefile.in	2009-12-01 13:03:31.776289285 +0100
 @@ -46,7 +46,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30993,7 +31263,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -194,8 +194,6 @@
+@@ -182,6 +182,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -194,8 +195,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31002,7 +31280,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -259,6 +257,7 @@
+@@ -259,6 +258,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31010,9 +31288,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/gtk/Makefile.in gtk+2.0-2.18.4/gtk/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/gtk/Makefile.in gtk+2.0-2.18.4/gtk/Makefile.in
 --- gtk+2.0-2.18.4.old/gtk/Makefile.in	2009-12-01 05:08:46.000000000 +0100
-+++ gtk+2.0-2.18.4/gtk/Makefile.in	2009-12-01 08:08:00.110223155 +0100
++++ gtk+2.0-2.18.4/gtk/Makefile.in	2009-12-01 13:03:32.860289675 +0100
 @@ -79,7 +79,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31022,7 +31300,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc
  CONFIG_CLEAN_VPATH_FILES =
-@@ -739,8 +739,6 @@
+@@ -727,6 +727,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -739,8 +740,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31031,7 +31317,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -804,6 +802,7 @@
+@@ -804,6 +803,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31039,9 +31325,48 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/gtk/tests/Makefile.in gtk+2.0-2.18.4/gtk/tests/Makefile.in
+@@ -957,6 +957,8 @@
+ 	-I$(top_srcdir)/gdk				\
+ 	-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf	\
+ 	-DGDK_DISABLE_DEPRECATED			\
++	-DMAEMO_CHANGES					\
++	-DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED		\
+ 	-DGTK_DISABLE_DEPRECATED			\
+ 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
+ 	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
+@@ -1068,17 +1070,21 @@
+ # Installed header files without compatibility guarantees
+ # that are not included in gtk/gtk.h
+ gtk_semi_private_h_sources = \
+-	gtktextlayout.h
++	gtktextlayout.h         \
++	gtkfilesystem.h		\
++	gtkfilesystemmodel.h	\
++	gtkfilechooserprivate.h	\
++	gtkfilechooserutils.h	\
++	gtkquery.h		\
++	gtksearchengine.h
+ 
+ 
+ # GTK+ header files that don't get installed
+-gtk_private_h_sources = gtkquery.h gtksearchengine.h \
+-	gtksearchenginesimple.h gtkdndcursors.h gtkentryprivate.h \
+-	gtkbuilderprivate.h gtkcustompaperunixdialog.h \
+-	gtkfilechooserdefault.h gtkfilechooserembed.h \
+-	gtkfilechooserentry.h gtkfilechooserprivate.h \
+-	gtkfilechoosersettings.h gtkfilechooserutils.h gtkfilesystem.h \
+-	gtkfilesystemmodel.h gtkiconcache.h gtkintl.h gtkkeyhash.h \
++gtk_private_h_sources = gtksearchenginesimple.h gtkdndcursors.h \
++	gtkentryprivate.h gtkbuilderprivate.h \
++	gtkcustompaperunixdialog.h gtkfilechooserdefault.h \
++	gtkfilechooserembed.h gtkfilechooserentry.h \
++	gtkfilechoosersettings.h gtkiconcache.h gtkintl.h gtkkeyhash.h \
+ 	gtkmnemonichash.h gtkmountoperationprivate.h gtkpathbar.h \
+ 	gtkplugprivate.h gtkprintoperation-private.h gtkprintutils.h \
+ 	gtkrbtree.h gtkrecentchooserdefault.h \
+diff -Naur gtk+2.0-2.18.4.old/gtk/tests/Makefile.in gtk+2.0-2.18.4/gtk/tests/Makefile.in
 --- gtk+2.0-2.18.4.old/gtk/tests/Makefile.in	2009-12-01 05:08:46.000000000 +0100
-+++ gtk+2.0-2.18.4/gtk/tests/Makefile.in	2009-12-01 08:08:00.234222226 +0100
++++ gtk+2.0-2.18.4/gtk/tests/Makefile.in	2009-12-01 13:03:32.984291392 +0100
 @@ -46,7 +46,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31051,7 +31376,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -228,8 +228,6 @@
+@@ -216,6 +216,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -228,8 +229,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31060,7 +31393,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -293,6 +291,7 @@
+@@ -293,6 +292,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31068,9 +31401,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/gtk/theme-bits/Makefile.in gtk+2.0-2.18.4/gtk/theme-bits/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/gtk/theme-bits/Makefile.in gtk+2.0-2.18.4/gtk/theme-bits/Makefile.in
 --- gtk+2.0-2.18.4.old/gtk/theme-bits/Makefile.in	2009-12-01 05:08:46.000000000 +0100
-+++ gtk+2.0-2.18.4/gtk/theme-bits/Makefile.in	2009-12-01 08:08:00.342222535 +0100
++++ gtk+2.0-2.18.4/gtk/theme-bits/Makefile.in	2009-12-01 13:03:33.096288997 +0100
 @@ -45,7 +45,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31080,7 +31413,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -172,8 +172,6 @@
+@@ -160,6 +160,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -172,8 +173,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31089,7 +31430,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -237,6 +235,7 @@
+@@ -237,6 +236,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31097,9 +31438,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/gtk-doc.make gtk+2.0-2.18.4/gtk-doc.make
+diff -Naur gtk+2.0-2.18.4.old/gtk-doc.make gtk+2.0-2.18.4/gtk-doc.make
 --- gtk+2.0-2.18.4.old/gtk-doc.make	2009-11-30 05:33:42.000000000 +0100
-+++ gtk+2.0-2.18.4/gtk-doc.make	2009-12-01 08:07:51.083047148 +0100
++++ gtk+2.0-2.18.4/gtk-doc.make	2009-12-01 13:03:24.383319469 +0100
 @@ -5,13 +5,13 @@
  ####################################
  
@@ -31302,9 +31643,9 @@
 +	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
  
  .PHONY : dist-hook-local docs
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/ltmain.sh gtk+2.0-2.18.4/ltmain.sh
+diff -Naur gtk+2.0-2.18.4.old/ltmain.sh gtk+2.0-2.18.4/ltmain.sh
 --- gtk+2.0-2.18.4.old/ltmain.sh	2009-10-19 14:18:27.000000000 +0200
-+++ gtk+2.0-2.18.4/ltmain.sh	2009-12-01 08:07:50.410256739 +0100
++++ gtk+2.0-2.18.4/ltmain.sh	2009-12-01 13:03:23.884291336 +0100
 @@ -65,7 +65,7 @@
  #       compiler:		$LTCC
  #       compiler flags:		$LTCFLAGS
@@ -31383,9 +31724,9 @@
  	  esac
  	  ;;
  	no)
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/m4macros/Makefile.in gtk+2.0-2.18.4/m4macros/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/m4macros/Makefile.in gtk+2.0-2.18.4/m4macros/Makefile.in
 --- gtk+2.0-2.18.4.old/m4macros/Makefile.in	2009-12-01 05:08:46.000000000 +0100
-+++ gtk+2.0-2.18.4/m4macros/Makefile.in	2009-12-01 08:08:00.422222229 +0100
++++ gtk+2.0-2.18.4/m4macros/Makefile.in	2009-12-01 13:03:33.176291197 +0100
 @@ -44,7 +44,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31395,7 +31736,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -165,8 +165,6 @@
+@@ -153,6 +153,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -165,8 +166,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31404,7 +31753,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -230,6 +228,7 @@
+@@ -230,6 +229,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31412,9 +31761,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/Makefile.in gtk+2.0-2.18.4/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/Makefile.in gtk+2.0-2.18.4/Makefile.in
 --- gtk+2.0-2.18.4.old/Makefile.in	2009-12-01 05:08:49.000000000 +0100
-+++ gtk+2.0-2.18.4/Makefile.in	2009-12-01 08:08:06.174223121 +0100
++++ gtk+2.0-2.18.4/Makefile.in	2009-12-01 13:03:35.660290348 +0100
 @@ -47,7 +47,7 @@
  	$(srcdir)/gtk+-unix-print-2.0.pc.in $(srcdir)/gtk-zip.sh.in \
  	$(top_srcdir)/Makefile.decl $(top_srcdir)/configure AUTHORS \
@@ -31433,7 +31782,25 @@
  CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES = config.h.win32 gtk-zip.sh gdk-pixbuf-2.0.pc \
  	gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gail.pc \
-@@ -231,8 +231,6 @@
+@@ -109,7 +109,8 @@
+ 	distdir dist dist-all distcheck
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
++DIST_SUBDIRS = po po-properties gdk-pixbuf gdk gtk modules demos tests \
++	perf contrib docs m4macros
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -219,6 +220,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -231,8 +233,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31442,7 +31809,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -296,6 +294,7 @@
+@@ -296,6 +296,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31450,9 +31817,21 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/mkinstalldirs gtk+2.0-2.18.4/mkinstalldirs
+@@ -466,7 +467,10 @@
+ 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ 	&& DISPLAY=:$$XID && export DISPLAY
+ 
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
++
++# don't build perf measurement tools in static builds
++ at ENABLE_STATIC_FALSE@MAYBE_PERF = perf
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests $(MAYBE_PERF) contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+ 
+ # require automake 1.4
+diff -Naur gtk+2.0-2.18.4.old/mkinstalldirs gtk+2.0-2.18.4/mkinstalldirs
 --- gtk+2.0-2.18.4.old/mkinstalldirs	1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.18.4/mkinstalldirs	2009-12-01 08:08:06.102252029 +0100
++++ gtk+2.0-2.18.4/mkinstalldirs	2009-12-01 13:03:35.596318408 +0100
 @@ -0,0 +1,162 @@
 +#! /bin/sh
 +# mkinstalldirs --- make directory hierarchy
@@ -31616,9 +31995,9 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
 +# End:
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/engines/Makefile.in gtk+2.0-2.18.4/modules/engines/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/engines/Makefile.in gtk+2.0-2.18.4/modules/engines/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/engines/Makefile.in	2009-12-01 05:08:46.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/engines/Makefile.in	2009-12-01 08:08:00.578222161 +0100
++++ gtk+2.0-2.18.4/modules/engines/Makefile.in	2009-12-01 13:03:33.336291133 +0100
 @@ -43,7 +43,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31628,7 +32007,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -181,8 +181,6 @@
+@@ -169,6 +169,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -181,8 +182,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31637,7 +32024,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -246,6 +244,7 @@
+@@ -246,6 +245,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31645,9 +32032,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.18.4/modules/engines/ms-windows/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.18.4/modules/engines/ms-windows/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/engines/ms-windows/Makefile.in	2009-12-01 05:08:46.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/engines/ms-windows/Makefile.in	2009-12-01 08:08:00.678222095 +0100
++++ gtk+2.0-2.18.4/modules/engines/ms-windows/Makefile.in	2009-12-01 13:03:33.436289511 +0100
 @@ -44,7 +44,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31657,7 +32044,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -239,8 +239,6 @@
+@@ -227,6 +227,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -239,8 +240,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31666,7 +32061,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -304,6 +302,7 @@
+@@ -304,6 +303,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31674,9 +32069,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.18.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.18.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2009-12-01 05:08:47.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2009-12-01 08:08:03.903222733 +0100
++++ gtk+2.0-2.18.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2009-12-01 13:03:33.596289671 +0100
 @@ -44,7 +44,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31686,7 +32081,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -165,8 +165,6 @@
+@@ -153,6 +153,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -165,8 +166,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31695,7 +32098,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -230,6 +228,7 @@
+@@ -230,6 +229,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31703,9 +32106,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.18.4/modules/engines/ms-windows/Theme/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.18.4/modules/engines/ms-windows/Theme/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/engines/ms-windows/Theme/Makefile.in	2009-12-01 05:08:47.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/engines/ms-windows/Theme/Makefile.in	2009-12-01 08:08:03.642226788 +0100
++++ gtk+2.0-2.18.4/modules/engines/ms-windows/Theme/Makefile.in	2009-12-01 13:03:33.516289559 +0100
 @@ -43,7 +43,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31715,7 +32118,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -181,8 +181,6 @@
+@@ -169,6 +169,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -181,8 +182,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31724,7 +32135,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -246,6 +244,7 @@
+@@ -246,6 +245,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31732,9 +32143,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.18.4/modules/engines/pixbuf/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.18.4/modules/engines/pixbuf/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/engines/pixbuf/Makefile.in	2009-12-01 05:08:47.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/engines/pixbuf/Makefile.in	2009-12-01 08:08:04.003223228 +0100
++++ gtk+2.0-2.18.4/modules/engines/pixbuf/Makefile.in	2009-12-01 13:03:33.696289576 +0100
 @@ -44,7 +44,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31744,7 +32155,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -202,8 +202,6 @@
+@@ -190,6 +190,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -202,8 +203,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31753,7 +32172,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -267,6 +265,7 @@
+@@ -267,6 +266,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31761,9 +32180,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/input/Makefile.in gtk+2.0-2.18.4/modules/input/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/input/Makefile.in gtk+2.0-2.18.4/modules/input/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/input/Makefile.in	2009-12-01 05:08:47.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/input/Makefile.in	2009-12-01 08:08:04.207222562 +0100
++++ gtk+2.0-2.18.4/modules/input/Makefile.in	2009-12-01 13:03:33.900291674 +0100
 @@ -45,7 +45,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31773,7 +32192,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -403,8 +403,6 @@
+@@ -391,6 +391,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -403,8 +404,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31782,7 +32209,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -468,6 +466,7 @@
+@@ -468,6 +467,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31790,9 +32217,39 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/Makefile.in gtk+2.0-2.18.4/modules/Makefile.in
+@@ -704,7 +704,8 @@
+ @INCLUDE_IM_MULTIPRESS_FALSE at MULTIPRESS_MODULE = im-multipress.la
+ imconffiledir = $(sysconfdir)/gtk-2.0
+ dist_imconffile_DATA = im-multipress.conf
+- at CROSS_COMPILING_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
++ at CROSS_COMPILING_FALSE@@ENABLE_STATIC_FALSE at RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
++ at CROSS_COMPILING_FALSE@@ENABLE_STATIC_TRUE at RUN_QUERY_IMMODULES_TEST = false
+ @CROSS_COMPILING_TRUE at RUN_QUERY_IMMODULES_TEST = false
+ @BUILD_DYNAMIC_MODULES_TRUE at module_LTLIBRARIES = \
+ @BUILD_DYNAMIC_MODULES_TRUE@	$(AM_ET_MODULE)			\
+@@ -1256,7 +1257,18 @@
+ included-modules: $(noinst_LTLIBRARIES)
+ 
+ gtk.immodules: Makefile.am $(module_LTLIBRARIES)
+-	$(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
++	@if $(RUN_QUERY_IMMODULES_TEST) ; then \
++	  echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \
++	$(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \
++	else \
++	  echo "***" ; \
++	  echo "*** Warning: gtk.immodules not built" ; \
++	  echo "***" ; \
++	  echo "*** Generate this file manually on host" ; \
++	  echo "*** system using gtk-query-immodules-2.0" ; \
++	  echo "***" ; \
++	  touch gtk.immodules; \
++        fi
+ 
+ @CROSS_COMPILING_FALSE at all-local: gtk.immodules
+ 
+diff -Naur gtk+2.0-2.18.4.old/modules/Makefile.in gtk+2.0-2.18.4/modules/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/Makefile.in	2009-12-01 05:08:46.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/Makefile.in	2009-12-01 08:08:00.502222971 +0100
++++ gtk+2.0-2.18.4/modules/Makefile.in	2009-12-01 13:03:33.256291440 +0100
 @@ -44,7 +44,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31802,7 +32259,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -182,8 +182,6 @@
+@@ -170,6 +170,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -182,8 +183,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31811,7 +32276,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -247,6 +245,7 @@
+@@ -247,6 +246,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31819,9 +32284,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.18.4/modules/other/gail/libgail-util/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.18.4/modules/other/gail/libgail-util/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/other/gail/libgail-util/Makefile.in	2009-12-01 05:08:48.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/other/gail/libgail-util/Makefile.in	2009-12-01 08:08:04.727221826 +0100
++++ gtk+2.0-2.18.4/modules/other/gail/libgail-util/Makefile.in	2009-12-01 13:03:34.416289315 +0100
 @@ -46,7 +46,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31831,7 +32296,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -206,8 +206,6 @@
+@@ -194,6 +194,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -206,8 +207,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31840,7 +32313,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -271,6 +269,7 @@
+@@ -271,6 +270,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31848,9 +32321,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/other/gail/Makefile.in gtk+2.0-2.18.4/modules/other/gail/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/other/gail/Makefile.in gtk+2.0-2.18.4/modules/other/gail/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/other/gail/Makefile.in	2009-12-01 05:08:47.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/other/gail/Makefile.in	2009-12-01 08:08:04.611222235 +0100
++++ gtk+2.0-2.18.4/modules/other/gail/Makefile.in	2009-12-01 13:03:34.304289617 +0100
 @@ -45,7 +45,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31860,7 +32333,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -273,8 +273,6 @@
+@@ -261,6 +261,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -273,8 +274,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31869,7 +32350,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -338,6 +336,7 @@
+@@ -338,6 +337,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31877,9 +32358,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.18.4/modules/other/gail/tests/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.18.4/modules/other/gail/tests/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/other/gail/tests/Makefile.in	2009-12-01 05:08:48.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/other/gail/tests/Makefile.in	2009-12-01 08:08:04.883222367 +0100
++++ gtk+2.0-2.18.4/modules/other/gail/tests/Makefile.in	2009-12-01 13:03:34.580289520 +0100
 @@ -44,7 +44,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31889,7 +32370,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -345,8 +345,6 @@
+@@ -333,6 +333,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -345,8 +346,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31898,7 +32387,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -410,6 +408,7 @@
+@@ -410,6 +409,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31906,9 +32395,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/other/Makefile.in gtk+2.0-2.18.4/modules/other/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/other/Makefile.in gtk+2.0-2.18.4/modules/other/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/other/Makefile.in	2009-12-01 05:08:47.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/other/Makefile.in	2009-12-01 08:08:04.287222040 +0100
++++ gtk+2.0-2.18.4/modules/other/Makefile.in	2009-12-01 13:03:33.992289409 +0100
 @@ -43,7 +43,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31918,7 +32407,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -181,8 +181,6 @@
+@@ -169,6 +169,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -181,8 +182,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31927,7 +32424,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -246,6 +244,7 @@
+@@ -246,6 +245,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31935,9 +32432,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.18.4/modules/printbackends/cups/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.18.4/modules/printbackends/cups/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/printbackends/cups/Makefile.in	2009-12-01 05:08:48.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/printbackends/cups/Makefile.in	2009-12-01 08:08:05.071222108 +0100
++++ gtk+2.0-2.18.4/modules/printbackends/cups/Makefile.in	2009-12-01 13:03:34.768292129 +0100
 @@ -45,7 +45,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31947,7 +32444,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -205,8 +205,6 @@
+@@ -193,6 +193,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -205,8 +206,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31956,7 +32461,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -270,6 +268,7 @@
+@@ -270,6 +269,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31964,9 +32469,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/printbackends/file/Makefile.in gtk+2.0-2.18.4/modules/printbackends/file/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/file/Makefile.in gtk+2.0-2.18.4/modules/printbackends/file/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/printbackends/file/Makefile.in	2009-12-01 05:08:48.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/printbackends/file/Makefile.in	2009-12-01 08:08:05.183222661 +0100
++++ gtk+2.0-2.18.4/modules/printbackends/file/Makefile.in	2009-12-01 13:03:34.872290552 +0100
 @@ -45,7 +45,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31976,7 +32481,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -204,8 +204,6 @@
+@@ -192,6 +192,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -204,8 +205,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -31985,7 +32498,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -269,6 +267,7 @@
+@@ -269,6 +268,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31993,9 +32506,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.18.4/modules/printbackends/lpr/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.18.4/modules/printbackends/lpr/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/printbackends/lpr/Makefile.in	2009-12-01 05:08:48.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/printbackends/lpr/Makefile.in	2009-12-01 08:08:05.283222166 +0100
++++ gtk+2.0-2.18.4/modules/printbackends/lpr/Makefile.in	2009-12-01 13:03:34.976289326 +0100
 @@ -45,7 +45,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -32005,7 +32518,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -202,8 +202,6 @@
+@@ -190,6 +190,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -202,8 +203,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -32014,7 +32535,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -267,6 +265,7 @@
+@@ -267,6 +266,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -32022,9 +32543,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/printbackends/Makefile.in gtk+2.0-2.18.4/modules/printbackends/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/Makefile.in gtk+2.0-2.18.4/modules/printbackends/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/printbackends/Makefile.in	2009-12-01 05:08:48.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/printbackends/Makefile.in	2009-12-01 08:08:04.971223081 +0100
++++ gtk+2.0-2.18.4/modules/printbackends/Makefile.in	2009-12-01 13:03:34.664291346 +0100
 @@ -46,7 +46,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -32034,7 +32555,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -183,8 +183,6 @@
+@@ -171,6 +171,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -183,8 +184,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -32043,7 +32572,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -248,6 +246,7 @@
+@@ -248,6 +247,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -32051,9 +32580,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.18.4/modules/printbackends/papi/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.18.4/modules/printbackends/papi/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/printbackends/papi/Makefile.in	2009-12-01 05:08:48.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/printbackends/papi/Makefile.in	2009-12-01 08:08:05.383222018 +0100
++++ gtk+2.0-2.18.4/modules/printbackends/papi/Makefile.in	2009-12-01 13:03:35.072291363 +0100
 @@ -43,7 +43,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -32063,7 +32592,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -202,8 +202,6 @@
+@@ -190,6 +190,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -202,8 +203,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -32072,7 +32609,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -267,6 +265,7 @@
+@@ -267,6 +266,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -32080,9 +32617,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/modules/printbackends/test/Makefile.in gtk+2.0-2.18.4/modules/printbackends/test/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/test/Makefile.in gtk+2.0-2.18.4/modules/printbackends/test/Makefile.in
 --- gtk+2.0-2.18.4.old/modules/printbackends/test/Makefile.in	2009-12-01 05:08:49.000000000 +0100
-+++ gtk+2.0-2.18.4/modules/printbackends/test/Makefile.in	2009-12-01 08:08:05.491223109 +0100
++++ gtk+2.0-2.18.4/modules/printbackends/test/Makefile.in	2009-12-01 13:03:35.176289847 +0100
 @@ -45,7 +45,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -32092,7 +32629,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -203,8 +203,6 @@
+@@ -191,6 +191,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -203,8 +204,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -32101,7 +32646,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -268,6 +266,7 @@
+@@ -268,6 +267,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -32109,9 +32654,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/perf/Makefile.in gtk+2.0-2.18.4/perf/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/perf/Makefile.in gtk+2.0-2.18.4/perf/Makefile.in
 --- gtk+2.0-2.18.4.old/perf/Makefile.in	2009-12-01 05:08:49.000000000 +0100
-+++ gtk+2.0-2.18.4/perf/Makefile.in	2009-12-01 08:08:05.595222577 +0100
++++ gtk+2.0-2.18.4/perf/Makefile.in	2009-12-01 13:03:35.276289470 +0100
 @@ -45,7 +45,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -32121,7 +32666,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -173,8 +173,6 @@
+@@ -161,6 +161,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -173,8 +174,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -32130,7 +32683,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -238,6 +236,7 @@
+@@ -238,6 +237,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -32138,9 +32691,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_PREFIX = @PANGO_PREFIX@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/po/Makefile.in.in gtk+2.0-2.18.4/po/Makefile.in.in
+diff -Naur gtk+2.0-2.18.4.old/po/Makefile.in.in gtk+2.0-2.18.4/po/Makefile.in.in
 --- gtk+2.0-2.18.4.old/po/Makefile.in.in	2009-10-09 07:00:46.000000000 +0200
-+++ gtk+2.0-2.18.4/po/Makefile.in.in	2009-12-01 08:07:51.018226124 +0100
++++ gtk+2.0-2.18.4/po/Makefile.in.in	2009-12-01 13:03:24.331293835 +0100
 @@ -25,22 +25,23 @@
  
  prefix = @prefix@
@@ -32252,9 +32805,9 @@
  	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
  			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
  	else \
-diff -x'*config.guess' -x'*config.sub' -Naur gtk+2.0-2.18.4.old/tests/Makefile.in gtk+2.0-2.18.4/tests/Makefile.in
+diff -Naur gtk+2.0-2.18.4.old/tests/Makefile.in gtk+2.0-2.18.4/tests/Makefile.in
 --- gtk+2.0-2.18.4.old/tests/Makefile.in	2009-12-01 05:08:49.000000000 +0100
-+++ gtk+2.0-2.18.4/tests/Makefile.in	2009-12-01 08:08:05.883222996 +0100
++++ gtk+2.0-2.18.4/tests/Makefile.in	2009-12-01 13:03:35.532290410 +0100
 @@ -79,7 +79,7 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -32264,7 +32817,15 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -435,8 +435,6 @@
+@@ -423,6 +423,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -435,8 +436,6 @@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -32273,7 +32834,7 @@
  GTK_API_VERSION = @GTK_API_VERSION@
  GTK_BINARY_AGE = @GTK_BINARY_AGE@
  GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-@@ -500,6 +498,7 @@
+@@ -500,6 +499,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@




More information about the pkg-gnome-commits mailing list