Changeset 3042


Ignore:
Timestamp:
02/14/08 15:32:55 (5 years ago)
Author:
alanbach-guest
Message:
  • Sync'd with Debian 2.12.8-1
Location:
pkg/main/gtk+2.0/trunk/debian
Files:
3 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • pkg/main/gtk+2.0/trunk/debian/changelog

    r2998 r3042  
    1 gtk+2.0 (2.12.7-parsix1) unstable; urgency=low 
    2  
    3   * Sync'd with Debian, 2.12.7-1 
    4  
    5  -- Alan Baghumian <alan@technotux.org>  Fri, 01 Feb 2008 17:11:41 +0330 
     1gtk+2.0 (2.12.8-parsix1) unstable; urgency=low 
     2 
     3  * Sync'd with Debian 2.12.8-1 
     4 
     5 -- Alan Baghumian <alan@technotux.org>  Thu, 14 Feb 2008 18:01:36 +0330 
     6 
     7gtk+2.0 (2.12.8-1) unstable; urgency=low 
     8 
     9  * New upstream bugfix release: 
     10    + debian/patches/040_filechooser_single-click.patch, 
     11      debian/patches/093_directfb-type-changes.patch, 
     12      debian/patches/094_directfb-deprecation-fixes.patch: 
     13      - Dropped, merged upstream. 
     14    + debian/patches/070_mandatory-relibtoolize.patch: 
     15      - Regenerated for the new version. 
     16 
     17 -- Sebastian Dröge <slomo@debian.org>  Wed, 13 Feb 2008 09:11:50 +0100 
    618 
    719gtk+2.0 (2.12.7-1) unstable; urgency=low 

  • pkg/main/gtk+2.0/trunk/debian/patches/070_mandatory-relibtoolize.patch

    r2998 r3042  
    1010of upstream using an older libtool; see GNOME #484426; Debian #445001. 
    1111 
    12 --- a/aclocal.m4        2008-01-29 10:05:20.000000000 +0100 
    13 +++ b/aclocal.m4        2008-01-29 10:05:43.000000000 +0100 
     12diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/aclocal.m4 gtk+2.0-2.12.8/aclocal.m4 
     13--- gtk+2.0-2.12.8.old/aclocal.m4       2008-02-12 18:58:22.000000000 +0100 
     14+++ gtk+2.0-2.12.8/aclocal.m4   2008-02-13 09:22:36.000000000 +0100 
    1415@@ -941,7 +941,7 @@ 
    1516  
    … …  
    1718  
    1819-# serial 51 AC_PROG_LIBTOOL 
    19 +# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL 
     20+# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL 
    2021  
    2122  
    2223 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) 
    23 @@ -1493,7 +1493,6 @@ 
     24@@ -1029,7 +1029,6 @@ 
     25 AC_REQUIRE([AC_OBJEXT])dnl 
     26 AC_REQUIRE([AC_EXEEXT])dnl 
     27 dnl 
     28- 
     29 AC_LIBTOOL_SYS_MAX_CMD_LEN 
     30 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE 
     31 AC_LIBTOOL_OBJDIR 
     32@@ -1131,6 +1130,8 @@ 
     33   ;; 
     34 esac 
     35  
     36+_LT_REQUIRED_DARWIN_CHECKS 
     37+ 
     38 AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) 
     39 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], 
     40 enable_win32_dll=yes, enable_win32_dll=no) 
     41@@ -1210,9 +1211,80 @@ 
     42 echo "$lt_simple_link_test_code" >conftest.$ac_ext 
     43 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err 
     44 _lt_linker_boilerplate=`cat conftest.err` 
     45-$rm conftest* 
     46+$rm -r conftest* 
     47 ])# _LT_LINKER_BOILERPLATE 
     48  
     49+# _LT_REQUIRED_DARWIN_CHECKS 
     50+# -------------------------- 
     51+# Check for some things on darwin 
     52+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ 
     53+  case $host_os in 
     54+    rhapsody* | darwin*) 
     55+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) 
     56+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) 
     57+ 
     58+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], 
     59+      [lt_cv_apple_cc_single_mod=no 
     60+      if test -z "${LT_MULTI_MODULE}"; then 
     61+   # By default we will add the -single_module flag. You can override 
     62+   # by either setting the environment variable LT_MULTI_MODULE 
     63+   # non-empty at configure time, or by adding -multi_module to the 
     64+   # link flags. 
     65+   echo "int foo(void){return 1;}" > conftest.c 
     66+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ 
     67+     -dynamiclib ${wl}-single_module conftest.c 
     68+   if test -f libconftest.dylib; then 
     69+     lt_cv_apple_cc_single_mod=yes 
     70+     rm -rf libconftest.dylib* 
     71+   fi 
     72+   rm conftest.c 
     73+      fi]) 
     74+    AC_CACHE_CHECK([for -exported_symbols_list linker flag], 
     75+      [lt_cv_ld_exported_symbols_list], 
     76+      [lt_cv_ld_exported_symbols_list=no 
     77+      save_LDFLAGS=$LDFLAGS 
     78+      echo "_main" > conftest.sym 
     79+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" 
     80+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], 
     81+   [lt_cv_ld_exported_symbols_list=yes], 
     82+   [lt_cv_ld_exported_symbols_list=no]) 
     83+   LDFLAGS="$save_LDFLAGS" 
     84+    ]) 
     85+    case $host_os in 
     86+    rhapsody* | darwin1.[[0123]]) 
     87+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; 
     88+    darwin1.*) 
     89+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 
     90+    darwin*) 
     91+      # if running on 10.5 or later, the deployment target defaults 
     92+      # to the OS version, if on x86, and 10.4, the deployment 
     93+      # target defaults to 10.4. Don't you love it? 
     94+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 
     95+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) 
     96+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 
     97+   10.[[012]]*) 
     98+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 
     99+   10.*) 
     100+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 
     101+      esac 
     102+    ;; 
     103+  esac 
     104+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then 
     105+      _lt_dar_single_mod='$single_module' 
     106+    fi 
     107+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then 
     108+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' 
     109+    else 
     110+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" 
     111+    fi 
     112+    if test "$DSYMUTIL" != ":"; then 
     113+      _lt_dsymutil="~$DSYMUTIL \$lib || :" 
     114+    else 
     115+      _lt_dsymutil= 
     116+    fi 
     117+    ;; 
     118+  esac 
     119+]) 
     120  
     121 # _LT_AC_SYS_LIBPATH_AIX 
     122 # ---------------------- 
     123@@ -1493,7 +1565,6 @@ 
    24124       esac 
    25125       ;; 
    … …  
    29129         x86_64-*kfreebsd*-gnu) 
    30130           LD="${LD-ld} -m elf_x86_64_fbsd" 
    31 @@ -2552,13 +2551,11 @@ 
     131@@ -1538,7 +1609,11 @@ 
     132     *64-bit*) 
     133       case $lt_cv_prog_gnu_ld in 
     134       yes*) LD="${LD-ld} -m elf64_sparc" ;; 
     135-      *)    LD="${LD-ld} -64" ;; 
     136+      *) 
     137+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then 
     138+         LD="${LD-ld} -64" 
     139+       fi 
     140+       ;; 
     141       esac 
     142       ;; 
     143     esac 
     144@@ -1631,7 +1706,7 @@ 
     145        $2=yes 
     146      fi 
     147    fi 
     148-   $rm conftest* 
     149+   $rm -r conftest* 
     150    LDFLAGS="$save_LDFLAGS" 
     151 ]) 
     152  
     153@@ -1902,7 +1977,7 @@ 
     154     AC_CHECK_FUNC([shl_load], 
     155          [lt_cv_dlopen="shl_load"], 
     156       [AC_CHECK_LIB([dld], [shl_load], 
     157-           [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], 
     158+           [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], 
     159        [AC_CHECK_FUNC([dlopen], 
     160              [lt_cv_dlopen="dlopen"], 
     161          [AC_CHECK_LIB([dl], [dlopen], 
     162@@ -1910,7 +1985,7 @@ 
     163            [AC_CHECK_LIB([svld], [dlopen], 
     164                  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], 
     165              [AC_CHECK_LIB([dld], [dld_link], 
     166-                   [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) 
     167+                   [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) 
     168              ]) 
     169            ]) 
     170          ]) 
     171@@ -2227,7 +2302,7 @@ 
     172   soname_spec='${libname}${release}${shared_ext}$major' 
     173   ;; 
     174  
     175-aix4* | aix5*) 
     176+aix[[4-9]]*) 
     177   version_type=linux 
     178   need_lib_prefix=no 
     179   need_version=no 
     180@@ -2552,13 +2627,11 @@ 
    32181   # Some rework will be needed to allow for fast_install 
    33182   # before this can be enabled. 
    … …  
    44193  
    45194   # We used to test for /lib/ld.so.1 and disable shared libraries on 
    46 @@ -2570,6 +2567,18 @@ 
     195@@ -2570,6 +2643,18 @@ 
    47196   dynamic_linker='GNU/Linux ld.so' 
    48197   ;; 
    … …  
    63212   version_type=sunos 
    64213   need_lib_prefix=no 
    65 @@ -3344,7 +3353,7 @@ 
     214@@ -2750,6 +2835,13 @@ 
     215 AC_MSG_RESULT([$dynamic_linker]) 
     216 test "$dynamic_linker" = no && can_build_shared=no 
     217  
     218+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], 
     219+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) 
     220+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 
     221+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], 
     222+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) 
     223+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" 
     224+ 
     225 variables_saved_for_relink="PATH $shlibpath_var $runpath_var" 
     226 if test "$GCC" = yes; then 
     227   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" 
     228@@ -3249,7 +3341,7 @@ 
     229 # whether `pass_all' will *always* work, you probably want this one. 
     230  
     231 case $host_os in 
     232-aix4* | aix5*) 
     233+aix[[4-9]]*) 
     234   lt_cv_deplibs_check_method=pass_all 
     235   ;; 
     236  
     237@@ -3344,7 +3436,7 @@ 
    66238   lt_cv_deplibs_check_method=pass_all 
    67239   ;; 
    … …  
    72244     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' 
    73245   else 
    74 @@ -4378,7 +4387,7 @@ 
     246@@ -3685,7 +3777,7 @@ 
     247   fi 
     248   ;; 
     249  
     250-aix4* | aix5*) 
     251+aix[[4-9]]*) 
     252   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then 
     253     test "$enable_shared" = yes && enable_static=no 
     254   fi 
     255@@ -3742,6 +3834,7 @@ 
     256 _LT_AC_TAGVAR(predeps, $1)= 
     257 _LT_AC_TAGVAR(postdeps, $1)= 
     258 _LT_AC_TAGVAR(compiler_lib_search_path, $1)= 
     259+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= 
     260  
     261 # Source file extension for C++ test sources. 
     262 ac_ext=cpp 
     263@@ -3851,7 +3944,7 @@ 
     264     # FIXME: insert proper C++ library support 
     265     _LT_AC_TAGVAR(ld_shlibs, $1)=no 
     266     ;; 
     267-  aix4* | aix5*) 
     268+  aix[[4-9]]*) 
     269     if test "$host_cpu" = ia64; then 
     270       # On IA64, the linker does run time linking by default, so we don't 
     271       # have to do anything special. 
     272@@ -3864,7 +3957,7 @@ 
     273       # Test if we are trying to use run time linking or normal 
     274       # AIX style linking. If -brtl is somewhere in LDFLAGS, we 
     275       # need to do runtime linking. 
     276-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) 
     277+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) 
     278        for ld_flag in $LDFLAGS; do 
     279          case $ld_flag in 
     280          *-brtl*) 
     281@@ -4010,51 +4103,23 @@ 
     282     fi 
     283   ;; 
     284       darwin* | rhapsody*) 
     285-        case $host_os in 
     286-        rhapsody* | darwin1.[[012]]) 
     287-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' 
     288-         ;; 
     289-       *) # Darwin 1.3 on 
     290-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then 
     291-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' 
     292-         else 
     293-           case ${MACOSX_DEPLOYMENT_TARGET} in 
     294-             10.[[012]]) 
     295-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' 
     296-               ;; 
     297-             10.*) 
     298-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' 
     299-               ;; 
     300-           esac 
     301-         fi 
     302-         ;; 
     303-        esac 
     304       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no 
     305       _LT_AC_TAGVAR(hardcode_direct, $1)=no 
     306       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes 
     307       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported 
     308       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' 
     309       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes 
     310- 
     311-    if test "$GXX" = yes ; then 
     312-      lt_int_apple_cc_single_mod=no 
     313+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" 
     314+      if test "$GXX" = yes ; then 
     315       output_verbose_link_cmd='echo' 
     316-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then 
     317-       lt_int_apple_cc_single_mod=yes 
     318+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" 
     319+      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 
     320+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" 
     321+      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" 
     322+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then 
     323+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" 
     324+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" 
     325       fi 
     326-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then 
     327-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' 
     328-      else 
     329-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' 
     330-        fi 
     331-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' 
     332-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds 
     333-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then 
     334-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' 
     335-          else 
     336-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' 
     337-          fi 
     338-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' 
     339       else 
     340       case $cc_basename in 
     341         xlc*) 
     342@@ -4305,7 +4370,7 @@ 
     343        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' 
     344        _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' 
     345        ;; 
     346-      pgCC*) 
     347+      pgCC* | pgcpp*) 
     348         # Portland Group C++ compiler 
     349        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 
     350        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' 
     351@@ -4378,7 +4443,7 @@ 
    75352        ;; 
    76353     esac 
    … …  
    81358       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' 
    82359       wlarc= 
    83 @@ -6059,7 +6068,7 @@ 
     360@@ -4740,7 +4805,8 @@ 
     361 # compiler output when linking a shared library. 
     362 # Parse the compiler output and extract the necessary 
     363 # objects, libraries and library flags. 
     364-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ 
     365+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], 
     366+[AC_REQUIRE([LT_AC_PROG_SED])dnl 
     367 dnl we can't use the lt_simple_compile_test_code here, 
     368 dnl because it contains code intended for an executable, 
     369 dnl not a library.  It's possible we should let each 
     370@@ -4865,6 +4931,11 @@ 
     371  
     372 $rm -f confest.$objext 
     373  
     374+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= 
     375+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then 
     376+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` 
     377+fi 
     378+ 
     379 # PORTME: override above test on systems where it is broken 
     380 ifelse([$1],[CXX], 
     381 [case $host_os in 
     382@@ -4921,7 +4992,6 @@ 
     383   ;; 
     384 esac 
     385 ]) 
     386- 
     387 case " $_LT_AC_TAGVAR(postdeps, $1) " in 
     388 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; 
     389 esac 
     390@@ -5006,7 +5076,7 @@ 
     391     postinstall_cmds='$RANLIB $lib' 
     392   fi 
     393   ;; 
     394-aix4* | aix5*) 
     395+aix[[4-9]]*) 
     396   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then 
     397     test "$enable_shared" = yes && enable_static=no 
     398   fi 
     399@@ -5183,6 +5253,7 @@ 
     400     _LT_AC_TAGVAR(predeps, $1) \ 
     401     _LT_AC_TAGVAR(postdeps, $1) \ 
     402     _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ 
     403+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ 
     404     _LT_AC_TAGVAR(archive_cmds, $1) \ 
     405     _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ 
     406     _LT_AC_TAGVAR(postinstall_cmds, $1) \ 
     407@@ -5245,7 +5316,7 @@ 
     408 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) 
     409 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 
     410 # 
     411-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 
     412+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 
     413 # Free Software Foundation, Inc. 
     414 # 
     415 # This file is part of GNU Libtool: 
     416@@ -5482,6 +5553,10 @@ 
     417 # shared library. 
     418 postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) 
     419  
     420+# The directories searched by this compiler when creating a shared 
     421+# library 
     422+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) 
     423+ 
     424 # The library search path used internally by the compiler when linking 
     425 # a shared library. 
     426 compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) 
     427@@ -5831,7 +5906,7 @@ 
     428     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD 
     429     cat conftest.$ac_ext >&5 
     430   fi 
     431-  rm -f conftest* conftst* 
     432+  rm -rf conftest* conftst* 
     433  
     434   # Do not use the global_symbol_pipe unless it works. 
     435   if test "$pipe_works" = yes; then 
     436@@ -5888,7 +5963,8 @@ 
     437       # built for inclusion in a dll (and should export symbols for example). 
     438       # Although the cygwin gcc ignores -fPIC, still need this for old-style 
     439       # (--disable-auto-import) libraries 
     440-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' 
     441+      m4_if([$1], [GCJ], [], 
     442+       [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) 
     443       ;; 
     444     darwin* | rhapsody*) 
     445       # PIC is the default on this platform 
     446@@ -5925,7 +6001,7 @@ 
     447     esac 
     448   else 
     449     case $host_os in 
     450-      aix4* | aix5*) 
     451+      aix[[4-9]]*) 
     452        # All AIX code is PIC. 
     453        if test "$host_cpu" = ia64; then 
     454          # AIX 5 now supports IA64 processor 
     455@@ -6021,7 +6097,7 @@ 
     456            _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 
     457            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' 
     458            ;; 
     459-         pgCC*) 
     460+         pgCC* | pgcpp*) 
     461            # Portland Group C++ compiler. 
     462            _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 
     463            _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' 
     464@@ -6059,7 +6135,7 @@ 
    84465            ;; 
    85466        esac 
    … …  
    90471       osf3* | osf4* | osf5*) 
    91472        case $cc_basename in 
    92 @@ -6434,6 +6443,9 @@ 
     473@@ -6172,7 +6248,8 @@ 
     474       # built for inclusion in a dll (and should export symbols for example). 
     475       # Although the cygwin gcc ignores -fPIC, still need this for old-style 
     476       # (--disable-auto-import) libraries 
     477-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' 
     478+      m4_if([$1], [GCJ], [], 
     479+       [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) 
     480       ;; 
     481  
     482     darwin* | rhapsody*) 
     483@@ -6242,7 +6319,8 @@ 
     484     mingw* | cygwin* | pw32* | os2*) 
     485       # This hack is so that the source file can tell whether it is being 
     486       # built for inclusion in a dll (and should export symbols for example). 
     487-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' 
     488+      m4_if([$1], [GCJ], [], 
     489+       [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) 
     490       ;; 
     491  
     492     hpux9* | hpux10* | hpux11*) 
     493@@ -6379,7 +6457,7 @@ 
     494 # 
     495 if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then 
     496   AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], 
     497-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), 
     498+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), 
     499     [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], 
     500     [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in 
     501      "" | " "*) ;; 
     502@@ -6403,7 +6481,7 @@ 
     503 # 
     504 wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" 
     505 AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], 
     506-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), 
     507+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), 
     508   $lt_tmp_static_flag, 
     509   [], 
     510   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) 
     511@@ -6419,7 +6497,7 @@ 
     512 ifelse([$1],[CXX],[ 
     513   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 
     514   case $host_os in 
     515-  aix4* | aix5*) 
     516+  aix[[4-9]]*) 
     517     # If we're using GNU nm, then we don't want the "-C" option. 
     518     # -C means demangle to AIX nm, but means don't demangle with GNU nm 
     519     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then 
     520@@ -6434,10 +6512,14 @@ 
    93521   cygwin* | mingw*) 
    94522     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$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' 
    … …  
    100528     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 
    101529   ;; 
    102 @@ -6639,12 +6651,13 @@ 
     530   esac 
     531+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] 
     532 ],[ 
     533   runpath_var= 
     534   _LT_AC_TAGVAR(allow_undefined_flag, $1)= 
     535@@ -6468,12 +6550,14 @@ 
     536   # it will be wrapped by ` (' and `)$', so one must not match beginning or 
     537   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', 
     538   # as well as any symbol that contains `d'. 
     539-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" 
     540+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] 
     541   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out 
     542   # platforms (ab)use it in PIC code, but their linkers get confused if 
     543   # the symbol is explicitly referenced.  Since portable code cannot 
     544   # rely on this symbol name, it's probably fine to never include it in 
     545   # preloaded symbol tables. 
     546+  # Exclude shared library initialization/finalization symbols. 
     547+dnl Note also adjust exclude_expsyms for C++ above. 
     548   extract_expsyms_cmds= 
     549   # Just being paranoid about ensuring that cc_basename is set. 
     550   _LT_CC_BASENAME([$compiler]) 
     551@@ -6523,7 +6607,7 @@ 
     552  
     553     # See if GNU ld supports shared libraries. 
     554     case $host_os in 
     555-    aix3* | aix4* | aix5*) 
     556+    aix[[3-9]]*) 
     557       # On AIX/PPC, the GNU linker is very broken 
     558       if test "$host_cpu" != ia64; then 
     559        _LT_AC_TAGVAR(ld_shlibs, $1)=no 
     560@@ -6639,12 +6723,13 @@ 
    103561   $echo "local: *; };" >> $output_objdir/$libname.ver~ 
    104562          $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' 
    … …  
    115573        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 
    116574        wlarc= 
    117 @@ -7076,7 +7089,7 @@ 
     575@@ -6742,7 +6827,7 @@ 
     576       fi 
     577       ;; 
     578  
     579-    aix4* | aix5*) 
     580+    aix[[4-9]]*) 
     581       if test "$host_cpu" = ia64; then 
     582        # On IA64, the linker does run time linking by default, so we don't 
     583        # have to do anything special. 
     584@@ -6762,7 +6847,7 @@ 
     585        # Test if we are trying to use run time linking or normal 
     586        # AIX style linking. If -brtl is somewhere in LDFLAGS, we 
     587        # need to do runtime linking. 
     588-       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) 
     589+       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) 
     590          for ld_flag in $LDFLAGS; do 
     591          if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then 
     592            aix_use_runtimelinking=yes 
     593@@ -6922,11 +7007,10 @@ 
     594       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes 
     595     if test "$GCC" = yes ; then 
     596        output_verbose_link_cmd='echo' 
     597-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' 
     598-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' 
     599-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds 
     600-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' 
     601-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' 
     602+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" 
     603+        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 
     604+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" 
     605+        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" 
     606     else 
     607       case $cc_basename in 
     608         xlc*) 
     609@@ -7076,7 +7160,7 @@ 
    118610       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes 
    119611       ;; 
    … …  
    124616        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out 
    125617       else 
    126 @@ -8313,7 +8326,7 @@ 
    127        esac 
    128    done 
    129   
    130 -  PKG_PROG_PKG_CONFIG([0.16]) 
    131 +  PKG_PROG_PKG_CONFIG([0.7]) 
    132   
    133    no_glib="" 
    134   
    135 --- a/configure 2008-01-29 10:05:20.000000000 +0100 
    136 +++ b/configure 2008-01-29 10:05:43.000000000 +0100 
     618@@ -7754,14 +7838,16 @@ 
     619 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 
     620 # --------------------------------------------- 
     621 m4_define([_PKG_CONFIG], 
     622-[if test -n "$$1"; then 
     623-    pkg_cv_[]$1="$$1" 
     624- elif test -n "$PKG_CONFIG"; then 
     625-    PKG_CHECK_EXISTS([$3], 
     626-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], 
     627-                    [pkg_failed=yes]) 
     628- else 
     629-    pkg_failed=untried 
     630+[if test -n "$PKG_CONFIG"; then 
     631+    if test -n "$$1"; then 
     632+        pkg_cv_[]$1="$$1" 
     633+    else 
     634+        PKG_CHECK_EXISTS([$3], 
     635+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], 
     636+                        [pkg_failed=yes]) 
     637+    fi 
     638+else 
     639+       pkg_failed=untried 
     640 fi[]dnl 
     641 ])# _PKG_CONFIG 
     642  
     643@@ -7805,9 +7891,9 @@ 
     644 if test $pkg_failed = yes; then 
     645         _PKG_SHORT_ERRORS_SUPPORTED 
     646         if test $_pkg_short_errors_supported = yes; then 
     647-               $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` 
     648+               $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` 
     649         else  
     650-               $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` 
     651+               $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` 
     652         fi 
     653        # Put the nasty error message in config.log where it belongs 
     654        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD 
     655diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/configure gtk+2.0-2.12.8/configure 
     656--- gtk+2.0-2.12.8.old/configure        2008-02-12 18:58:36.000000000 +0100 
     657+++ gtk+2.0-2.12.8/configure    2008-02-13 09:22:41.000000000 +0100 
    137658@@ -863,6 +863,8 @@ 
    138659 CCDEPMODE 
    … …  
    144665 CXXFLAGS 
    145666 ac_ct_CXX 
    146 @@ -1016,6 +1018,7 @@ 
     667@@ -880,6 +882,8 @@ 
     668 ECHO 
     669 AR 
     670 RANLIB 
     671+DSYMUTIL 
     672+NMEDIT 
     673 DLLTOOL 
     674 AS 
     675 OBJDUMP 
     676@@ -1016,6 +1020,7 @@ 
    147677 USE_DIRECTFB_TRUE 
    148678 USE_DIRECTFB_FALSE 
    … …  
    152682 GDK_EXTRA_CFLAGS 
    153683 GDK_DEP_LIBS 
    154 @@ -3872,6 +3875,16 @@ 
     684@@ -3872,6 +3877,16 @@ 
    155685  
    156686  
    … …  
    169699 do 
    170700   # Extract the first word of "$ac_prog", so it can be a program name with args. 
    171 @@ -5098,7 +5111,7 @@ 
     701@@ -5003,7 +5018,7 @@ 
     702 # whether `pass_all' will *always* work, you probably want this one. 
     703  
     704 case $host_os in 
     705-aix4* | aix5*) 
     706+aix[4-9]*) 
     707   lt_cv_deplibs_check_method=pass_all 
     708   ;; 
     709  
     710@@ -5098,7 +5113,7 @@ 
    172711   lt_cv_deplibs_check_method=pass_all 
    173712   ;; 
    … …  
    178717     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' 
    179718   else 
    180 @@ -5219,7 +5232,7 @@ 
     719@@ -5219,7 +5234,7 @@ 
    181720   ;; 
    182721 *-*-irix6*) 
    183722   # Find out which ABI we are using. 
    184723-  echo '#line 5222 "configure"' > conftest.$ac_ext 
    185 +  echo '#line 5235 "configure"' > conftest.$ac_ext 
     724+  echo '#line 5237 "configure"' > conftest.$ac_ext 
    186725   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 
    187726   (eval $ac_compile) 2>&5 
    188727   ac_status=$? 
    189 @@ -5284,7 +5297,6 @@ 
     728@@ -5284,7 +5299,6 @@ 
    190729       esac 
    191730       ;; 
    … …  
    195734         x86_64-*kfreebsd*-gnu) 
    196735           LD="${LD-ld} -m elf_x86_64_fbsd" 
    197 @@ -7779,11 +7791,11 @@ 
     736@@ -5392,7 +5406,11 @@ 
     737     *64-bit*) 
     738       case $lt_cv_prog_gnu_ld in 
     739       yes*) LD="${LD-ld} -m elf64_sparc" ;; 
     740-      *)    LD="${LD-ld} -64" ;; 
     741+      *) 
     742+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then 
     743+         LD="${LD-ld} -64" 
     744+       fi 
     745+       ;; 
     746       esac 
     747       ;; 
     748     esac 
     749@@ -6811,7 +6829,6 @@ 
     750  
     751  
     752 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! 
     753- 
     754 # find the maximum length of command line arguments 
     755 { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 
     756 echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } 
     757@@ -7126,7 +7143,7 @@ 
     758     echo "$progname: failed program was:" >&5 
     759     cat conftest.$ac_ext >&5 
     760   fi 
     761-  rm -f conftest* conftst* 
     762+  rm -rf conftest* conftst* 
     763  
     764   # Do not use the global_symbol_pipe unless it works. 
     765   if test "$pipe_works" = yes; then 
     766@@ -7686,6 +7703,318 @@ 
     767   ;; 
     768 esac 
     769  
     770+ 
     771+  case $host_os in 
     772+    rhapsody* | darwin*) 
     773+    if test -n "$ac_tool_prefix"; then 
     774+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. 
     775+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 
     776+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 
     777+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 
     778+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then 
     779+  echo $ECHO_N "(cached) $ECHO_C" >&6 
     780+else 
     781+  if test -n "$DSYMUTIL"; then 
     782+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. 
     783+else 
     784+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
     785+for as_dir in $PATH 
     786+do 
     787+  IFS=$as_save_IFS 
     788+  test -z "$as_dir" && as_dir=. 
     789+  for ac_exec_ext in '' $ac_executable_extensions; do 
     790+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     791+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" 
     792+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 
     793+    break 2 
     794+  fi 
     795+done 
     796+done 
     797+IFS=$as_save_IFS 
     798+ 
     799+fi 
     800+fi 
     801+DSYMUTIL=$ac_cv_prog_DSYMUTIL 
     802+if test -n "$DSYMUTIL"; then 
     803+  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 
     804+echo "${ECHO_T}$DSYMUTIL" >&6; } 
     805+else 
     806+  { echo "$as_me:$LINENO: result: no" >&5 
     807+echo "${ECHO_T}no" >&6; } 
     808+fi 
     809+ 
     810+ 
     811+fi 
     812+if test -z "$ac_cv_prog_DSYMUTIL"; then 
     813+  ac_ct_DSYMUTIL=$DSYMUTIL 
     814+  # Extract the first word of "dsymutil", so it can be a program name with args. 
     815+set dummy dsymutil; ac_word=$2 
     816+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 
     817+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 
     818+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then 
     819+  echo $ECHO_N "(cached) $ECHO_C" >&6 
     820+else 
     821+  if test -n "$ac_ct_DSYMUTIL"; then 
     822+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. 
     823+else 
     824+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
     825+for as_dir in $PATH 
     826+do 
     827+  IFS=$as_save_IFS 
     828+  test -z "$as_dir" && as_dir=. 
     829+  for ac_exec_ext in '' $ac_executable_extensions; do 
     830+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     831+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" 
     832+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 
     833+    break 2 
     834+  fi 
     835+done 
     836+done 
     837+IFS=$as_save_IFS 
     838+ 
     839+fi 
     840+fi 
     841+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL 
     842+if test -n "$ac_ct_DSYMUTIL"; then 
     843+  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 
     844+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } 
     845+else 
     846+  { echo "$as_me:$LINENO: result: no" >&5 
     847+echo "${ECHO_T}no" >&6; } 
     848+fi 
     849+ 
     850+  if test "x$ac_ct_DSYMUTIL" = x; then 
     851+    DSYMUTIL=":" 
     852+  else 
     853+    case $cross_compiling:$ac_tool_warned in 
     854+yes:) 
     855+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools 
     856+whose name does not start with the host triplet.  If you think this 
     857+configuration is useful to you, please write to autoconf@gnu.org." >&5 
     858+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools 
     859+whose name does not start with the host triplet.  If you think this 
     860+configuration is useful to you, please write to autoconf@gnu.org." >&2;} 
     861+ac_tool_warned=yes ;; 
     862+esac 
     863+    DSYMUTIL=$ac_ct_DSYMUTIL 
     864+  fi 
     865+else 
     866+  DSYMUTIL="$ac_cv_prog_DSYMUTIL" 
     867+fi 
     868+ 
     869+    if test -n "$ac_tool_prefix"; then 
     870+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. 
     871+set dummy ${ac_tool_prefix}nmedit; ac_word=$2 
     872+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 
     873+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 
     874+if test "${ac_cv_prog_NMEDIT+set}" = set; then 
     875+  echo $ECHO_N "(cached) $ECHO_C" >&6 
     876+else 
     877+  if test -n "$NMEDIT"; then 
     878+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. 
     879+else 
     880+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
     881+for as_dir in $PATH 
     882+do 
     883+  IFS=$as_save_IFS 
     884+  test -z "$as_dir" && as_dir=. 
     885+  for ac_exec_ext in '' $ac_executable_extensions; do 
     886+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     887+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" 
     888+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 
     889+    break 2 
     890+  fi 
     891+done 
     892+done 
     893+IFS=$as_save_IFS 
     894+ 
     895+fi 
     896+fi 
     897+NMEDIT=$ac_cv_prog_NMEDIT 
     898+if test -n "$NMEDIT"; then 
     899+  { echo "$as_me:$LINENO: result: $NMEDIT" >&5 
     900+echo "${ECHO_T}$NMEDIT" >&6; } 
     901+else 
     902+  { echo "$as_me:$LINENO: result: no" >&5 
     903+echo "${ECHO_T}no" >&6; } 
     904+fi 
     905+ 
     906+ 
     907+fi 
     908+if test -z "$ac_cv_prog_NMEDIT"; then 
     909+  ac_ct_NMEDIT=$NMEDIT 
     910+  # Extract the first word of "nmedit", so it can be a program name with args. 
     911+set dummy nmedit; ac_word=$2 
     912+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 
     913+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 
     914+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then 
     915+  echo $ECHO_N "(cached) $ECHO_C" >&6 
     916+else 
     917+  if test -n "$ac_ct_NMEDIT"; then 
     918+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. 
     919+else 
     920+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
     921+for as_dir in $PATH 
     922+do 
     923+  IFS=$as_save_IFS 
     924+  test -z "$as_dir" && as_dir=. 
     925+  for ac_exec_ext in '' $ac_executable_extensions; do 
     926+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     927+    ac_cv_prog_ac_ct_NMEDIT="nmedit" 
     928+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 
     929+    break 2 
     930+  fi 
     931+done 
     932+done 
     933+IFS=$as_save_IFS 
     934+ 
     935+fi 
     936+fi 
     937+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT 
     938+if test -n "$ac_ct_NMEDIT"; then 
     939+  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 
     940+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } 
     941+else 
     942+  { echo "$as_me:$LINENO: result: no" >&5 
     943+echo "${ECHO_T}no" >&6; } 
     944+fi 
     945+ 
     946+  if test "x$ac_ct_NMEDIT" = x; then 
     947+    NMEDIT=":" 
     948+  else 
     949+    case $cross_compiling:$ac_tool_warned in 
     950+yes:) 
     951+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools 
     952+whose name does not start with the host triplet.  If you think this 
     953+configuration is useful to you, please write to autoconf@gnu.org." >&5 
     954+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools 
     955+whose name does not start with the host triplet.  If you think this 
     956+configuration is useful to you, please write to autoconf@gnu.org." >&2;} 
     957+ac_tool_warned=yes ;; 
     958+esac 
     959+    NMEDIT=$ac_ct_NMEDIT 
     960+  fi 
     961+else 
     962+  NMEDIT="$ac_cv_prog_NMEDIT" 
     963+fi 
     964+ 
     965+ 
     966+    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 
     967+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } 
     968+if test "${lt_cv_apple_cc_single_mod+set}" = set; then 
     969+  echo $ECHO_N "(cached) $ECHO_C" >&6 
     970+else 
     971+  lt_cv_apple_cc_single_mod=no 
     972+      if test -z "${LT_MULTI_MODULE}"; then 
     973+   # By default we will add the -single_module flag. You can override 
     974+   # by either setting the environment variable LT_MULTI_MODULE 
     975+   # non-empty at configure time, or by adding -multi_module to the 
     976+   # link flags. 
     977+   echo "int foo(void){return 1;}" > conftest.c 
     978+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ 
     979+     -dynamiclib ${wl}-single_module conftest.c 
     980+   if test -f libconftest.dylib; then 
     981+     lt_cv_apple_cc_single_mod=yes 
     982+     rm -rf libconftest.dylib* 
     983+   fi 
     984+   rm conftest.c 
     985+      fi 
     986+fi 
     987+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 
     988+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } 
     989+    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 
     990+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } 
     991+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then 
     992+  echo $ECHO_N "(cached) $ECHO_C" >&6 
     993+else 
     994+  lt_cv_ld_exported_symbols_list=no 
     995+      save_LDFLAGS=$LDFLAGS 
     996+      echo "_main" > conftest.sym 
     997+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" 
     998+      cat >conftest.$ac_ext <<_ACEOF 
     999+/* confdefs.h.  */ 
     1000+_ACEOF 
     1001+cat confdefs.h >>conftest.$ac_ext 
     1002+cat >>conftest.$ac_ext <<_ACEOF 
     1003+/* end confdefs.h.  */ 
     1004+ 
     1005+int 
     1006+main () 
     1007+{ 
     1008+ 
     1009+  ; 
     1010+  return 0; 
     1011+} 
     1012+_ACEOF 
     1013+rm -f conftest.$ac_objext conftest$ac_exeext 
     1014+if { (ac_try="$ac_link" 
     1015+case "(($ac_try" in 
     1016+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 
     1017+  *) ac_try_echo=$ac_try;; 
     1018+esac 
     1019+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 
     1020+  (eval "$ac_link") 2>conftest.er1 
     1021+  ac_status=$? 
     1022+  grep -v '^ *+' conftest.er1 >conftest.err 
     1023+  rm -f conftest.er1 
     1024+  cat conftest.err >&5 
     1025+  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
     1026+  (exit $ac_status); } && { 
     1027+        test -z "$ac_c_werror_flag" || 
     1028+        test ! -s conftest.err 
     1029+       } && test -s conftest$ac_exeext && 
     1030+       $as_test_x conftest$ac_exeext; then 
     1031+  lt_cv_ld_exported_symbols_list=yes 
     1032+else 
     1033+  echo "$as_me: failed program was:" >&5 
     1034+sed 's/^/| /' conftest.$ac_ext >&5 
     1035+ 
     1036+       lt_cv_ld_exported_symbols_list=no 
     1037+fi 
     1038+ 
     1039+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ 
     1040+      conftest$ac_exeext conftest.$ac_ext 
     1041+   LDFLAGS="$save_LDFLAGS" 
     1042+ 
     1043+fi 
     1044+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 
     1045+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } 
     1046+    case $host_os in 
     1047+    rhapsody* | darwin1.[0123]) 
     1048+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; 
     1049+    darwin1.*) 
     1050+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 
     1051+    darwin*) 
     1052+      # if running on 10.5 or later, the deployment target defaults 
     1053+      # to the OS version, if on x86, and 10.4, the deployment 
     1054+      # target defaults to 10.4. Don't you love it? 
     1055+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 
     1056+   10.0,*86*-darwin8*|10.0,*-darwin[91]*) 
     1057+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 
     1058+   10.[012]*) 
     1059+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 
     1060+   10.*) 
     1061+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 
     1062+      esac 
     1063+    ;; 
     1064+  esac 
     1065+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then 
     1066+      _lt_dar_single_mod='$single_module' 
     1067+    fi 
     1068+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then 
     1069+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' 
     1070+    else 
     1071+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" 
     1072+    fi 
     1073+    if test "$DSYMUTIL" != ":"; then 
     1074+      _lt_dsymutil="~$DSYMUTIL \$lib || :" 
     1075+    else 
     1076+      _lt_dsymutil= 
     1077+    fi 
     1078+    ;; 
     1079+  esac 
     1080+ 
     1081+ 
     1082 enable_dlopen=no 
     1083 enable_win32_dll=yes 
     1084  
     1085@@ -7751,7 +8080,7 @@ 
     1086 echo "$lt_simple_link_test_code" >conftest.$ac_ext 
     1087 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err 
     1088 _lt_linker_boilerplate=`cat conftest.err` 
     1089-$rm conftest* 
     1090+$rm -r conftest* 
     1091  
     1092  
     1093  
     1094@@ -7779,11 +8108,11 @@ 
    1981095    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 
    1991096    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 
    2001097    -e 's:$: $lt_compiler_flag:'` 
    2011098-   (eval echo "\"\$as_me:7782: $lt_compile\"" >&5) 
    202 +   (eval echo "\"\$as_me:7794: $lt_compile\"" >&5) 
     1099+   (eval echo "\"\$as_me:8111: $lt_compile\"" >&5) 
    2031100    (eval "$lt_compile" 2>conftest.err) 
    2041101    ac_status=$? 
    2051102    cat conftest.err >&5 
    2061103-   echo "$as_me:7786: \$? = $ac_status" >&5 
    207 +   echo "$as_me:7798: \$? = $ac_status" >&5 
     1104+   echo "$as_me:8115: \$? = $ac_status" >&5 
    2081105    if (exit $ac_status) && test -s "$ac_outfile"; then 
    2091106      # The compiler can only warn and ignore the option if not recognized 
    2101107      # So say no if there are warnings other than the usual output. 
    211 @@ -8069,11 +8081,11 @@ 
     1108@@ -8053,10 +8382,10 @@ 
     1109  
     1110 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 
     1111 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } 
     1112-if test "${lt_prog_compiler_pic_works+set}" = set; then 
     1113+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then 
     1114   echo $ECHO_N "(cached) $ECHO_C" >&6 
     1115 else 
     1116-  lt_prog_compiler_pic_works=no 
     1117+  lt_cv_prog_compiler_pic_works=no 
     1118   ac_outfile=conftest.$ac_objext 
     1119    echo "$lt_simple_compile_test_code" > conftest.$ac_ext 
     1120    lt_compiler_flag="$lt_prog_compiler_pic -DPIC" 
     1121@@ -8069,27 +8398,27 @@ 
    2121122    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 
    2131123    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 
    2141124    -e 's:$: $lt_compiler_flag:'` 
    2151125-   (eval echo "\"\$as_me:8072: $lt_compile\"" >&5) 
    216 +   (eval echo "\"\$as_me:8084: $lt_compile\"" >&5) 
     1126+   (eval echo "\"\$as_me:8401: $lt_compile\"" >&5) 
    2171127    (eval "$lt_compile" 2>conftest.err) 
    2181128    ac_status=$? 
    2191129    cat conftest.err >&5 
    2201130-   echo "$as_me:8076: \$? = $ac_status" >&5 
    221 +   echo "$as_me:8088: \$? = $ac_status" >&5 
     1131+   echo "$as_me:8405: \$? = $ac_status" >&5 
    2221132    if (exit $ac_status) && test -s "$ac_outfile"; then 
    2231133      # The compiler can only warn and ignore the option if not recognized 
    2241134      # So say no if there are warnings other than the usual output. 
    225 @@ -8173,11 +8185,11 @@ 
     1135      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp 
     1136      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 
     1137      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then 
     1138-       lt_prog_compiler_pic_works=yes 
     1139+       lt_cv_prog_compiler_pic_works=yes 
     1140      fi 
     1141    fi 
     1142    $rm conftest* 
     1143  
     1144 fi 
     1145-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 
     1146-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } 
     1147+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 
     1148+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } 
     1149  
     1150-if test x"$lt_prog_compiler_pic_works" = xyes; then 
     1151+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then 
     1152     case $lt_prog_compiler_pic in 
     1153      "" | " "*) ;; 
     1154      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; 
     1155@@ -8116,10 +8445,10 @@ 
     1156 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" 
     1157 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 
     1158 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } 
     1159-if test "${lt_prog_compiler_static_works+set}" = set; then 
     1160+if test "${lt_cv_prog_compiler_static_works+set}" = set; then 
     1161   echo $ECHO_N "(cached) $ECHO_C" >&6 
     1162 else 
     1163-  lt_prog_compiler_static_works=no 
     1164+  lt_cv_prog_compiler_static_works=no 
     1165    save_LDFLAGS="$LDFLAGS" 
     1166    LDFLAGS="$LDFLAGS $lt_tmp_static_flag" 
     1167    echo "$lt_simple_link_test_code" > conftest.$ac_ext 
     1168@@ -8132,20 +8461,20 @@ 
     1169        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp 
     1170        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 
     1171        if diff conftest.exp conftest.er2 >/dev/null; then 
     1172-         lt_prog_compiler_static_works=yes 
     1173+         lt_cv_prog_compiler_static_works=yes 
     1174        fi 
     1175      else 
     1176-       lt_prog_compiler_static_works=yes 
     1177+       lt_cv_prog_compiler_static_works=yes 
     1178      fi 
     1179    fi 
     1180-   $rm conftest* 
     1181+   $rm -r conftest* 
     1182    LDFLAGS="$save_LDFLAGS" 
     1183  
     1184 fi 
     1185-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 
     1186-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } 
     1187+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 
     1188+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } 
     1189  
     1190-if test x"$lt_prog_compiler_static_works" = xyes; then 
     1191+if test x"$lt_cv_prog_compiler_static_works" = xyes; then 
     1192     : 
     1193 else 
     1194     lt_prog_compiler_static= 
     1195@@ -8173,11 +8502,11 @@ 
    2261196    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 
    2271197    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 
    2281198    -e 's:$: $lt_compiler_flag:'` 
    2291199-   (eval echo "\"\$as_me:8176: $lt_compile\"" >&5) 
    230 +   (eval echo "\"\$as_me:8188: $lt_compile\"" >&5) 
     1200+   (eval echo "\"\$as_me:8505: $lt_compile\"" >&5) 
    2311201    (eval "$lt_compile" 2>out/conftest.err) 
    2321202    ac_status=$? 
    2331203    cat out/conftest.err >&5 
    2341204-   echo "$as_me:8180: \$? = $ac_status" >&5 
    235 +   echo "$as_me:8192: \$? = $ac_status" >&5 
     1205+   echo "$as_me:8509: \$? = $ac_status" >&5 
    2361206    if (exit $ac_status) && test -s out/conftest2.$ac_objext 
    2371207    then 
    2381208      # The compiler can only warn and ignore the option if not recognized 
    239 @@ -8437,12 +8449,13 @@ 
     1209@@ -8257,12 +8586,13 @@ 
     1210   # it will be wrapped by ` (' and `)$', so one must not match beginning or 
     1211   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', 
     1212   # as well as any symbol that contains `d'. 
     1213-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_" 
     1214+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 
     1215   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out 
     1216   # platforms (ab)use it in PIC code, but their linkers get confused if 
     1217   # the symbol is explicitly referenced.  Since portable code cannot 
     1218   # rely on this symbol name, it's probably fine to never include it in 
     1219   # preloaded symbol tables. 
     1220+  # Exclude shared library initialization/finalization symbols. 
     1221   extract_expsyms_cmds= 
     1222   # Just being paranoid about ensuring that cc_basename is set. 
     1223   for cc_temp in $compiler""; do 
     1224@@ -8321,7 +8651,7 @@ 
     1225  
     1226     # See if GNU ld supports shared libraries. 
     1227     case $host_os in 
     1228-    aix3* | aix4* | aix5*) 
     1229+    aix[3-9]*) 
     1230       # On AIX/PPC, the GNU linker is very broken 
     1231       if test "$host_cpu" != ia64; then 
     1232        ld_shlibs=no 
     1233@@ -8437,12 +8767,13 @@ 
    2401234   $echo "local: *; };" >> $output_objdir/$libname.ver~ 
    2411235          $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' 
    … …  
    2521246        archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 
    2531247        wlarc= 
    254 @@ -8986,7 +8999,7 @@ 
     1248@@ -8540,7 +8871,7 @@ 
     1249       fi 
     1250       ;; 
     1251  
     1252-    aix4* | aix5*) 
     1253+    aix[4-9]*) 
     1254       if test "$host_cpu" = ia64; then 
     1255        # On IA64, the linker does run time linking by default, so we don't 
     1256        # have to do anything special. 
     1257@@ -8560,7 +8891,7 @@ 
     1258        # Test if we are trying to use run time linking or normal 
     1259        # AIX style linking. If -brtl is somewhere in LDFLAGS, we 
     1260        # need to do runtime linking. 
     1261-       case $host_os in aix4.[23]|aix4.[23].*|aix5*) 
     1262+       case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) 
     1263          for ld_flag in $LDFLAGS; do 
     1264          if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then 
     1265            aix_use_runtimelinking=yes 
     1266@@ -8832,11 +9163,10 @@ 
     1267       link_all_deplibs=yes 
     1268     if test "$GCC" = yes ; then 
     1269        output_verbose_link_cmd='echo' 
     1270-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' 
     1271-      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' 
     1272-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds 
     1273-      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' 
     1274-      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' 
     1275+        archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" 
     1276+        module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 
     1277+        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" 
     1278+        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" 
     1279     else 
     1280       case $cc_basename in 
     1281         xlc*) 
     1282@@ -8986,7 +9316,7 @@ 
    2551283       link_all_deplibs=yes 
    2561284       ;; 
    … …  
    2611289        archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out 
    2621290       else 
    263 @@ -9681,13 +9694,11 @@ 
     1291@@ -9356,7 +9686,7 @@ 
     1292   soname_spec='${libname}${release}${shared_ext}$major' 
     1293   ;; 
     1294  
     1295-aix4* | aix5*) 
     1296+aix[4-9]*) 
     1297   version_type=linux 
     1298   need_lib_prefix=no 
     1299   need_version=no 
     1300@@ -9681,13 +10011,11 @@ 
    2641301   # Some rework will be needed to allow for fast_install 
    2651302   # before this can be enabled. 
    … …  
    2761313  
    2771314   # We used to test for /lib/ld.so.1 and disable shared libraries on 
    278 @@ -9699,6 +9710,18 @@ 
     1315@@ -9699,6 +10027,18 @@ 
    2791316   dynamic_linker='GNU/Linux ld.so' 
    2801317   ;; 
    … …  
    2951332   version_type=sunos 
    2961333   need_lib_prefix=no 
    297 @@ -10524,7 +10547,7 @@ 
     1334@@ -9880,6 +10220,21 @@ 
     1335 echo "${ECHO_T}$dynamic_linker" >&6; } 
     1336 test "$dynamic_linker" = no && can_build_shared=no 
     1337  
     1338+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then 
     1339+  echo $ECHO_N "(cached) $ECHO_C" >&6 
     1340+else 
     1341+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" 
     1342+fi 
     1343+ 
     1344+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 
     1345+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then 
     1346+  echo $ECHO_N "(cached) $ECHO_C" >&6 
     1347+else 
     1348+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" 
     1349+fi 
     1350+ 
     1351+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" 
     1352+ 
     1353 variables_saved_for_relink="PATH $shlibpath_var $runpath_var" 
     1354 if test "$GCC" = yes; then 
     1355   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" 
     1356@@ -10199,7 +10554,7 @@ 
     1357 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 
     1358 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } 
     1359 if test $ac_cv_lib_dld_shl_load = yes; then 
     1360-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" 
     1361+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" 
     1362 else 
     1363   { echo "$as_me:$LINENO: checking for dlopen" >&5 
     1364 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } 
     1365@@ -10475,7 +10830,7 @@ 
     1366 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 
     1367 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } 
     1368 if test $ac_cv_lib_dld_dld_link = yes; then 
     1369-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" 
     1370+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" 
     1371 fi 
     1372  
     1373  
     1374@@ -10524,7 +10879,7 @@ 
    2981375   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 
    2991376   lt_status=$lt_dlunknown 
    3001377   cat > conftest.$ac_ext <<EOF 
    3011378-#line 10527 "configure" 
    302 +#line 10550 "configure" 
     1379+#line 10882 "configure" 
    3031380 #include "confdefs.h" 
    3041381  
    3051382 #if HAVE_DLFCN_H 
    306 @@ -10624,7 +10647,7 @@ 
     1383@@ -10624,7 +10979,7 @@ 
    3071384   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 
    3081385   lt_status=$lt_dlunknown 
    3091386   cat > conftest.$ac_ext <<EOF 
    3101387-#line 10627 "configure" 
    311 +#line 10650 "configure" 
     1388+#line 10982 "configure" 
    3121389 #include "confdefs.h" 
    3131390  
    3141391 #if HAVE_DLFCN_H 
    315 @@ -12234,7 +12257,7 @@ 
     1392@@ -10751,7 +11106,7 @@ 
     1393   fi 
     1394   ;; 
     1395  
     1396-aix4* | aix5*) 
     1397+aix[4-9]*) 
     1398   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then 
     1399     test "$enable_shared" = yes && enable_static=no 
     1400   fi 
     1401@@ -10807,6 +11162,7 @@ 
     1402     predeps \ 
     1403     postdeps \ 
     1404     compiler_lib_search_path \ 
     1405+    compiler_lib_search_dirs \ 
     1406     archive_cmds \ 
     1407     archive_expsym_cmds \ 
     1408     postinstall_cmds \ 
     1409@@ -10867,7 +11223,7 @@ 
     1410 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) 
     1411 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 
     1412 # 
     1413-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 
     1414+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 
     1415 # Free Software Foundation, Inc. 
     1416 # 
     1417 # This file is part of GNU Libtool: 
     1418@@ -11103,6 +11459,10 @@ 
     1419 # shared library. 
     1420 postdeps=$lt_postdeps 
     1421  
     1422+# The directories searched by this compiler when creating a shared 
     1423+# library 
     1424+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs 
     1425+ 
     1426 # The library search path used internally by the compiler when linking 
     1427 # a shared library. 
     1428 compiler_lib_search_path=$lt_compiler_lib_search_path 
     1429@@ -11351,6 +11711,7 @@ 
     1430 predeps_CXX= 
     1431 postdeps_CXX= 
     1432 compiler_lib_search_path_CXX= 
     1433+compiler_lib_search_dirs_CXX= 
     1434  
     1435 # Source file extension for C++ test sources. 
     1436 ac_ext=cpp 
     1437@@ -11388,7 +11749,7 @@ 
     1438 echo "$lt_simple_link_test_code" >conftest.$ac_ext 
     1439 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err 
     1440 _lt_linker_boilerplate=`cat conftest.err` 
     1441-$rm conftest* 
     1442+$rm -r conftest* 
     1443  
     1444  
     1445 # Allow CC to be a program name with arguments. 
     1446@@ -11595,7 +11956,7 @@ 
     1447     # FIXME: insert proper C++ library support 
     1448     ld_shlibs_CXX=no 
     1449     ;; 
     1450-  aix4* | aix5*) 
     1451+  aix[4-9]*) 
     1452     if test "$host_cpu" = ia64; then 
     1453       # On IA64, the linker does run time linking by default, so we don't 
     1454       # have to do anything special. 
     1455@@ -11608,7 +11969,7 @@ 
     1456       # Test if we are trying to use run time linking or normal 
     1457       # AIX style linking. If -brtl is somewhere in LDFLAGS, we 
     1458       # need to do runtime linking. 
     1459-      case $host_os in aix4.[23]|aix4.[23].*|aix5*) 
     1460+      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) 
     1461        for ld_flag in $LDFLAGS; do 
     1462          case $ld_flag in 
     1463          *-brtl*) 
     1464@@ -11866,51 +12227,23 @@ 
     1465     fi 
     1466   ;; 
     1467       darwin* | rhapsody*) 
     1468-        case $host_os in 
     1469-        rhapsody* | darwin1.[012]) 
     1470-         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' 
     1471-         ;; 
     1472-       *) # Darwin 1.3 on 
     1473-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then 
     1474-           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' 
     1475-         else 
     1476-           case ${MACOSX_DEPLOYMENT_TARGET} in 
     1477-             10.[012]) 
     1478-               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' 
     1479-               ;; 
     1480-             10.*) 
     1481-               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' 
     1482-               ;; 
     1483-           esac 
     1484-         fi 
     1485-         ;; 
     1486-        esac 
     1487       archive_cmds_need_lc_CXX=no 
     1488       hardcode_direct_CXX=no 
     1489       hardcode_automatic_CXX=yes 
     1490       hardcode_shlibpath_var_CXX=unsupported 
     1491       whole_archive_flag_spec_CXX='' 
     1492       link_all_deplibs_CXX=yes 
     1493- 
     1494-    if test "$GXX" = yes ; then 
     1495-      lt_int_apple_cc_single_mod=no 
     1496+      allow_undefined_flag_CXX="$_lt_dar_allow_undefined" 
     1497+      if test "$GXX" = yes ; then 
     1498       output_verbose_link_cmd='echo' 
     1499-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then 
     1500-       lt_int_apple_cc_single_mod=yes 
     1501+      archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" 
     1502+      module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 
     1503+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" 
     1504+      module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" 
     1505+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then 
     1506+        archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" 
     1507+        archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" 
     1508       fi 
     1509-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then 
     1510-       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' 
     1511-      else 
     1512-          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' 
     1513-        fi 
     1514-        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' 
     1515-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds 
     1516-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then 
     1517-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' 
     1518-          else 
     1519-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' 
     1520-          fi 
     1521-            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' 
     1522       else 
     1523       case $cc_basename in 
     1524         xlc*) 
     1525@@ -12161,7 +12494,7 @@ 
     1526        export_dynamic_flag_spec_CXX='${wl}--export-dynamic' 
     1527        whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' 
     1528        ;; 
     1529-      pgCC*) 
     1530+      pgCC* | pgcpp*) 
     1531         # Portland Group C++ compiler 
     1532        archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 
     1533        archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' 
     1534@@ -12234,7 +12567,7 @@ 
    3161535        ;; 
    3171536     esac 
    … …  
    3221541       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' 
    3231542       wlarc= 
    324 @@ -12935,7 +12958,7 @@ 
     1543@@ -12568,7 +12901,6 @@ 
     1544 GCC_CXX="$GXX" 
     1545 LD_CXX="$LD" 
     1546  
     1547- 
     1548 cat > conftest.$ac_ext <<EOF 
     1549 class Foo 
     1550 { 
     1551@@ -12670,6 +13002,11 @@ 
     1552  
     1553 $rm -f confest.$objext 
     1554  
     1555+compiler_lib_search_dirs_CXX= 
     1556+if test -n "$compiler_lib_search_path_CXX"; then 
     1557+  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` 
     1558+fi 
     1559+ 
     1560 # PORTME: override above test on systems where it is broken 
     1561 case $host_os in 
     1562 interix[3-9]*) 
     1563@@ -12725,7 +13062,6 @@ 
     1564   ;; 
     1565 esac 
     1566  
     1567- 
     1568 case " $postdeps_CXX " in 
     1569 *" -lc "*) archive_cmds_need_lc_CXX=no ;; 
     1570 esac 
     1571@@ -12801,7 +13137,7 @@ 
     1572     esac 
     1573   else 
     1574     case $host_os in 
     1575-      aix4* | aix5*) 
     1576+      aix[4-9]*) 
     1577        # All AIX code is PIC. 
     1578        if test "$host_cpu" = ia64; then 
     1579          # AIX 5 now supports IA64 processor 
     1580@@ -12897,7 +13233,7 @@ 
     1581            lt_prog_compiler_pic_CXX='-KPIC' 
     1582            lt_prog_compiler_static_CXX='-static' 
     1583            ;; 
     1584-         pgCC*) 
     1585+         pgCC* | pgcpp*) 
     1586            # Portland Group C++ compiler. 
     1587            lt_prog_compiler_wl_CXX='-Wl,' 
     1588            lt_prog_compiler_pic_CXX='-fpic' 
     1589@@ -12935,7 +13271,7 @@ 
    3251590            ;; 
    3261591        esac 
    … …  
    3311596       osf3* | osf4* | osf5*) 
    3321597        case $cc_basename in 
    333 @@ -13044,11 +13067,11 @@ 
     1598@@ -13028,10 +13364,10 @@ 
     1599  
     1600 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 
     1601 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } 
     1602-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then 
     1603+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then 
     1604   echo $ECHO_N "(cached) $ECHO_C" >&6 
     1605 else 
     1606-  lt_prog_compiler_pic_works_CXX=no 
     1607+  lt_cv_prog_compiler_pic_works_CXX=no 
     1608   ac_outfile=conftest.$ac_objext 
     1609    echo "$lt_simple_compile_test_code" > conftest.$ac_ext 
     1610    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" 
     1611@@ -13044,27 +13380,27 @@ 
    3341612    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 
    3351613    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 
    3361614    -e 's:$: $lt_compiler_flag:'` 
    3371615-   (eval echo "\"\$as_me:13047: $lt_compile\"" >&5) 
    338 +   (eval echo "\"\$as_me:13070: $lt_compile\"" >&5) 
     1616+   (eval echo "\"\$as_me:13383: $lt_compile\"" >&5) 
    3391617    (eval "$lt_compile" 2>conftest.err) 
    3401618    ac_status=$? 
    3411619    cat conftest.err >&5 
    3421620-   echo "$as_me:13051: \$? = $ac_status" >&5 
    343 +   echo "$as_me:13074: \$? = $ac_status" >&5 
     1621+   echo "$as_me:13387: \$? = $ac_status" >&5 
    3441622    if (exit $ac_status) && test -s "$ac_outfile"; then 
    3451623      # The compiler can only warn and ignore the option if not recognized 
    3461624      # So say no if there are warnings other than the usual output. 
    347 @@ -13148,11 +13171,11 @@ 
     1625      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp 
     1626      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 
     1627      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then 
     1628-       lt_prog_compiler_pic_works_CXX=yes 
     1629+       lt_cv_prog_compiler_pic_works_CXX=yes 
     1630      fi 
     1631    fi 
     1632    $rm conftest* 
     1633  
     1634 fi 
     1635-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 
     1636-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } 
     1637+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 
     1638+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } 
     1639  
     1640-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then 
     1641+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then 
     1642     case $lt_prog_compiler_pic_CXX in 
     1643      "" | " "*) ;; 
     1644      *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; 
     1645@@ -13091,10 +13427,10 @@ 
     1646 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" 
     1647 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 
     1648 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } 
     1649-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then 
     1650+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then 
     1651   echo $ECHO_N "(cached) $ECHO_C" >&6 
     1652 else 
     1653-  lt_prog_compiler_static_works_CXX=no 
     1654+  lt_cv_prog_compiler_static_works_CXX=no 
     1655    save_LDFLAGS="$LDFLAGS" 
     1656    LDFLAGS="$LDFLAGS $lt_tmp_static_flag" 
     1657    echo "$lt_simple_link_test_code" > conftest.$ac_ext 
     1658@@ -13107,20 +13443,20 @@ 
     1659        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp 
     1660        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 
     1661        if diff conftest.exp conftest.er2 >/dev/null; then 
     1662-         lt_prog_compiler_static_works_CXX=yes 
     1663+         lt_cv_prog_compiler_static_works_CXX=yes 
     1664        fi 
     1665      else 
     1666-       lt_prog_compiler_static_works_CXX=yes 
     1667+       lt_cv_prog_compiler_static_works_CXX=yes 
     1668      fi 
     1669    fi 
     1670-   $rm conftest* 
     1671+   $rm -r conftest* 
     1672    LDFLAGS="$save_LDFLAGS" 
     1673  
     1674 fi 
     1675-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 
     1676-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } 
     1677+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 
     1678+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } 
     1679  
     1680-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then 
     1681+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then 
     1682     : 
     1683 else 
     1684     lt_prog_compiler_static_CXX= 
     1685@@ -13148,11 +13484,11 @@ 
    3481686    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 
    3491687    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 
    3501688    -e 's:$: $lt_compiler_flag:'` 
    3511689-   (eval echo "\"\$as_me:13151: $lt_compile\"" >&5) 
    352 +   (eval echo "\"\$as_me:13174: $lt_compile\"" >&5) 
     1690+   (eval echo "\"\$as_me:13487: $lt_compile\"" >&5) 
    3531691    (eval "$lt_compile" 2>out/conftest.err) 
    3541692    ac_status=$? 
    3551693    cat out/conftest.err >&5 
    3561694-   echo "$as_me:13155: \$? = $ac_status" >&5 
    357 +   echo "$as_me:13178: \$? = $ac_status" >&5 
     1695+   echo "$as_me:13491: \$? = $ac_status" >&5 
    3581696    if (exit $ac_status) && test -s out/conftest2.$ac_objext 
    3591697    then 
    3601698      # The compiler can only warn and ignore the option if not recognized 
    361 @@ -13220,6 +13243,9 @@ 
     1699@@ -13205,7 +13541,7 @@ 
     1700  
     1701   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 
     1702   case $host_os in 
     1703-  aix4* | aix5*) 
     1704+  aix[4-9]*) 
     1705     # If we're using GNU nm, then we don't want the "-C" option. 
     1706     # -C means demangle to AIX nm, but means don't demangle with GNU nm 
     1707     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then 
     1708@@ -13220,10 +13556,14 @@ 
    3621709   cygwin* | mingw*) 
    3631710     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' 
    … …  
    3691716     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 
    3701717   ;; 
    371 @@ -13649,13 +13675,11 @@ 
     1718   esac 
     1719+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 
     1720  
     1721 { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 
     1722 echo "${ECHO_T}$ld_shlibs_CXX" >&6; } 
     1723@@ -13325,7 +13665,7 @@ 
     1724   soname_spec='${libname}${release}${shared_ext}$major' 
     1725   ;; 
     1726  
     1727-aix4* | aix5*) 
     1728+aix[4-9]*) 
     1729   version_type=linux 
     1730   need_lib_prefix=no 
     1731   need_version=no 
     1732@@ -13649,13 +13989,11 @@ 
    3721733   # Some rework will be needed to allow for fast_install 
    3731734   # before this can be enabled. 
    … …  
    3841745  
    3851746   # We used to test for /lib/ld.so.1 and disable shared libraries on 
    386 @@ -13667,6 +13691,18 @@ 
     1747@@ -13667,6 +14005,18 @@ 
    3871748   dynamic_linker='GNU/Linux ld.so' 
    3881749   ;; 
    … …  
    4031764   version_type=sunos 
    4041765   need_lib_prefix=no 
    405 @@ -14712,11 +14748,11 @@ 
     1766@@ -13848,6 +14198,21 @@ 
     1767 echo "${ECHO_T}$dynamic_linker" >&6; } 
     1768 test "$dynamic_linker" = no && can_build_shared=no 
     1769  
     1770+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then 
     1771+  echo $ECHO_N "(cached) $ECHO_C" >&6 
     1772+else 
     1773+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" 
     1774+fi 
     1775+ 
     1776+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 
     1777+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then 
     1778+  echo $ECHO_N "(cached) $ECHO_C" >&6 
     1779+else 
     1780+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" 
     1781+fi 
     1782+ 
     1783+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" 
     1784+ 
     1785 variables_saved_for_relink="PATH $shlibpath_var $runpath_var" 
     1786 if test "$GCC" = yes; then 
     1787   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" 
     1788@@ -13931,6 +14296,7 @@ 
     1789     predeps_CXX \ 
     1790     postdeps_CXX \ 
     1791     compiler_lib_search_path_CXX \ 
     1792+    compiler_lib_search_dirs_CXX \ 
     1793     archive_cmds_CXX \ 
     1794     archive_expsym_cmds_CXX \ 
     1795     postinstall_cmds_CXX \ 
     1796@@ -14179,6 +14545,10 @@ 
     1797 # shared library. 
     1798 postdeps=$lt_postdeps_CXX 
     1799  
     1800+# The directories searched by this compiler when creating a shared 
     1801+# library 
     1802+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX 
     1803+ 
     1804 # The library search path used internally by the compiler when linking 
     1805 # a shared library. 
     1806 compiler_lib_search_path=$lt_compiler_lib_search_path_CXX 
     1807@@ -14393,7 +14763,7 @@ 
     1808 echo "$lt_simple_link_test_code" >conftest.$ac_ext 
     1809 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err 
     1810 _lt_linker_boilerplate=`cat conftest.err` 
     1811-$rm conftest* 
     1812+$rm -r conftest* 
     1813  
     1814  
     1815 # Allow CC to be a program name with arguments. 
     1816@@ -14431,7 +14801,7 @@ 
     1817     postinstall_cmds='$RANLIB $lib' 
     1818   fi 
     1819   ;; 
     1820-aix4* | aix5*) 
     1821+aix[4-9]*) 
     1822   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then 
     1823     test "$enable_shared" = yes && enable_static=no 
     1824   fi 
     1825@@ -14696,10 +15066,10 @@ 
     1826  
     1827 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 
     1828 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } 
     1829-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then 
     1830+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then 
     1831   echo $ECHO_N "(cached) $ECHO_C" >&6 
     1832 else 
     1833-  lt_prog_compiler_pic_works_F77=no 
     1834+  lt_cv_prog_compiler_pic_works_F77=no 
     1835   ac_outfile=conftest.$ac_objext 
     1836    echo "$lt_simple_compile_test_code" > conftest.$ac_ext 
     1837    lt_compiler_flag="$lt_prog_compiler_pic_F77" 
     1838@@ -14712,27 +15082,27 @@ 
    4061839    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 
    4071840    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 
    4081841    -e 's:$: $lt_compiler_flag:'` 
    4091842-   (eval echo "\"\$as_me:14715: $lt_compile\"" >&5) 
    410 +   (eval echo "\"\$as_me:14751: $lt_compile\"" >&5) 
     1843+   (eval echo "\"\$as_me:15085: $lt_compile\"" >&5) 
    4111844    (eval "$lt_compile" 2>conftest.err) 
    4121845    ac_status=$? 
    4131846    cat conftest.err >&5 
    4141847-   echo "$as_me:14719: \$? = $ac_status" >&5 
    415 +   echo "$as_me:14755: \$? = $ac_status" >&5 
     1848+   echo "$as_me:15089: \$? = $ac_status" >&5 
    4161849    if (exit $ac_status) && test -s "$ac_outfile"; then 
    4171850      # The compiler can only warn and ignore the option if not recognized 
    4181851      # So say no if there are warnings other than the usual output. 
    419 @@ -14816,11 +14852,11 @@ 
     1852      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp 
     1853      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 
     1854      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then 
     1855-       lt_prog_compiler_pic_works_F77=yes 
     1856+       lt_cv_prog_compiler_pic_works_F77=yes 
     1857      fi 
     1858    fi 
     1859    $rm conftest* 
     1860  
     1861 fi 
     1862-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 
     1863-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } 
     1864+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 
     1865+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } 
     1866  
     1867-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then 
     1868+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then 
     1869     case $lt_prog_compiler_pic_F77 in 
     1870      "" | " "*) ;; 
     1871      *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; 
     1872@@ -14759,10 +15129,10 @@ 
     1873 wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" 
     1874 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 
     1875 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } 
     1876-if test "${lt_prog_compiler_static_works_F77+set}" = set; then 
     1877+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then 
     1878   echo $ECHO_N "(cached) $ECHO_C" >&6 
     1879 else 
     1880-  lt_prog_compiler_static_works_F77=no 
     1881+  lt_cv_prog_compiler_static_works_F77=no 
     1882    save_LDFLAGS="$LDFLAGS" 
     1883    LDFLAGS="$LDFLAGS $lt_tmp_static_flag" 
     1884    echo "$lt_simple_link_test_code" > conftest.$ac_ext 
     1885@@ -14775,20 +15145,20 @@ 
     1886        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp 
     1887        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 
     1888        if diff conftest.exp conftest.er2 >/dev/null; then 
     1889-         lt_prog_compiler_static_works_F77=yes 
     1890+         lt_cv_prog_compiler_static_works_F77=yes 
     1891        fi 
     1892      else 
     1893-       lt_prog_compiler_static_works_F77=yes 
     1894+       lt_cv_prog_compiler_static_works_F77=yes 
     1895      fi 
     1896    fi 
     1897-   $rm conftest* 
     1898+   $rm -r conftest* 
     1899    LDFLAGS="$save_LDFLAGS" 
     1900  
     1901 fi 
     1902-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 
     1903-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } 
     1904+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 
     1905+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } 
     1906  
     1907-if test x"$lt_prog_compiler_static_works_F77" = xyes; then 
     1908+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then 
     1909     : 
     1910 else 
     1911     lt_prog_compiler_static_F77= 
     1912@@ -14816,11 +15186,11 @@ 
    4201913    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 
    4211914    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 
    4221915    -e 's:$: $lt_compiler_flag:'` 
    4231916-   (eval echo "\"\$as_me:14819: $lt_compile\"" >&5) 
    424 +   (eval echo "\"\$as_me:14855: $lt_compile\"" >&5) 
     1917+   (eval echo "\"\$as_me:15189: $lt_compile\"" >&5) 
    4251918    (eval "$lt_compile" 2>out/conftest.err) 
    4261919    ac_status=$? 
    4271920    cat out/conftest.err >&5 
    4281921-   echo "$as_me:14823: \$? = $ac_status" >&5 
    429 +   echo "$as_me:14859: \$? = $ac_status" >&5 
     1922+   echo "$as_me:15193: \$? = $ac_status" >&5 
    4301923    if (exit $ac_status) && test -s out/conftest2.$ac_objext 
    4311924    then 
    4321925      # The compiler can only warn and ignore the option if not recognized 
    433 @@ -15080,12 +15116,13 @@ 
     1926@@ -14900,12 +15270,13 @@ 
     1927   # it will be wrapped by ` (' and `)$', so one must not match beginning or 
     1928   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', 
     1929   # as well as any symbol that contains `d'. 
     1930-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" 
     1931+  exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 
     1932   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out 
     1933   # platforms (ab)use it in PIC code, but their linkers get confused if 
     1934   # the symbol is explicitly referenced.  Since portable code cannot 
     1935   # rely on this symbol name, it's probably fine to never include it in 
     1936   # preloaded symbol tables. 
     1937+  # Exclude shared library initialization/finalization symbols. 
     1938   extract_expsyms_cmds= 
     1939   # Just being paranoid about ensuring that cc_basename is set. 
     1940   for cc_temp in $compiler""; do 
     1941@@ -14964,7 +15335,7 @@ 
     1942  
     1943     # See if GNU ld supports shared libraries. 
     1944     case $host_os in 
     1945-    aix3* | aix4* | aix5*) 
     1946+    aix[3-9]*) 
     1947       # On AIX/PPC, the GNU linker is very broken 
     1948       if test "$host_cpu" != ia64; then 
     1949        ld_shlibs_F77=no 
     1950@@ -15080,12 +15451,13 @@ 
    4341951   $echo "local: *; };" >> $output_objdir/$libname.ver~ 
    4351952          $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' 
    … …  
    4461963        archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 
    4471964        wlarc= 
    448 @@ -15609,7 +15646,7 @@ 
     1965@@ -15183,7 +15555,7 @@ 
     1966       fi 
     1967       ;; 
     1968  
     1969-    aix4* | aix5*) 
     1970+    aix[4-9]*) 
     1971       if test "$host_cpu" = ia64; then 
     1972        # On IA64, the linker does run time linking by default, so we don't 
     1973        # have to do anything special. 
     1974@@ -15203,7 +15575,7 @@ 
     1975        # Test if we are trying to use run time linking or normal 
     1976        # AIX style linking. If -brtl is somewhere in LDFLAGS, we 
     1977        # need to do runtime linking. 
     1978-       case $host_os in aix4.[23]|aix4.[23].*|aix5*) 
     1979+       case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) 
     1980          for ld_flag in $LDFLAGS; do 
     1981          if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then 
     1982            aix_use_runtimelinking=yes 
     1983@@ -15455,11 +15827,10 @@ 
     1984       link_all_deplibs_F77=yes 
     1985     if test "$GCC" = yes ; then 
     1986        output_verbose_link_cmd='echo' 
     1987-        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' 
     1988-      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' 
     1989-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds 
     1990-      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' 
     1991-      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' 
     1992+        archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" 
     1993+        module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 
     1994+        archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" 
     1995+        module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" 
     1996     else 
     1997       case $cc_basename in 
     1998         xlc*) 
     1999@@ -15609,7 +15980,7 @@ 
    4492000       link_all_deplibs_F77=yes 
    4502001       ;; 
    … …  
    4552006        archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out 
    4562007       else 
    457 @@ -16252,13 +16289,11 @@ 
     2008@@ -15928,7 +16299,7 @@ 
     2009   soname_spec='${libname}${release}${shared_ext}$major' 
     2010   ;; 
     2011  
     2012-aix4* | aix5*) 
     2013+aix[4-9]*) 
     2014   version_type=linux 
     2015   need_lib_prefix=no 
     2016   need_version=no 
     2017@@ -16252,13 +16623,11 @@ 
    4582018   # Some rework will be needed to allow for fast_install 
    4592019   # before this can be enabled. 
    … …  
    4702030  
    4712031   # We used to test for /lib/ld.so.1 and disable shared libraries on 
    472 @@ -16270,6 +16305,18 @@ 
     2032@@ -16270,6 +16639,18 @@ 
    4732033   dynamic_linker='GNU/Linux ld.so' 
    4742034   ;; 
    … …  
    4892049   version_type=sunos 
    4902050   need_lib_prefix=no 
    491 @@ -17005,11 +17052,11 @@ 
     2051@@ -16451,6 +16832,21 @@ 
     2052 echo "${ECHO_T}$dynamic_linker" >&6; } 
     2053 test "$dynamic_linker" = no && can_build_shared=no 
     2054  
     2055+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then 
     2056+  echo $ECHO_N "(cached) $ECHO_C" >&6 
     2057+else 
     2058+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" 
     2059+fi 
     2060+ 
     2061+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 
     2062+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then 
     2063+  echo $ECHO_N "(cached) $ECHO_C" >&6 
     2064+else 
     2065+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" 
     2066+fi 
     2067+ 
     2068+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" 
     2069+ 
     2070 variables_saved_for_relink="PATH $shlibpath_var $runpath_var" 
     2071 if test "$GCC" = yes; then 
     2072   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" 
     2073@@ -16534,6 +16930,7 @@ 
     2074     predeps_F77 \ 
     2075     postdeps_F77 \ 
     2076     compiler_lib_search_path_F77 \ 
     2077+    compiler_lib_search_dirs_F77 \ 
     2078     archive_cmds_F77 \ 
     2079     archive_expsym_cmds_F77 \ 
     2080     postinstall_cmds_F77 \ 
     2081@@ -16782,6 +17179,10 @@ 
     2082 # shared library. 
     2083 postdeps=$lt_postdeps_F77 
     2084  
     2085+# The directories searched by this compiler when creating a shared 
     2086+# library 
     2087+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 
     2088+ 
     2089 # The library search path used internally by the compiler when linking 
     2090 # a shared library. 
     2091 compiler_lib_search_path=$lt_compiler_lib_search_path_F77 
     2092@@ -16956,7 +17357,7 @@ 
     2093 echo "$lt_simple_link_test_code" >conftest.$ac_ext 
     2094 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err 
     2095 _lt_linker_boilerplate=`cat conftest.err` 
     2096-$rm conftest* 
     2097+$rm -r conftest* 
     2098  
     2099  
     2100 # Allow CC to be a program name with arguments. 
     2101@@ -17005,11 +17406,11 @@ 
    4922102    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 
    4932103    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 
    4942104    -e 's:$: $lt_compiler_flag:'` 
    4952105-   (eval echo "\"\$as_me:17008: $lt_compile\"" >&5) 
    496 +   (eval echo "\"\$as_me:17055: $lt_compile\"" >&5) 
     2106+   (eval echo "\"\$as_me:17409: $lt_compile\"" >&5) 
    4972107    (eval "$lt_compile" 2>conftest.err) 
    4982108    ac_status=$? 
    4992109    cat conftest.err >&5 
    5002110-   echo "$as_me:17012: \$? = $ac_status" >&5 
    501 +   echo "$as_me:17059: \$? = $ac_status" >&5 
     2111+   echo "$as_me:17413: \$? = $ac_status" >&5 
    5022112    if (exit $ac_status) && test -s "$ac_outfile"; then 
    5032113      # The compiler can only warn and ignore the option if not recognized 
    5042114      # So say no if there are warnings other than the usual output. 
    505 @@ -17295,11 +17342,11 @@ 
     2115@@ -17069,7 +17470,7 @@ 
     2116       # built for inclusion in a dll (and should export symbols for example). 
     2117       # Although the cygwin gcc ignores -fPIC, still need this for old-style 
     2118       # (--disable-auto-import) libraries 
     2119-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' 
     2120+ 
     2121       ;; 
     2122  
     2123     darwin* | rhapsody*) 
     2124@@ -17139,7 +17540,7 @@ 
     2125     mingw* | cygwin* | pw32* | os2*) 
     2126       # This hack is so that the source file can tell whether it is being 
     2127       # built for inclusion in a dll (and should export symbols for example). 
     2128-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' 
     2129+ 
     2130       ;; 
     2131  
     2132     hpux9* | hpux10* | hpux11*) 
     2133@@ -17279,10 +17680,10 @@ 
     2134  
     2135 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 
     2136 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } 
     2137-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then 
     2138+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then 
     2139   echo $ECHO_N "(cached) $ECHO_C" >&6 
     2140 else 
     2141-  lt_prog_compiler_pic_works_GCJ=no 
     2142+  lt_cv_prog_compiler_pic_works_GCJ=no 
     2143   ac_outfile=conftest.$ac_objext 
     2144    echo "$lt_simple_compile_test_code" > conftest.$ac_ext 
     2145    lt_compiler_flag="$lt_prog_compiler_pic_GCJ" 
     2146@@ -17295,27 +17696,27 @@ 
    5062147    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 
    5072148    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 
    5082149    -e 's:$: $lt_compiler_flag:'` 
    5092150-   (eval echo "\"\$as_me:17298: $lt_compile\"" >&5) 
    510 +   (eval echo "\"\$as_me:17345: $lt_compile\"" >&5) 
     2151+   (eval echo "\"\$as_me:17699: $lt_compile\"" >&5) 
    5112152    (eval "$lt_compile" 2>conftest.err) 
    5122153    ac_status=$? 
    5132154    cat conftest.err >&5 
    5142155-   echo "$as_me:17302: \$? = $ac_status" >&5 
    515 +   echo "$as_me:17349: \$? = $ac_status" >&5 
     2156+   echo "$as_me:17703: \$? = $ac_status" >&5 
    5162157    if (exit $ac_status) && test -s "$ac_outfile"; then 
    5172158      # The compiler can only warn and ignore the option if not recognized 
    5182159      # So say no if there are warnings other than the usual output. 
    519 @@ -17399,11 +17446,11 @@ 
     2160      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp 
     2161      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 
     2162      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then 
     2163-       lt_prog_compiler_pic_works_GCJ=yes 
     2164+       lt_cv_prog_compiler_pic_works_GCJ=yes 
     2165      fi 
     2166    fi 
     2167    $rm conftest* 
     2168  
     2169 fi 
     2170-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 
     2171-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } 
     2172+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 
     2173+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } 
     2174  
     2175-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then 
     2176+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then 
     2177     case $lt_prog_compiler_pic_GCJ in 
     2178      "" | " "*) ;; 
     2179      *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; 
     2180@@ -17342,10 +17743,10 @@ 
     2181 wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" 
     2182 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 
     2183 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } 
     2184-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then 
     2185+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then 
     2186   echo $ECHO_N "(cached) $ECHO_C" >&6 
     2187 else 
     2188-  lt_prog_compiler_static_works_GCJ=no 
     2189+  lt_cv_prog_compiler_static_works_GCJ=no 
     2190    save_LDFLAGS="$LDFLAGS" 
     2191    LDFLAGS="$LDFLAGS $lt_tmp_static_flag" 
     2192    echo "$lt_simple_link_test_code" > conftest.$ac_ext 
     2193@@ -17358,20 +17759,20 @@ 
     2194        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp 
     2195        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 
     2196        if diff conftest.exp conftest.er2 >/dev/null; then 
     2197-         lt_prog_compiler_static_works_GCJ=yes 
     2198+         lt_cv_prog_compiler_static_works_GCJ=yes 
     2199        fi 
     2200      else 
     2201-       lt_prog_compiler_static_works_GCJ=yes 
     2202+       lt_cv_prog_compiler_static_works_GCJ=yes 
     2203      fi 
     2204    fi 
     2205-   $rm conftest* 
     2206+   $rm -r conftest* 
     2207    LDFLAGS="$save_LDFLAGS" 
     2208  
     2209 fi 
     2210-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 
     2211-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } 
     2212+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 
     2213+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } 
     2214  
     2215-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then 
     2216+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then 
     2217     : 
     2218 else 
     2219     lt_prog_compiler_static_GCJ= 
     2220@@ -17399,11 +17800,11 @@ 
    5202221    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 
    5212222    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 
    5222223    -e 's:$: $lt_compiler_flag:'` 
    5232224-   (eval echo "\"\$as_me:17402: $lt_compile\"" >&5) 
    524 +   (eval echo "\"\$as_me:17449: $lt_compile\"" >&5) 
     2225+   (eval echo "\"\$as_me:17803: $lt_compile\"" >&5) 
    5252226    (eval "$lt_compile" 2>out/conftest.err) 
    5262227    ac_status=$? 
    5272228    cat out/conftest.err >&5 
    5282229-   echo "$as_me:17406: \$? = $ac_status" >&5 
    529 +   echo "$as_me:17453: \$? = $ac_status" >&5 
     2230+   echo "$as_me:17807: \$? = $ac_status" >&5 
    5302231    if (exit $ac_status) && test -s out/conftest2.$ac_objext 
    5312232    then 
    5322233      # The compiler can only warn and ignore the option if not recognized 
    533 @@ -17663,12 +17710,13 @@ 
     2234@@ -17483,12 +17884,13 @@ 
     2235   # it will be wrapped by ` (' and `)$', so one must not match beginning or 
     2236   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', 
     2237   # as well as any symbol that contains `d'. 
     2238-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" 
     2239+  exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 
     2240   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out 
     2241   # platforms (ab)use it in PIC code, but their linkers get confused if 
     2242   # the symbol is explicitly referenced.  Since portable code cannot 
     2243   # rely on this symbol name, it's probably fine to never include it in 
     2244   # preloaded symbol tables. 
     2245+  # Exclude shared library initialization/finalization symbols. 
     2246   extract_expsyms_cmds= 
     2247   # Just being paranoid about ensuring that cc_basename is set. 
     2248   for cc_temp in $compiler""; do 
     2249@@ -17547,7 +17949,7 @@ 
     2250  
     2251     # See if GNU ld supports shared libraries. 
     2252     case $host_os in 
     2253-    aix3* | aix4* | aix5*) 
     2254+    aix[3-9]*) 
     2255       # On AIX/PPC, the GNU linker is very broken 
     2256       if test "$host_cpu" != ia64; then 
     2257        ld_shlibs_GCJ=no 
     2258@@ -17663,12 +18065,13 @@ 
    5342259   $echo "local: *; };" >> $output_objdir/$libname.ver~ 
    5352260          $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' 
    … …  
    5462271        archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 
    5472272        wlarc= 
    548 @@ -18212,7 +18260,7 @@ 
     2273@@ -17766,7 +18169,7 @@ 
     2274       fi 
     2275       ;; 
     2276  
     2277-    aix4* | aix5*) 
     2278+    aix[4-9]*) 
     2279       if test "$host_cpu" = ia64; then 
     2280        # On IA64, the linker does run time linking by default, so we don't 
     2281        # have to do anything special. 
     2282@@ -17786,7 +18189,7 @@ 
     2283        # Test if we are trying to use run time linking or normal 
     2284        # AIX style linking. If -brtl is somewhere in LDFLAGS, we 
     2285        # need to do runtime linking. 
     2286-       case $host_os in aix4.[23]|aix4.[23].*|aix5*) 
     2287+       case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) 
     2288          for ld_flag in $LDFLAGS; do 
     2289          if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then 
     2290            aix_use_runtimelinking=yes 
     2291@@ -18058,11 +18461,10 @@ 
     2292       link_all_deplibs_GCJ=yes 
     2293     if test "$GCC" = yes ; then 
     2294        output_verbose_link_cmd='echo' 
     2295-        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' 
     2296-      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' 
     2297-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds 
     2298-      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' 
     2299-      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' 
     2300+        archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" 
     2301+        module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 
     2302+        archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" 
     2303+        module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" 
     2304     else 
     2305       case $cc_basename in 
     2306         xlc*) 
     2307@@ -18212,7 +18614,7 @@ 
    5492308       link_all_deplibs_GCJ=yes 
    5502309       ;; 
    … …  
    5552314        archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out 
    5562315       else 
    557 @@ -18855,13 +18903,11 @@ 
     2316@@ -18531,7 +18933,7 @@ 
     2317   soname_spec='${libname}${release}${shared_ext}$major' 
     2318   ;; 
     2319  
     2320-aix4* | aix5*) 
     2321+aix[4-9]*) 
     2322   version_type=linux 
     2323   need_lib_prefix=no 
     2324   need_version=no 
     2325@@ -18855,13 +19257,11 @@ 
    5582326   # Some rework will be needed to allow for fast_install 
    5592327   # before this can be enabled. 
    … …  
    5702338  
    5712339   # We used to test for /lib/ld.so.1 and disable shared libraries on 
    572 @@ -18873,6 +18919,18 @@ 
     2340@@ -18873,6 +19273,18 @@ 
    5732341   dynamic_linker='GNU/Linux ld.so' 
    5742342   ;; 
    … …  
    5892357   version_type=sunos 
    5902358   need_lib_prefix=no 
    591 @@ -24002,7 +24060,7 @@ 
    592   
     2359@@ -19054,6 +19466,21 @@ 
     2360 echo "${ECHO_T}$dynamic_linker" >&6; } 
     2361 test "$dynamic_linker" = no && can_build_shared=no 
     2362  
     2363+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then 
     2364+  echo $ECHO_N "(cached) $ECHO_C" >&6 
     2365+else 
     2366+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" 
     2367+fi 
     2368+ 
     2369+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 
     2370+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then 
     2371+  echo $ECHO_N "(cached) $ECHO_C" >&6 
     2372+else 
     2373+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" 
     2374+fi 
     2375+ 
     2376+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" 
     2377+ 
     2378 variables_saved_for_relink="PATH $shlibpath_var $runpath_var" 
     2379 if test "$GCC" = yes; then 
     2380   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" 
     2381@@ -19137,6 +19564,7 @@ 
     2382     predeps_GCJ \ 
     2383     postdeps_GCJ \ 
     2384     compiler_lib_search_path_GCJ \ 
     2385+    compiler_lib_search_dirs_GCJ \ 
     2386     archive_cmds_GCJ \ 
     2387     archive_expsym_cmds_GCJ \ 
     2388     postinstall_cmds_GCJ \ 
     2389@@ -19385,6 +19813,10 @@ 
     2390 # shared library. 
     2391 postdeps=$lt_postdeps_GCJ 
     2392  
     2393+# The directories searched by this compiler when creating a shared 
     2394+# library 
     2395+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ 
     2396+ 
     2397 # The library search path used internally by the compiler when linking 
     2398 # a shared library. 
     2399 compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ 
     2400@@ -19558,7 +19990,7 @@ 
     2401 echo "$lt_simple_link_test_code" >conftest.$ac_ext 
     2402 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err 
     2403 _lt_linker_boilerplate=`cat conftest.err` 
     2404-$rm conftest* 
     2405+$rm -r conftest* 
     2406  
     2407  
     2408 # Allow CC to be a program name with arguments. 
     2409@@ -19618,6 +20050,7 @@ 
     2410     predeps_RC \ 
     2411     postdeps_RC \ 
     2412     compiler_lib_search_path_RC \ 
     2413+    compiler_lib_search_dirs_RC \ 
     2414     archive_cmds_RC \ 
     2415     archive_expsym_cmds_RC \ 
     2416     postinstall_cmds_RC \ 
     2417@@ -19866,6 +20299,10 @@ 
     2418 # shared library. 
     2419 postdeps=$lt_postdeps_RC 
     2420  
     2421+# The directories searched by this compiler when creating a shared 
     2422+# library 
     2423+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC 
     2424+ 
     2425 # The library search path used internally by the compiler when linking 
     2426 # a shared library. 
     2427 compiler_lib_search_path=$lt_compiler_lib_search_path_RC 
     2428@@ -21330,10 +21767,11 @@ 
     2429 { echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 
     2430 echo $ECHO_N "checking for BASE_DEPENDENCIES... $ECHO_C" >&6; } 
     2431  
     2432-if test -n "$BASE_DEPENDENCIES_CFLAGS"; then 
     2433-    pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" 
     2434- elif test -n "$PKG_CONFIG"; then 
     2435-    if test -n "$PKG_CONFIG" && \ 
     2436+if test -n "$PKG_CONFIG"; then 
     2437+    if test -n "$BASE_DEPENDENCIES_CFLAGS"; then 
     2438+        pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" 
     2439+    else 
     2440+        if test -n "$PKG_CONFIG" && \ 
     2441     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.13.5    atk >= 1.9.0    pango >= 1.17.3    cairo >= 1.2.0\"") >&5 
     2442   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.13.5    atk >= 1.9.0    pango >= 1.17.3    cairo >= 1.2.0") 2>&5 
     2443   ac_status=$? 
     2444@@ -21343,13 +21781,15 @@ 
     2445 else 
     2446   pkg_failed=yes 
    5932447 fi 
    594  if test -n "$PKG_CONFIG"; then 
    595 -       _pkg_min_version=0.16 
    596 +       _pkg_min_version=0.7 
    597         { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 
    598  echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } 
    599         if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then 
    600 @@ -32444,8 +32502,18 @@ 
     2448- else 
     2449-    pkg_failed=untried 
     2450+    fi 
     2451+else 
     2452+       pkg_failed=untried 
     2453 fi 
     2454-if test -n "$BASE_DEPENDENCIES_LIBS"; then 
     2455-    pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" 
     2456- elif test -n "$PKG_CONFIG"; then 
     2457-    if test -n "$PKG_CONFIG" && \ 
     2458+if test -n "$PKG_CONFIG"; then 
     2459+    if test -n "$BASE_DEPENDENCIES_LIBS"; then 
     2460+        pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" 
     2461+    else 
     2462+        if test -n "$PKG_CONFIG" && \ 
     2463     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.13.5    atk >= 1.9.0    pango >= 1.17.3    cairo >= 1.2.0\"") >&5 
     2464   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.13.5    atk >= 1.9.0    pango >= 1.17.3    cairo >= 1.2.0") 2>&5 
     2465   ac_status=$? 
     2466@@ -21359,8 +21799,9 @@ 
     2467 else 
     2468   pkg_failed=yes 
     2469 fi 
     2470- else 
     2471-    pkg_failed=untried 
     2472+    fi 
     2473+else 
     2474+       pkg_failed=untried 
     2475 fi 
     2476  
     2477  
     2478@@ -21373,9 +21814,9 @@ 
     2479         _pkg_short_errors_supported=no 
     2480 fi 
     2481         if test $_pkg_short_errors_supported = yes; then 
     2482-               BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.13.5    atk >= 1.9.0    pango >= 1.17.3    cairo >= 1.2.0" 2>&1` 
     2483+               BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.13.5    atk >= 1.9.0    pango >= 1.17.3    cairo >= 1.2.0"` 
     2484         else 
     2485-               BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.13.5    atk >= 1.9.0    pango >= 1.17.3    cairo >= 1.2.0" 2>&1` 
     2486+               BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.13.5    atk >= 1.9.0    pango >= 1.17.3    cairo >= 1.2.0"` 
     2487         fi 
     2488        # Put the nasty error message in config.log where it belongs 
     2489        echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5 
     2490@@ -32440,8 +32881,18 @@ 
    6012491   if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then 
    6022492       { echo "$as_me:$LINENO: result: found" >&5 
    … …  
    6192509       { { echo "$as_me:$LINENO: error: 
    6202510 *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend 
    621 @@ -32581,20 +32649,21 @@ 
     2511@@ -32577,20 +33028,21 @@ 
    6222512 CFLAGS="$saved_cflags" 
    6232513 LDFLAGS="$saved_ldflags" 
    … …  
    6462536  
    6472537  
    648 @@ -32604,6 +32673,7 @@ 
     2538@@ -32600,6 +33052,7 @@ 
    6492539  
    6502540  
    … …  
    6542544 # Check for Accessibility Toolkit flags 
    6552545 ######################################## 
    656 @@ -32709,7 +32779,7 @@ 
     2546@@ -32705,7 +33158,7 @@ 
    6572547 CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" 
    6582548  
    … …  
    6632553  
    6642554  
    665 @@ -33894,6 +33964,13 @@ 
     2555@@ -33890,6 +34343,13 @@ 
    6662556 Usually this means the macro was only invoked conditionally." >&2;} 
    6672557    { (exit 1); exit 1; }; } 
    … …  
    6772567   { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. 
    6782568 Usually this means the macro was only invoked conditionally." >&5 
    679 @@ -34964,9 +35041,9 @@ 
     2569@@ -34960,9 +35420,9 @@ 
    6802570 CCDEPMODE!$CCDEPMODE$ac_delim 
    6812571 am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim 
    … …  
    6892579  
    6902580   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then 
    691 @@ -35008,6 +35085,8 @@ 
     2581@@ -35004,6 +35464,8 @@ 
    6922582 ac_delim='%!_!# ' 
    6932583 for ac_last_try in false false false false false :; do 
    … …  
    6982588 am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim 
    6992589 am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim 
    700 @@ -35103,8 +35182,6 @@ 
     2590@@ -35018,6 +35480,8 @@ 
     2591 ECHO!$ECHO$ac_delim 
     2592 AR!$AR$ac_delim 
     2593 RANLIB!$RANLIB$ac_delim 
     2594+DSYMUTIL!$DSYMUTIL$ac_delim 
     2595+NMEDIT!$NMEDIT$ac_delim 
     2596 DLLTOOL!$DLLTOOL$ac_delim 
     2597 AS!$AS$ac_delim 
     2598 OBJDUMP!$OBJDUMP$ac_delim 
     2599@@ -35097,10 +35561,6 @@ 
     2600 INCLUDE_ICO_TRUE!$INCLUDE_ICO_TRUE$ac_delim 
     2601 INCLUDE_ICO_FALSE!$INCLUDE_ICO_FALSE$ac_delim 
    7012602 INCLUDE_ANI_TRUE!$INCLUDE_ANI_TRUE$ac_delim 
    702  INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim 
    703  INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim 
     2603-INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim 
     2604-INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim 
    7042605-INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim 
    7052606-INCLUDE_PNM_TRUE!$INCLUDE_PNM_TRUE$ac_delim 
    … …  
    7072608  
    7082609   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then 
    709 @@ -35146,6 +35223,8 @@ 
     2610@@ -35142,6 +35602,10 @@ 
    7102611 ac_delim='%!_!# ' 
    7112612 for ac_last_try in false false false false false :; do 
    7122613   cat >conf$$subs.sed <<_ACEOF 
     2614+INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim 
     2615+INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim 
    7132616+INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim 
    7142617+INCLUDE_PNM_TRUE!$INCLUDE_PNM_TRUE$ac_delim 
    … …  
    7162619 INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim 
    7172620 INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim 
    718 @@ -35199,6 +35278,7 @@ 
     2621@@ -35195,6 +35659,7 @@ 
    7192622 USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim 
    7202623 USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim 
    … …  
    7242627 GDK_EXTRA_CFLAGS!$GDK_EXTRA_CFLAGS$ac_delim 
    7252628 GDK_DEP_LIBS!$GDK_DEP_LIBS$ac_delim 
    726 @@ -35240,9 +35320,6 @@ 
     2629@@ -35234,11 +35699,6 @@ 
     2630 DB2HTML!$DB2HTML$ac_delim 
     2631 HAVE_DOCBOOK_TRUE!$HAVE_DOCBOOK_TRUE$ac_delim 
    7272632 HAVE_DOCBOOK_FALSE!$HAVE_DOCBOOK_FALSE$ac_delim 
    728  XSLTPROC!$XSLTPROC$ac_delim 
    729  XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim 
     2633-XSLTPROC!$XSLTPROC$ac_delim 
     2634-XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim 
    7302635-XMLCATALOG!$XMLCATALOG$ac_delim 
    7312636-ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim 
    … …  
    7342639  
    7352640   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then 
    736 @@ -35284,11 +35361,14 @@ 
     2641@@ -35280,11 +35740,16 @@ 
    7372642 ac_delim='%!_!# ' 
    7382643 for ac_last_try in false false false false false :; do 
    7392644   cat >conf$$subs.sed <<_ACEOF 
     2645+XSLTPROC!$XSLTPROC$ac_delim 
     2646+XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim 
    7402647+XMLCATALOG!$XMLCATALOG$ac_delim 
    7412648+ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim 
    … …  
    7462653  
    7472654-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then 
    748 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then 
     2655+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then 
    7492656     break 
    7502657   elif $ac_last_try; then 
    7512658     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 
    752 --- a/contrib/gdk-pixbuf-xlib/Makefile.in       2008-01-29 10:05:20.000000000 +0100 
    753 +++ b/contrib/gdk-pixbuf-xlib/Makefile.in       2008-01-29 10:05:43.000000000 +0100 
    754 @@ -89,6 +89,8 @@ 
     2659diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.12.8/contrib/gdk-pixbuf-xlib/Makefile.in 
     2660--- gtk+2.0-2.12.8.old/contrib/gdk-pixbuf-xlib/Makefile.in      2008-02-12 18:58:31.000000000 +0100 
     2661+++ gtk+2.0-2.12.8/contrib/gdk-pixbuf-xlib/Makefile.in  2008-02-13 09:22:42.000000000 +0100 
     2662@@ -80,6 +80,7 @@ 
     2663 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     2664 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     2665 DLLTOOL = @DLLTOOL@ 
     2666+DSYMUTIL = @DSYMUTIL@ 
     2667 ECHO = @ECHO@ 
     2668 ECHO_C = @ECHO_C@ 
     2669 ECHO_N = @ECHO_N@ 
     2670@@ -89,6 +90,8 @@ 
    7552671 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    7562672 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    7612677 F77 = @F77@ 
    7622678 FFLAGS = @FFLAGS@ 
    763 @@ -112,6 +114,7 @@ 
     2679@@ -112,6 +115,7 @@ 
    7642680 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    7652681 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    7692685 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    7702686 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    771 --- a/contrib/Makefile.in       2008-01-29 10:05:20.000000000 +0100 
    772 +++ b/contrib/Makefile.in       2008-01-29 10:05:43.000000000 +0100 
    773 @@ -90,6 +90,8 @@ 
     2687@@ -219,6 +223,7 @@ 
     2688 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     2689 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     2690 NM = @NM@ 
     2691+NMEDIT = @NMEDIT@ 
     2692 OBJDUMP = @OBJDUMP@ 
     2693 OBJEXT = @OBJEXT@ 
     2694 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     2695diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/contrib/Makefile.in gtk+2.0-2.12.8/contrib/Makefile.in 
     2696--- gtk+2.0-2.12.8.old/contrib/Makefile.in      2008-02-12 18:58:31.000000000 +0100 
     2697+++ gtk+2.0-2.12.8/contrib/Makefile.in  2008-02-13 09:22:42.000000000 +0100 
     2698@@ -81,6 +81,7 @@ 
     2699 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     2700 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     2701 DLLTOOL = @DLLTOOL@ 
     2702+DSYMUTIL = @DSYMUTIL@ 
     2703 ECHO = @ECHO@ 
     2704 ECHO_C = @ECHO_C@ 
     2705 ECHO_N = @ECHO_N@ 
     2706@@ -90,6 +91,8 @@ 
    7742707 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    7752708 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    7802713 F77 = @F77@ 
    7812714 FFLAGS = @FFLAGS@ 
    782 @@ -113,6 +115,7 @@ 
     2715@@ -113,6 +116,7 @@ 
    7832716 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    7842717 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    7882721 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    7892722 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    790 --- a/demos/gtk-demo/Makefile.in        2008-01-29 10:05:20.000000000 +0100 
    791 +++ b/demos/gtk-demo/Makefile.in        2008-01-29 10:05:43.000000000 +0100 
    792 @@ -89,6 +89,8 @@ 
     2723@@ -220,6 +224,7 @@ 
     2724 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     2725 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     2726 NM = @NM@ 
     2727+NMEDIT = @NMEDIT@ 
     2728 OBJDUMP = @OBJDUMP@ 
     2729 OBJEXT = @OBJEXT@ 
     2730 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     2731diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/demos/gtk-demo/Makefile.in gtk+2.0-2.12.8/demos/gtk-demo/Makefile.in 
     2732--- gtk+2.0-2.12.8.old/demos/gtk-demo/Makefile.in       2008-02-12 18:58:31.000000000 +0100 
     2733+++ gtk+2.0-2.12.8/demos/gtk-demo/Makefile.in   2008-02-13 09:22:42.000000000 +0100 
     2734@@ -80,6 +80,7 @@ 
     2735 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     2736 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     2737 DLLTOOL = @DLLTOOL@ 
     2738+DSYMUTIL = @DSYMUTIL@ 
     2739 ECHO = @ECHO@ 
     2740 ECHO_C = @ECHO_C@ 
     2741 ECHO_N = @ECHO_N@ 
     2742@@ -89,6 +90,8 @@ 
    7932743 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    7942744 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    7992749 F77 = @F77@ 
    8002750 FFLAGS = @FFLAGS@ 
    801 @@ -112,6 +114,7 @@ 
     2751@@ -112,6 +115,7 @@ 
    8022752 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    8032753 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    8072757 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    8082758 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    809 --- a/demos/Makefile.in 2008-01-29 10:05:20.000000000 +0100 
    810 +++ b/demos/Makefile.in 2008-01-29 10:05:43.000000000 +0100 
    811 @@ -90,6 +90,8 @@ 
     2759@@ -219,6 +223,7 @@ 
     2760 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     2761 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     2762 NM = @NM@ 
     2763+NMEDIT = @NMEDIT@ 
     2764 OBJDUMP = @OBJDUMP@ 
     2765 OBJEXT = @OBJEXT@ 
     2766 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     2767diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/demos/Makefile.in gtk+2.0-2.12.8/demos/Makefile.in 
     2768--- gtk+2.0-2.12.8.old/demos/Makefile.in        2008-02-12 18:58:31.000000000 +0100 
     2769+++ gtk+2.0-2.12.8/demos/Makefile.in    2008-02-13 09:22:42.000000000 +0100 
     2770@@ -81,6 +81,7 @@ 
     2771 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     2772 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     2773 DLLTOOL = @DLLTOOL@ 
     2774+DSYMUTIL = @DSYMUTIL@ 
     2775 ECHO = @ECHO@ 
     2776 ECHO_C = @ECHO_C@ 
     2777 ECHO_N = @ECHO_N@ 
     2778@@ -90,6 +91,8 @@ 
    8122779 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    8132780 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    8182785 F77 = @F77@ 
    8192786 FFLAGS = @FFLAGS@ 
    820 @@ -113,6 +115,7 @@ 
     2787@@ -113,6 +116,7 @@ 
    8212788 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    8222789 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    8262793 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    8272794 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    828 --- a/docs/faq/Makefile.in      2008-01-29 10:05:20.000000000 +0100 
    829 +++ b/docs/faq/Makefile.in      2008-01-29 10:05:43.000000000 +0100 
    830 @@ -89,6 +89,8 @@ 
     2795@@ -220,6 +224,7 @@ 
     2796 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     2797 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     2798 NM = @NM@ 
     2799+NMEDIT = @NMEDIT@ 
     2800 OBJDUMP = @OBJDUMP@ 
     2801 OBJEXT = @OBJEXT@ 
     2802 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     2803diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/faq/Makefile.in gtk+2.0-2.12.8/docs/faq/Makefile.in 
     2804--- gtk+2.0-2.12.8.old/docs/faq/Makefile.in     2008-02-12 18:58:31.000000000 +0100 
     2805+++ gtk+2.0-2.12.8/docs/faq/Makefile.in 2008-02-13 09:22:43.000000000 +0100 
     2806@@ -80,6 +80,7 @@ 
     2807 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     2808 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     2809 DLLTOOL = @DLLTOOL@ 
     2810+DSYMUTIL = @DSYMUTIL@ 
     2811 ECHO = @ECHO@ 
     2812 ECHO_C = @ECHO_C@ 
     2813 ECHO_N = @ECHO_N@ 
     2814@@ -89,6 +90,8 @@ 
    8312815 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    8322816 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    8372821 F77 = @F77@ 
    8382822 FFLAGS = @FFLAGS@ 
    839 @@ -112,6 +114,7 @@ 
     2823@@ -112,6 +115,7 @@ 
    8402824 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    8412825 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    8452829 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    8462830 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    847 --- a/docs/Makefile.in  2008-01-29 10:05:20.000000000 +0100 
    848 +++ b/docs/Makefile.in  2008-01-29 10:05:43.000000000 +0100 
    849 @@ -89,6 +89,8 @@ 
     2831@@ -219,6 +223,7 @@ 
     2832 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     2833 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     2834 NM = @NM@ 
     2835+NMEDIT = @NMEDIT@ 
     2836 OBJDUMP = @OBJDUMP@ 
     2837 OBJEXT = @OBJEXT@ 
     2838 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     2839diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/Makefile.in gtk+2.0-2.12.8/docs/Makefile.in 
     2840--- gtk+2.0-2.12.8.old/docs/Makefile.in 2008-02-12 18:58:31.000000000 +0100 
     2841+++ gtk+2.0-2.12.8/docs/Makefile.in     2008-02-13 09:22:43.000000000 +0100 
     2842@@ -80,6 +80,7 @@ 
     2843 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     2844 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     2845 DLLTOOL = @DLLTOOL@ 
     2846+DSYMUTIL = @DSYMUTIL@ 
     2847 ECHO = @ECHO@ 
     2848 ECHO_C = @ECHO_C@ 
     2849 ECHO_N = @ECHO_N@ 
     2850@@ -89,6 +90,8 @@ 
    8502851 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    8512852 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    8562857 F77 = @F77@ 
    8572858 FFLAGS = @FFLAGS@ 
    858 @@ -112,6 +114,7 @@ 
     2859@@ -112,6 +115,7 @@ 
    8592860 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    8602861 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    8642865 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    8652866 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    866 --- a/docs/reference/gdk/Makefile.in    2008-01-29 10:05:20.000000000 +0100 
    867 +++ b/docs/reference/gdk/Makefile.in    2008-01-29 10:05:43.000000000 +0100 
    868 @@ -95,6 +95,8 @@ 
     2867@@ -219,6 +223,7 @@ 
     2868 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     2869 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     2870 NM = @NM@ 
     2871+NMEDIT = @NMEDIT@ 
     2872 OBJDUMP = @OBJDUMP@ 
     2873 OBJEXT = @OBJEXT@ 
     2874 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     2875diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/reference/gdk/Makefile.in gtk+2.0-2.12.8/docs/reference/gdk/Makefile.in 
     2876--- gtk+2.0-2.12.8.old/docs/reference/gdk/Makefile.in   2008-02-12 18:58:31.000000000 +0100 
     2877+++ gtk+2.0-2.12.8/docs/reference/gdk/Makefile.in       2008-02-13 09:22:43.000000000 +0100 
     2878@@ -86,6 +86,7 @@ 
     2879 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     2880 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     2881 DLLTOOL = @DLLTOOL@ 
     2882+DSYMUTIL = @DSYMUTIL@ 
     2883 ECHO = @ECHO@ 
     2884 ECHO_C = @ECHO_C@ 
     2885 ECHO_N = @ECHO_N@ 
     2886@@ -95,6 +96,8 @@ 
    8692887 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    8702888 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    8752893 F77 = @F77@ 
    8762894 FFLAGS = @FFLAGS@ 
    877 @@ -118,6 +120,7 @@ 
     2895@@ -118,6 +121,7 @@ 
    8782896 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    8792897 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    8832901 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    8842902 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    885 --- a/docs/reference/gdk-pixbuf/Makefile.in     2008-01-29 10:05:20.000000000 +0100 
    886 +++ b/docs/reference/gdk-pixbuf/Makefile.in     2008-01-29 10:05:43.000000000 +0100 
    887 @@ -95,6 +95,8 @@ 
     2903@@ -225,6 +229,7 @@ 
     2904 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     2905 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     2906 NM = @NM@ 
     2907+NMEDIT = @NMEDIT@ 
     2908 OBJDUMP = @OBJDUMP@ 
     2909 OBJEXT = @OBJEXT@ 
     2910 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     2911diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.12.8/docs/reference/gdk-pixbuf/Makefile.in 
     2912--- gtk+2.0-2.12.8.old/docs/reference/gdk-pixbuf/Makefile.in    2008-02-12 18:58:31.000000000 +0100 
     2913+++ gtk+2.0-2.12.8/docs/reference/gdk-pixbuf/Makefile.in        2008-02-13 09:22:43.000000000 +0100 
     2914@@ -86,6 +86,7 @@ 
     2915 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     2916 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     2917 DLLTOOL = @DLLTOOL@ 
     2918+DSYMUTIL = @DSYMUTIL@ 
     2919 ECHO = @ECHO@ 
     2920 ECHO_C = @ECHO_C@ 
     2921 ECHO_N = @ECHO_N@ 
     2922@@ -95,6 +96,8 @@ 
    8882923 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    8892924 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    8942929 F77 = @F77@ 
    8952930 FFLAGS = @FFLAGS@ 
    896 @@ -118,6 +120,7 @@ 
     2931@@ -118,6 +121,7 @@ 
    8972932 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    8982933 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    9022937 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    9032938 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    904 --- a/docs/reference/gtk/Makefile.in    2008-01-29 10:05:20.000000000 +0100 
    905 +++ b/docs/reference/gtk/Makefile.in    2008-01-29 10:05:43.000000000 +0100 
    906 @@ -95,6 +95,8 @@ 
     2939@@ -225,6 +229,7 @@ 
     2940 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     2941 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     2942 NM = @NM@ 
     2943+NMEDIT = @NMEDIT@ 
     2944 OBJDUMP = @OBJDUMP@ 
     2945 OBJEXT = @OBJEXT@ 
     2946 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     2947diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/reference/gtk/Makefile.in gtk+2.0-2.12.8/docs/reference/gtk/Makefile.in 
     2948--- gtk+2.0-2.12.8.old/docs/reference/gtk/Makefile.in   2008-02-12 18:58:31.000000000 +0100 
     2949+++ gtk+2.0-2.12.8/docs/reference/gtk/Makefile.in       2008-02-13 09:22:43.000000000 +0100 
     2950@@ -86,6 +86,7 @@ 
     2951 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     2952 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     2953 DLLTOOL = @DLLTOOL@ 
     2954+DSYMUTIL = @DSYMUTIL@ 
     2955 ECHO = @ECHO@ 
     2956 ECHO_C = @ECHO_C@ 
     2957 ECHO_N = @ECHO_N@ 
     2958@@ -95,6 +96,8 @@ 
    9072959 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    9082960 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    9132965 F77 = @F77@ 
    9142966 FFLAGS = @FFLAGS@ 
    915 @@ -118,6 +120,7 @@ 
     2967@@ -118,6 +121,7 @@ 
    9162968 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    9172969 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    9212973 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    9222974 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    923 --- a/docs/reference/Makefile.in        2008-01-29 10:05:20.000000000 +0100 
    924 +++ b/docs/reference/Makefile.in        2008-01-29 10:05:43.000000000 +0100 
    925 @@ -89,6 +89,8 @@ 
     2975@@ -225,6 +229,7 @@ 
     2976 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     2977 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     2978 NM = @NM@ 
     2979+NMEDIT = @NMEDIT@ 
     2980 OBJDUMP = @OBJDUMP@ 
     2981 OBJEXT = @OBJEXT@ 
     2982 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     2983diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/reference/Makefile.in gtk+2.0-2.12.8/docs/reference/Makefile.in 
     2984--- gtk+2.0-2.12.8.old/docs/reference/Makefile.in       2008-02-12 18:58:31.000000000 +0100 
     2985+++ gtk+2.0-2.12.8/docs/reference/Makefile.in   2008-02-13 09:22:43.000000000 +0100 
     2986@@ -80,6 +80,7 @@ 
     2987 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     2988 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     2989 DLLTOOL = @DLLTOOL@ 
     2990+DSYMUTIL = @DSYMUTIL@ 
     2991 ECHO = @ECHO@ 
     2992 ECHO_C = @ECHO_C@ 
     2993 ECHO_N = @ECHO_N@ 
     2994@@ -89,6 +90,8 @@ 
    9262995 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    9272996 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    9323001 F77 = @F77@ 
    9333002 FFLAGS = @FFLAGS@ 
    934 @@ -112,6 +114,7 @@ 
     3003@@ -112,6 +115,7 @@ 
    9353004 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    9363005 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    9403009 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    9413010 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    942 --- a/docs/tools/Makefile.in    2008-01-29 10:05:20.000000000 +0100 
    943 +++ b/docs/tools/Makefile.in    2008-01-29 10:05:43.000000000 +0100 
    944 @@ -89,6 +89,8 @@ 
     3011@@ -219,6 +223,7 @@ 
     3012 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3013 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3014 NM = @NM@ 
     3015+NMEDIT = @NMEDIT@ 
     3016 OBJDUMP = @OBJDUMP@ 
     3017 OBJEXT = @OBJEXT@ 
     3018 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3019diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/tools/Makefile.in gtk+2.0-2.12.8/docs/tools/Makefile.in 
     3020--- gtk+2.0-2.12.8.old/docs/tools/Makefile.in   2008-02-12 18:58:31.000000000 +0100 
     3021+++ gtk+2.0-2.12.8/docs/tools/Makefile.in       2008-02-13 09:22:43.000000000 +0100 
     3022@@ -80,6 +80,7 @@ 
     3023 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3024 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3025 DLLTOOL = @DLLTOOL@ 
     3026+DSYMUTIL = @DSYMUTIL@ 
     3027 ECHO = @ECHO@ 
     3028 ECHO_C = @ECHO_C@ 
     3029 ECHO_N = @ECHO_N@ 
     3030@@ -89,6 +90,8 @@ 
    9453031 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    9463032 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    9513037 F77 = @F77@ 
    9523038 FFLAGS = @FFLAGS@ 
    953 @@ -112,6 +114,7 @@ 
     3039@@ -112,6 +115,7 @@ 
    9543040 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    9553041 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    9593045 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    9603046 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    961 --- a/docs/tutorial/Makefile.in 2008-01-29 10:05:20.000000000 +0100 
    962 +++ b/docs/tutorial/Makefile.in 2008-01-29 10:05:43.000000000 +0100 
    963 @@ -89,6 +89,8 @@ 
     3047@@ -219,6 +223,7 @@ 
     3048 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3049 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3050 NM = @NM@ 
     3051+NMEDIT = @NMEDIT@ 
     3052 OBJDUMP = @OBJDUMP@ 
     3053 OBJEXT = @OBJEXT@ 
     3054 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3055diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/tutorial/Makefile.in gtk+2.0-2.12.8/docs/tutorial/Makefile.in 
     3056--- gtk+2.0-2.12.8.old/docs/tutorial/Makefile.in        2008-02-12 18:58:32.000000000 +0100 
     3057+++ gtk+2.0-2.12.8/docs/tutorial/Makefile.in    2008-02-13 09:22:43.000000000 +0100 
     3058@@ -80,6 +80,7 @@ 
     3059 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3060 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3061 DLLTOOL = @DLLTOOL@ 
     3062+DSYMUTIL = @DSYMUTIL@ 
     3063 ECHO = @ECHO@ 
     3064 ECHO_C = @ECHO_C@ 
     3065 ECHO_N = @ECHO_N@ 
     3066@@ -89,6 +90,8 @@ 
    9643067 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    9653068 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    9703073 F77 = @F77@ 
    9713074 FFLAGS = @FFLAGS@ 
    972 @@ -112,6 +114,7 @@ 
     3075@@ -112,6 +115,7 @@ 
    9733076 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    9743077 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    9783081 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    9793082 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    980 --- a/gdk/directfb/Makefile.in  2008-01-29 10:05:20.000000000 +0100 
    981 +++ b/gdk/directfb/Makefile.in  2008-01-29 10:05:43.000000000 +0100 
    982 @@ -89,6 +89,8 @@ 
     3083@@ -219,6 +223,7 @@ 
     3084 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3085 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3086 NM = @NM@ 
     3087+NMEDIT = @NMEDIT@ 
     3088 OBJDUMP = @OBJDUMP@ 
     3089 OBJEXT = @OBJEXT@ 
     3090 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3091diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk/directfb/Makefile.in gtk+2.0-2.12.8/gdk/directfb/Makefile.in 
     3092--- gtk+2.0-2.12.8.old/gdk/directfb/Makefile.in 2008-02-12 18:58:32.000000000 +0100 
     3093+++ gtk+2.0-2.12.8/gdk/directfb/Makefile.in     2008-02-13 09:22:44.000000000 +0100 
     3094@@ -80,6 +80,7 @@ 
     3095 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3096 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3097 DLLTOOL = @DLLTOOL@ 
     3098+DSYMUTIL = @DSYMUTIL@ 
     3099 ECHO = @ECHO@ 
     3100 ECHO_C = @ECHO_C@ 
     3101 ECHO_N = @ECHO_N@ 
     3102@@ -89,6 +90,8 @@ 
    9833103 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    9843104 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    9893109 F77 = @F77@ 
    9903110 FFLAGS = @FFLAGS@ 
    991 @@ -112,6 +114,7 @@ 
     3111@@ -112,6 +115,7 @@ 
    9923112 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    9933113 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    9973117 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    9983118 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    999 --- a/gdk/Makefile.in   2008-01-29 10:05:20.000000000 +0100 
    1000 +++ b/gdk/Makefile.in   2008-01-29 10:05:43.000000000 +0100 
    1001 @@ -89,6 +89,8 @@ 
     3119@@ -219,6 +223,7 @@ 
     3120 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3121 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3122 NM = @NM@ 
     3123+NMEDIT = @NMEDIT@ 
     3124 OBJDUMP = @OBJDUMP@ 
     3125 OBJEXT = @OBJEXT@ 
     3126 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3127diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk/Makefile.in gtk+2.0-2.12.8/gdk/Makefile.in 
     3128--- gtk+2.0-2.12.8.old/gdk/Makefile.in  2008-02-12 18:58:32.000000000 +0100 
     3129+++ gtk+2.0-2.12.8/gdk/Makefile.in      2008-02-13 09:22:44.000000000 +0100 
     3130@@ -80,6 +80,7 @@ 
     3131 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3132 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3133 DLLTOOL = @DLLTOOL@ 
     3134+DSYMUTIL = @DSYMUTIL@ 
     3135 ECHO = @ECHO@ 
     3136 ECHO_C = @ECHO_C@ 
     3137 ECHO_N = @ECHO_N@ 
     3138@@ -89,6 +90,8 @@ 
    10023139 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    10033140 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    10083145 F77 = @F77@ 
    10093146 FFLAGS = @FFLAGS@ 
    1010 @@ -112,6 +114,7 @@ 
     3147@@ -112,6 +115,7 @@ 
    10113148 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    10123149 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    10163153 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    10173154 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1018 --- a/gdk/quartz/Makefile.in    2008-01-29 10:05:20.000000000 +0100 
    1019 +++ b/gdk/quartz/Makefile.in    2008-01-29 10:05:43.000000000 +0100 
    1020 @@ -89,6 +89,8 @@ 
     3155@@ -219,6 +223,7 @@ 
     3156 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3157 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3158 NM = @NM@ 
     3159+NMEDIT = @NMEDIT@ 
     3160 OBJDUMP = @OBJDUMP@ 
     3161 OBJEXT = @OBJEXT@ 
     3162 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3163diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk/quartz/Makefile.in gtk+2.0-2.12.8/gdk/quartz/Makefile.in 
     3164--- gtk+2.0-2.12.8.old/gdk/quartz/Makefile.in   2008-02-12 18:58:32.000000000 +0100 
     3165+++ gtk+2.0-2.12.8/gdk/quartz/Makefile.in       2008-02-13 09:22:45.000000000 +0100 
     3166@@ -80,6 +80,7 @@ 
     3167 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3168 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3169 DLLTOOL = @DLLTOOL@ 
     3170+DSYMUTIL = @DSYMUTIL@ 
     3171 ECHO = @ECHO@ 
     3172 ECHO_C = @ECHO_C@ 
     3173 ECHO_N = @ECHO_N@ 
     3174@@ -89,6 +90,8 @@ 
    10213175 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    10223176 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    10273181 F77 = @F77@ 
    10283182 FFLAGS = @FFLAGS@ 
    1029 @@ -112,6 +114,7 @@ 
     3183@@ -112,6 +115,7 @@ 
    10303184 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    10313185 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    10353189 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    10363190 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1037 --- a/gdk/win32/Makefile.in     2008-01-29 10:05:20.000000000 +0100 
    1038 +++ b/gdk/win32/Makefile.in     2008-01-29 10:05:43.000000000 +0100 
    1039 @@ -89,6 +89,8 @@ 
     3191@@ -219,6 +223,7 @@ 
     3192 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3193 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3194 NM = @NM@ 
     3195+NMEDIT = @NMEDIT@ 
     3196 OBJDUMP = @OBJDUMP@ 
     3197 OBJEXT = @OBJEXT@ 
     3198 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3199diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk/win32/Makefile.in gtk+2.0-2.12.8/gdk/win32/Makefile.in 
     3200--- gtk+2.0-2.12.8.old/gdk/win32/Makefile.in    2008-02-12 18:58:32.000000000 +0100 
     3201+++ gtk+2.0-2.12.8/gdk/win32/Makefile.in        2008-02-13 09:22:45.000000000 +0100 
     3202@@ -80,6 +80,7 @@ 
     3203 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3204 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3205 DLLTOOL = @DLLTOOL@ 
     3206+DSYMUTIL = @DSYMUTIL@ 
     3207 ECHO = @ECHO@ 
     3208 ECHO_C = @ECHO_C@ 
     3209 ECHO_N = @ECHO_N@ 
     3210@@ -89,6 +90,8 @@ 
    10403211 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    10413212 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    10463217 F77 = @F77@ 
    10473218 FFLAGS = @FFLAGS@ 
    1048 @@ -112,6 +114,7 @@ 
     3219@@ -112,6 +115,7 @@ 
    10493220 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    10503221 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    10543225 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    10553226 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1056 --- a/gdk/win32/rc/Makefile.in  2008-01-29 10:05:20.000000000 +0100 
    1057 +++ b/gdk/win32/rc/Makefile.in  2008-01-29 10:05:43.000000000 +0100 
    1058 @@ -89,6 +89,8 @@ 
     3227@@ -219,6 +223,7 @@ 
     3228 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3229 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3230 NM = @NM@ 
     3231+NMEDIT = @NMEDIT@ 
     3232 OBJDUMP = @OBJDUMP@ 
     3233 OBJEXT = @OBJEXT@ 
     3234 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3235diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk/win32/rc/Makefile.in gtk+2.0-2.12.8/gdk/win32/rc/Makefile.in 
     3236--- gtk+2.0-2.12.8.old/gdk/win32/rc/Makefile.in 2008-02-12 18:58:32.000000000 +0100 
     3237+++ gtk+2.0-2.12.8/gdk/win32/rc/Makefile.in     2008-02-13 09:22:45.000000000 +0100 
     3238@@ -80,6 +80,7 @@ 
     3239 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3240 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3241 DLLTOOL = @DLLTOOL@ 
     3242+DSYMUTIL = @DSYMUTIL@ 
     3243 ECHO = @ECHO@ 
     3244 ECHO_C = @ECHO_C@ 
     3245 ECHO_N = @ECHO_N@ 
     3246@@ -89,6 +90,8 @@ 
    10593247 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    10603248 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    10653253 F77 = @F77@ 
    10663254 FFLAGS = @FFLAGS@ 
    1067 @@ -112,6 +114,7 @@ 
     3255@@ -112,6 +115,7 @@ 
    10683256 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    10693257 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    10733261 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    10743262 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1075 --- a/gdk/x11/Makefile.in       2008-01-29 10:05:20.000000000 +0100 
    1076 +++ b/gdk/x11/Makefile.in       2008-01-29 10:05:43.000000000 +0100 
    1077 @@ -91,6 +91,8 @@ 
     3263@@ -219,6 +223,7 @@ 
     3264 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3265 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3266 NM = @NM@ 
     3267+NMEDIT = @NMEDIT@ 
     3268 OBJDUMP = @OBJDUMP@ 
     3269 OBJEXT = @OBJEXT@ 
     3270 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3271diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk/x11/Makefile.in gtk+2.0-2.12.8/gdk/x11/Makefile.in 
     3272--- gtk+2.0-2.12.8.old/gdk/x11/Makefile.in      2008-02-12 18:58:32.000000000 +0100 
     3273+++ gtk+2.0-2.12.8/gdk/x11/Makefile.in  2008-02-13 09:22:45.000000000 +0100 
     3274@@ -82,6 +82,7 @@ 
     3275 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3276 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3277 DLLTOOL = @DLLTOOL@ 
     3278+DSYMUTIL = @DSYMUTIL@ 
     3279 ECHO = @ECHO@ 
     3280 ECHO_C = @ECHO_C@ 
     3281 ECHO_N = @ECHO_N@ 
     3282@@ -91,6 +92,8 @@ 
    10783283 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    10793284 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    10843289 F77 = @F77@ 
    10853290 FFLAGS = @FFLAGS@ 
    1086 @@ -114,6 +116,7 @@ 
     3291@@ -114,6 +117,7 @@ 
    10873292 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    10883293 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    10923297 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    10933298 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1094 --- a/gdk-pixbuf/Makefile.in    2008-01-29 10:05:20.000000000 +0100 
    1095 +++ b/gdk-pixbuf/Makefile.in    2008-01-29 10:05:43.000000000 +0100 
    1096 @@ -89,6 +89,8 @@ 
     3299@@ -221,6 +225,7 @@ 
     3300 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3301 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3302 NM = @NM@ 
     3303+NMEDIT = @NMEDIT@ 
     3304 OBJDUMP = @OBJDUMP@ 
     3305 OBJEXT = @OBJEXT@ 
     3306 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3307diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk-pixbuf/Makefile.in gtk+2.0-2.12.8/gdk-pixbuf/Makefile.in 
     3308--- gtk+2.0-2.12.8.old/gdk-pixbuf/Makefile.in   2008-02-12 18:58:32.000000000 +0100 
     3309+++ gtk+2.0-2.12.8/gdk-pixbuf/Makefile.in       2008-02-13 09:22:44.000000000 +0100 
     3310@@ -80,6 +80,7 @@ 
     3311 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3312 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3313 DLLTOOL = @DLLTOOL@ 
     3314+DSYMUTIL = @DSYMUTIL@ 
     3315 ECHO = @ECHO@ 
     3316 ECHO_C = @ECHO_C@ 
     3317 ECHO_N = @ECHO_N@ 
     3318@@ -89,6 +90,8 @@ 
    10973319 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    10983320 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    11033325 F77 = @F77@ 
    11043326 FFLAGS = @FFLAGS@ 
    1105 @@ -112,6 +114,7 @@ 
     3327@@ -112,6 +115,7 @@ 
    11063328 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    11073329 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    11113333 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    11123334 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1113 --- a/gdk-pixbuf/pixops/Makefile.in     2008-01-29 10:05:20.000000000 +0100 
    1114 +++ b/gdk-pixbuf/pixops/Makefile.in     2008-01-29 10:05:43.000000000 +0100 
    1115 @@ -89,6 +89,8 @@ 
     3335@@ -219,6 +223,7 @@ 
     3336 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3337 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3338 NM = @NM@ 
     3339+NMEDIT = @NMEDIT@ 
     3340 OBJDUMP = @OBJDUMP@ 
     3341 OBJEXT = @OBJEXT@ 
     3342 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3343diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.12.8/gdk-pixbuf/pixops/Makefile.in 
     3344--- gtk+2.0-2.12.8.old/gdk-pixbuf/pixops/Makefile.in    2008-02-12 18:58:32.000000000 +0100 
     3345+++ gtk+2.0-2.12.8/gdk-pixbuf/pixops/Makefile.in        2008-02-13 09:22:44.000000000 +0100 
     3346@@ -80,6 +80,7 @@ 
     3347 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3348 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3349 DLLTOOL = @DLLTOOL@ 
     3350+DSYMUTIL = @DSYMUTIL@ 
     3351 ECHO = @ECHO@ 
     3352 ECHO_C = @ECHO_C@ 
     3353 ECHO_N = @ECHO_N@ 
     3354@@ -89,6 +90,8 @@ 
    11163355 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    11173356 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    11223361 F77 = @F77@ 
    11233362 FFLAGS = @FFLAGS@ 
    1124 @@ -112,6 +114,7 @@ 
     3363@@ -112,6 +115,7 @@ 
    11253364 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    11263365 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    11303369 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    11313370 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1132 --- a/gtk/Makefile.in   2008-01-29 10:05:20.000000000 +0100 
    1133 +++ b/gtk/Makefile.in   2008-01-29 10:05:43.000000000 +0100 
    1134 @@ -113,6 +113,8 @@ 
     3371@@ -219,6 +223,7 @@ 
     3372 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3373 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3374 NM = @NM@ 
     3375+NMEDIT = @NMEDIT@ 
     3376 OBJDUMP = @OBJDUMP@ 
     3377 OBJEXT = @OBJEXT@ 
     3378 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3379diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gtk/Makefile.in gtk+2.0-2.12.8/gtk/Makefile.in 
     3380--- gtk+2.0-2.12.8.old/gtk/Makefile.in  2008-02-12 18:58:33.000000000 +0100 
     3381+++ gtk+2.0-2.12.8/gtk/Makefile.in      2008-02-13 09:22:46.000000000 +0100 
     3382@@ -104,6 +104,7 @@ 
     3383 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3384 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3385 DLLTOOL = @DLLTOOL@ 
     3386+DSYMUTIL = @DSYMUTIL@ 
     3387 ECHO = @ECHO@ 
     3388 ECHO_C = @ECHO_C@ 
     3389 ECHO_N = @ECHO_N@ 
     3390@@ -113,6 +114,8 @@ 
    11353391 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    11363392 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    11413397 F77 = @F77@ 
    11423398 FFLAGS = @FFLAGS@ 
    1143 @@ -136,6 +138,7 @@ 
     3399@@ -136,6 +139,7 @@ 
    11443400 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    11453401 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    11493405 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    11503406 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1151 @@ -379,6 +382,8 @@ 
     3407@@ -243,6 +247,7 @@ 
     3408 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3409 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3410 NM = @NM@ 
     3411+NMEDIT = @NMEDIT@ 
     3412 OBJDUMP = @OBJDUMP@ 
     3413 OBJEXT = @OBJEXT@ 
     3414 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3415@@ -379,6 +384,8 @@ 
    11523416        -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \ 
    11533417        -DGDK_PIXBUF_DISABLE_DEPRECATED                 \ 
    … …  
    11583422        -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED          \ 
    11593423        $(GTK_DEBUG_FLAGS)                              \ 
    1160 @@ -634,13 +639,16 @@ 
     3424@@ -634,13 +641,16 @@ 
    11613425 # that are not included in gtk/gtk.h 
    11623426 gtk_semi_private_h_sources = \ 
    … …  
    11783442        gtksearchenginetracker.h\ 
    11793443        gtksearchenginesimple.h \ 
    1180 @@ -650,10 +658,7 @@ 
     3444@@ -650,10 +660,7 @@ 
    11813445        gtkfilechooserdefault.h \ 
    11823446        gtkfilechooserembed.h   \ 
    … …  
    11893453        gtkhsv.h                \ 
    11903454        gtkiconcache.h          \ 
    1191 --- a/gtk/theme-bits/Makefile.in        2008-01-29 10:05:20.000000000 +0100 
    1192 +++ b/gtk/theme-bits/Makefile.in        2008-01-29 10:05:43.000000000 +0100 
    1193 @@ -89,6 +89,8 @@ 
     3455diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gtk/theme-bits/Makefile.in gtk+2.0-2.12.8/gtk/theme-bits/Makefile.in 
     3456--- gtk+2.0-2.12.8.old/gtk/theme-bits/Makefile.in       2008-02-12 18:58:33.000000000 +0100 
     3457+++ gtk+2.0-2.12.8/gtk/theme-bits/Makefile.in   2008-02-13 09:22:46.000000000 +0100 
     3458@@ -80,6 +80,7 @@ 
     3459 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3460 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3461 DLLTOOL = @DLLTOOL@ 
     3462+DSYMUTIL = @DSYMUTIL@ 
     3463 ECHO = @ECHO@ 
     3464 ECHO_C = @ECHO_C@ 
     3465 ECHO_N = @ECHO_N@ 
     3466@@ -89,6 +90,8 @@ 
    11943467 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    11953468 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    12003473 F77 = @F77@ 
    12013474 FFLAGS = @FFLAGS@ 
    1202 @@ -112,6 +114,7 @@ 
     3475@@ -112,6 +115,7 @@ 
    12033476 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    12043477 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    12083481 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    12093482 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1210 --- a/gtk/xdgmime/Makefile.in   2008-01-29 10:05:20.000000000 +0100 
    1211 +++ b/gtk/xdgmime/Makefile.in   2008-01-29 10:05:43.000000000 +0100 
    1212 @@ -89,6 +89,8 @@ 
     3483@@ -219,6 +223,7 @@ 
     3484 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3485 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3486 NM = @NM@ 
     3487+NMEDIT = @NMEDIT@ 
     3488 OBJDUMP = @OBJDUMP@ 
     3489 OBJEXT = @OBJEXT@ 
     3490 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3491diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gtk/xdgmime/Makefile.in gtk+2.0-2.12.8/gtk/xdgmime/Makefile.in 
     3492--- gtk+2.0-2.12.8.old/gtk/xdgmime/Makefile.in  2008-02-12 18:58:33.000000000 +0100 
     3493+++ gtk+2.0-2.12.8/gtk/xdgmime/Makefile.in      2008-02-13 09:22:46.000000000 +0100 
     3494@@ -80,6 +80,7 @@ 
     3495 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3496 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3497 DLLTOOL = @DLLTOOL@ 
     3498+DSYMUTIL = @DSYMUTIL@ 
     3499 ECHO = @ECHO@ 
     3500 ECHO_C = @ECHO_C@ 
     3501 ECHO_N = @ECHO_N@ 
     3502@@ -89,6 +90,8 @@ 
    12133503 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    12143504 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    12193509 F77 = @F77@ 
    12203510 FFLAGS = @FFLAGS@ 
    1221 @@ -112,6 +114,7 @@ 
     3511@@ -112,6 +115,7 @@ 
    12223512 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    12233513 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    12273517 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    12283518 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1229 --- a/ltmain.sh 2008-01-29 10:05:20.000000000 +0100 
    1230 +++ b/ltmain.sh 2008-01-29 10:05:43.000000000 +0100 
    1231 @@ -43,7 +43,7 @@ 
     3519@@ -219,6 +223,7 @@ 
     3520 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3521 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3522 NM = @NM@ 
     3523+NMEDIT = @NMEDIT@ 
     3524 OBJDUMP = @OBJDUMP@ 
     3525 OBJEXT = @OBJEXT@ 
     3526 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3527diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/ltmain.sh gtk+2.0-2.12.8/ltmain.sh 
     3528--- gtk+2.0-2.12.8.old/ltmain.sh        2008-01-30 21:26:55.000000000 +0100 
     3529+++ gtk+2.0-2.12.8/ltmain.sh    2008-02-02 14:28:24.000000000 +0100 
     3530@@ -2,7 +2,7 @@ 
     3531 # NOTE: Changing this file will not affect anything until you rerun configure. 
     3532 # 
     3533 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 
     3534-# 2007  Free Software Foundation, Inc. 
     3535+# 2007, 2008  Free Software Foundation, Inc. 
     3536 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 
     3537 # 
     3538 # This program is free software; you can redistribute it and/or modify 
     3539@@ -43,8 +43,8 @@ 
    12323540  
    12333541 PROGRAM=ltmain.sh 
    12343542 PACKAGE=libtool 
    12353543-VERSION=1.5.24 
    1236 +VERSION="1.5.24 Debian 1.5.24-1" 
    1237  TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" 
     3544-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" 
     3545+VERSION="1.5.26 Debian 1.5.26-1" 
     3546+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" 
    12383547  
    12393548 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). 
    1240 @@ -2122,7 +2122,10 @@ 
     3549 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then 
     3550@@ -113,15 +113,21 @@ 
     3551 # These must not be set unconditionally because not all systems understand 
     3552 # e.g. LANG=C (notably SCO). 
     3553 # We save the old values to restore during execute mode. 
     3554-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES 
     3555+lt_env= 
     3556+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES 
     3557 do 
     3558   eval "if test \"\${$lt_var+set}\" = set; then 
     3559          save_$lt_var=\$$lt_var 
     3560+         lt_env=\"$lt_var=\$$lt_var \$lt_env\" 
     3561          $lt_var=C 
     3562          export $lt_var 
     3563        fi" 
     3564 done 
     3565  
     3566+if test -n "$lt_env"; then 
     3567+  lt_env="env $lt_env" 
     3568+fi 
     3569+ 
     3570 # Make sure IFS has a sensible default 
     3571 lt_nl=' 
     3572 ' 
     3573@@ -485,7 +491,7 @@ 
     3574     echo "\ 
     3575 $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP 
     3576  
     3577-Copyright (C) 2007  Free Software Foundation, Inc. 
     3578+Copyright (C) 2008  Free Software Foundation, Inc. 
     3579 This is free software; see the source for copying conditions.  There is NO 
     3580 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 
     3581     exit $? 
     3582@@ -788,6 +794,7 @@ 
     3583     *.for) xform=for ;; 
     3584     *.java) xform=java ;; 
     3585     *.obj) xform=obj ;; 
     3586+    *.sx) xform=sx ;; 
     3587     esac 
     3588  
     3589     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` 
     3590@@ -956,7 +963,7 @@ 
     3591       $run $rm "$lobj" "$output_obj" 
     3592  
     3593       $show "$command" 
     3594-      if $run eval "$command"; then : 
     3595+      if $run eval $lt_env "$command"; then : 
     3596       else 
     3597        test -n "$output_obj" && $run $rm $removelist 
     3598        exit $EXIT_FAILURE 
     3599@@ -1028,7 +1035,7 @@ 
     3600       command="$command$suppress_output" 
     3601       $run $rm "$obj" "$output_obj" 
     3602       $show "$command" 
     3603-      if $run eval "$command"; then : 
     3604+      if $run eval $lt_env "$command"; then : 
     3605       else 
     3606        $run $rm $removelist 
     3607        exit $EXIT_FAILURE 
     3608@@ -1161,6 +1168,7 @@ 
     3609     thread_safe=no 
     3610     vinfo= 
     3611     vinfo_number=no 
     3612+    single_module="${wl}-single_module" 
     3613  
     3614     func_infer_tag $base_compile 
     3615  
     3616@@ -1646,6 +1654,11 @@ 
     3617        continue 
     3618        ;; 
     3619  
     3620+      -multi_module) 
     3621+       single_module="${wl}-multi_module" 
     3622+       continue 
     3623+       ;; 
     3624+ 
     3625       -module) 
     3626        module=yes 
     3627        continue 
     3628@@ -2122,7 +2135,10 @@ 
    12413629        case $pass in 
    12423630        dlopen) libs="$dlfiles" ;; 
    … …  
    12503638       fi 
    12513639       if test "$pass" = dlopen; then 
    1252 @@ -3244,6 +3247,11 @@ 
     3640@@ -2149,7 +2165,12 @@ 
     3641            continue 
     3642          fi 
     3643          name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` 
     3644-         for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do 
     3645+         if test "$linkmode" = lib; then 
     3646+           searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" 
     3647+         else 
     3648+           searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" 
     3649+         fi 
     3650+         for searchdir in $searchdirs; do 
     3651            for search_ext in .la $std_shrext .so .a; do 
     3652              # Search the libtool library 
     3653              lib="$searchdir/lib${name}${search_ext}" 
     3654@@ -2945,12 +2966,18 @@ 
     3655                  # we do not want to link against static libs, 
     3656                  # but need to link against shared 
     3657                  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` 
     3658+                 eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` 
     3659                  if test -n "$deplibrary_names" ; then 
     3660                    for tmp in $deplibrary_names ; do 
     3661                      depdepl=$tmp 
     3662                    done 
     3663-                   if test -f "$path/$depdepl" ; then 
     3664+                   if test -f "$deplibdir/$depdepl" ; then 
     3665+                     depdepl="$deplibdir/$depdepl" 
     3666+                   elif test -f "$path/$depdepl" ; then 
     3667                      depdepl="$path/$depdepl" 
     3668+                   else 
     3669+                     # Can't find it, oh well... 
     3670+                     depdepl= 
     3671                    fi 
     3672                    # do not add paths which are already there 
     3673                    case " $newlib_search_path " in 
     3674@@ -3098,9 +3125,10 @@ 
     3675  
     3676     case $linkmode in 
     3677     oldlib) 
     3678-      if test -n "$deplibs"; then 
     3679-       $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 
     3680-      fi 
     3681+      case " $deplibs" in 
     3682+      *\ -l* | *\ -L*) 
     3683+       $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; 
     3684+      esac 
     3685  
     3686       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then 
     3687        $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 
     3688@@ -3244,6 +3272,11 @@ 
    12533689            revision="$number_minor" 
    12543690            lt_irix_increment=no 
    … …  
    12623698          ;; 
    12633699        no) 
    1264 --- a/m4macros/Makefile.in      2008-01-29 10:05:20.000000000 +0100 
    1265 +++ b/m4macros/Makefile.in      2008-01-29 10:05:43.000000000 +0100 
    1266 @@ -89,6 +89,8 @@ 
     3700@@ -4237,9 +4270,10 @@ 
     3701       ;; 
     3702  
     3703     obj) 
     3704-      if test -n "$deplibs"; then 
     3705-       $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 
     3706-      fi 
     3707+      case " $deplibs" in 
     3708+      *\ -l* | *\ -L*) 
     3709+       $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; 
     3710+      esac 
     3711  
     3712       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then 
     3713        $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 
     3714@@ -6478,7 +6512,7 @@ 
     3715       fi 
     3716  
     3717       # Restore saved environment variables 
     3718-      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES 
     3719+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES 
     3720       do 
     3721        eval "if test \"\${save_$lt_var+set}\" = set; then 
     3722                $lt_var=\$save_$lt_var; export $lt_var 
     3723diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/m4macros/Makefile.in gtk+2.0-2.12.8/m4macros/Makefile.in 
     3724--- gtk+2.0-2.12.8.old/m4macros/Makefile.in     2008-02-12 18:58:33.000000000 +0100 
     3725+++ gtk+2.0-2.12.8/m4macros/Makefile.in 2008-02-13 09:22:46.000000000 +0100 
     3726@@ -80,6 +80,7 @@ 
     3727 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3728 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3729 DLLTOOL = @DLLTOOL@ 
     3730+DSYMUTIL = @DSYMUTIL@ 
     3731 ECHO = @ECHO@ 
     3732 ECHO_C = @ECHO_C@ 
     3733 ECHO_N = @ECHO_N@ 
     3734@@ -89,6 +90,8 @@ 
    12673735 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    12683736 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    12733741 F77 = @F77@ 
    12743742 FFLAGS = @FFLAGS@ 
    1275 @@ -112,6 +114,7 @@ 
     3743@@ -112,6 +115,7 @@ 
    12763744 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    12773745 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    12813749 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    12823750 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1283 --- a/Makefile.in       2008-01-29 10:05:20.000000000 +0100 
    1284 +++ b/Makefile.in       2008-01-29 10:05:43.000000000 +0100 
    1285 @@ -90,6 +90,8 @@ 
     3751@@ -219,6 +223,7 @@ 
     3752 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3753 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3754 NM = @NM@ 
     3755+NMEDIT = @NMEDIT@ 
     3756 OBJDUMP = @OBJDUMP@ 
     3757 OBJEXT = @OBJEXT@ 
     3758 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3759diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/Makefile.in gtk+2.0-2.12.8/Makefile.in 
     3760--- gtk+2.0-2.12.8.old/Makefile.in      2008-02-12 18:58:31.000000000 +0100 
     3761+++ gtk+2.0-2.12.8/Makefile.in  2008-02-13 09:22:42.000000000 +0100 
     3762@@ -81,6 +81,7 @@ 
     3763 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3764 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3765 DLLTOOL = @DLLTOOL@ 
     3766+DSYMUTIL = @DSYMUTIL@ 
     3767 ECHO = @ECHO@ 
     3768 ECHO_C = @ECHO_C@ 
     3769 ECHO_N = @ECHO_N@ 
     3770@@ -90,6 +91,8 @@ 
    12863771 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    12873772 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    12923777 F77 = @F77@ 
    12933778 FFLAGS = @FFLAGS@ 
    1294 @@ -113,6 +115,7 @@ 
     3779@@ -113,6 +116,7 @@ 
    12953780 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    12963781 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    13003785 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    13013786 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1302 @@ -330,7 +333,10 @@ 
     3787@@ -220,6 +224,7 @@ 
     3788 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3789 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3790 NM = @NM@ 
     3791+NMEDIT = @NMEDIT@ 
     3792 OBJDUMP = @OBJDUMP@ 
     3793 OBJEXT = @OBJEXT@ 
     3794 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3795@@ -330,7 +335,10 @@ 
    13033796 sysconfdir = @sysconfdir@ 
    13043797 target_alias = @target_alias@ 
    … …  
    13123805  
    13133806 # require automake 1.4 
    1314 @@ -488,7 +494,8 @@ 
     3807@@ -482,13 +490,14 @@ 
     3808 DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ 
     3809        COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \ 
     3810        acinclude.m4 aclocal.m4 compile config.guess config.h.in \ 
     3811-       config.h.win32.in config.sub configure.in depcomp \ 
     3812+       config.h.win32.in config.sub configure configure.in depcomp \ 
     3813        gdk-2.0-uninstalled.pc.in gdk-2.0.pc.in \ 
     3814        gdk-pixbuf-2.0-uninstalled.pc.in gdk-pixbuf-2.0.pc.in \ 
    13153815        gtk+-2.0-uninstalled.pc.in gtk+-2.0.pc.in \ 
    13163816        gtk+-unix-print-2.0.pc.in gtk-zip.sh.in install-sh ltmain.sh \ 
    … …  
    13223822        $(MAKE) $(AM_MAKEFLAGS) all-recursive 
    13233823  
    1324 @@ -740,7 +747,7 @@ 
     3824@@ -740,7 +749,7 @@ 
    13253825            || exit 1; \ 
    13263826          fi; \ 
    … …  
    13313831            test -d $(distdir)/$$subdir \ 
    13323832            || mkdir $(distdir)/$$subdir \ 
    1333 --- a/modules/engines/Makefile.in       2008-01-29 10:05:20.000000000 +0100 
    1334 +++ b/modules/engines/Makefile.in       2008-01-29 10:05:43.000000000 +0100 
    1335 @@ -89,6 +89,8 @@ 
     3833diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/engines/Makefile.in gtk+2.0-2.12.8/modules/engines/Makefile.in 
     3834--- gtk+2.0-2.12.8.old/modules/engines/Makefile.in      2008-02-12 18:58:33.000000000 +0100 
     3835+++ gtk+2.0-2.12.8/modules/engines/Makefile.in  2008-02-13 09:22:46.000000000 +0100 
     3836@@ -80,6 +80,7 @@ 
     3837 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3838 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3839 DLLTOOL = @DLLTOOL@ 
     3840+DSYMUTIL = @DSYMUTIL@ 
     3841 ECHO = @ECHO@ 
     3842 ECHO_C = @ECHO_C@ 
     3843 ECHO_N = @ECHO_N@ 
     3844@@ -89,6 +90,8 @@ 
    13363845 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    13373846 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    13423851 F77 = @F77@ 
    13433852 FFLAGS = @FFLAGS@ 
    1344 @@ -112,6 +114,7 @@ 
     3853@@ -112,6 +115,7 @@ 
    13453854 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    13463855 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    13503859 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    13513860 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1352 --- a/modules/engines/ms-windows/Makefile.in    2008-01-29 10:05:20.000000000 +0100 
    1353 +++ b/modules/engines/ms-windows/Makefile.in    2008-01-29 10:05:43.000000000 +0100 
    1354 @@ -89,6 +89,8 @@ 
     3861@@ -219,6 +223,7 @@ 
     3862 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3863 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3864 NM = @NM@ 
     3865+NMEDIT = @NMEDIT@ 
     3866 OBJDUMP = @OBJDUMP@ 
     3867 OBJEXT = @OBJEXT@ 
     3868 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3869diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.12.8/modules/engines/ms-windows/Makefile.in 
     3870--- gtk+2.0-2.12.8.old/modules/engines/ms-windows/Makefile.in   2008-02-12 18:58:33.000000000 +0100 
     3871+++ gtk+2.0-2.12.8/modules/engines/ms-windows/Makefile.in       2008-02-13 09:22:46.000000000 +0100 
     3872@@ -80,6 +80,7 @@ 
     3873 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3874 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3875 DLLTOOL = @DLLTOOL@ 
     3876+DSYMUTIL = @DSYMUTIL@ 
     3877 ECHO = @ECHO@ 
     3878 ECHO_C = @ECHO_C@ 
     3879 ECHO_N = @ECHO_N@ 
     3880@@ -89,6 +90,8 @@ 
    13553881 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    13563882 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    13613887 F77 = @F77@ 
    13623888 FFLAGS = @FFLAGS@ 
    1363 @@ -112,6 +114,7 @@ 
     3889@@ -112,6 +115,7 @@ 
    13643890 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    13653891 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    13693895 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    13703896 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1371 --- a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in      2008-01-29 10:05:20.000000000 +0100 
    1372 +++ b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in      2008-01-29 10:05:43.000000000 +0100 
    1373 @@ -89,6 +89,8 @@ 
     3897@@ -219,6 +223,7 @@ 
     3898 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3899 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3900 NM = @NM@ 
     3901+NMEDIT = @NMEDIT@ 
     3902 OBJDUMP = @OBJDUMP@ 
     3903 OBJEXT = @OBJEXT@ 
     3904 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3905diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.12.8/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 
     3906--- gtk+2.0-2.12.8.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in     2008-02-12 18:58:34.000000000 +0100 
     3907+++ gtk+2.0-2.12.8/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-02-13 09:22:47.000000000 +0100 
     3908@@ -80,6 +80,7 @@ 
     3909 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3910 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3911 DLLTOOL = @DLLTOOL@ 
     3912+DSYMUTIL = @DSYMUTIL@ 
     3913 ECHO = @ECHO@ 
     3914 ECHO_C = @ECHO_C@ 
     3915 ECHO_N = @ECHO_N@ 
     3916@@ -89,6 +90,8 @@ 
    13743917 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    13753918 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    13803923 F77 = @F77@ 
    13813924 FFLAGS = @FFLAGS@ 
    1382 @@ -112,6 +114,7 @@ 
     3925@@ -112,6 +115,7 @@ 
    13833926 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    13843927 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    13883931 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    13893932 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1390 --- a/modules/engines/ms-windows/Theme/Makefile.in      2008-01-29 10:05:20.000000000 +0100 
    1391 +++ b/modules/engines/ms-windows/Theme/Makefile.in      2008-01-29 10:05:43.000000000 +0100 
    1392 @@ -89,6 +89,8 @@ 
     3933@@ -219,6 +223,7 @@ 
     3934 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3935 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3936 NM = @NM@ 
     3937+NMEDIT = @NMEDIT@ 
     3938 OBJDUMP = @OBJDUMP@ 
     3939 OBJEXT = @OBJEXT@ 
     3940 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3941diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.12.8/modules/engines/ms-windows/Theme/Makefile.in 
     3942--- gtk+2.0-2.12.8.old/modules/engines/ms-windows/Theme/Makefile.in     2008-02-12 18:58:34.000000000 +0100 
     3943+++ gtk+2.0-2.12.8/modules/engines/ms-windows/Theme/Makefile.in 2008-02-13 09:22:47.000000000 +0100 
     3944@@ -80,6 +80,7 @@ 
     3945 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3946 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3947 DLLTOOL = @DLLTOOL@ 
     3948+DSYMUTIL = @DSYMUTIL@ 
     3949 ECHO = @ECHO@ 
     3950 ECHO_C = @ECHO_C@ 
     3951 ECHO_N = @ECHO_N@ 
     3952@@ -89,6 +90,8 @@ 
    13933953 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    13943954 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    13993959 F77 = @F77@ 
    14003960 FFLAGS = @FFLAGS@ 
    1401 @@ -112,6 +114,7 @@ 
     3961@@ -112,6 +115,7 @@ 
    14023962 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    14033963 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    14073967 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    14083968 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1409 --- a/modules/engines/pixbuf/Makefile.in        2008-01-29 10:05:20.000000000 +0100 
    1410 +++ b/modules/engines/pixbuf/Makefile.in        2008-01-29 10:05:43.000000000 +0100 
    1411 @@ -89,6 +89,8 @@ 
     3969@@ -219,6 +223,7 @@ 
     3970 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     3971 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     3972 NM = @NM@ 
     3973+NMEDIT = @NMEDIT@ 
     3974 OBJDUMP = @OBJDUMP@ 
     3975 OBJEXT = @OBJEXT@ 
     3976 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     3977diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.12.8/modules/engines/pixbuf/Makefile.in 
     3978--- gtk+2.0-2.12.8.old/modules/engines/pixbuf/Makefile.in       2008-02-12 18:58:34.000000000 +0100 
     3979+++ gtk+2.0-2.12.8/modules/engines/pixbuf/Makefile.in   2008-02-13 09:22:47.000000000 +0100 
     3980@@ -80,6 +80,7 @@ 
     3981 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     3982 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     3983 DLLTOOL = @DLLTOOL@ 
     3984+DSYMUTIL = @DSYMUTIL@ 
     3985 ECHO = @ECHO@ 
     3986 ECHO_C = @ECHO_C@ 
     3987 ECHO_N = @ECHO_N@ 
     3988@@ -89,6 +90,8 @@ 
    14123989 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    14133990 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    14183995 F77 = @F77@ 
    14193996 FFLAGS = @FFLAGS@ 
    1420 @@ -112,6 +114,7 @@ 
     3997@@ -112,6 +115,7 @@ 
    14213998 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    14223999 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    14264003 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    14274004 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1428 --- a/modules/input/Makefile.in 2008-01-29 10:05:20.000000000 +0100 
    1429 +++ b/modules/input/Makefile.in 2008-01-29 10:05:43.000000000 +0100 
    1430 @@ -89,6 +89,8 @@ 
     4005@@ -219,6 +223,7 @@ 
     4006 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     4007 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     4008 NM = @NM@ 
     4009+NMEDIT = @NMEDIT@ 
     4010 OBJDUMP = @OBJDUMP@ 
     4011 OBJEXT = @OBJEXT@ 
     4012 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     4013diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/input/Makefile.in gtk+2.0-2.12.8/modules/input/Makefile.in 
     4014--- gtk+2.0-2.12.8.old/modules/input/Makefile.in        2008-02-12 18:58:34.000000000 +0100 
     4015+++ gtk+2.0-2.12.8/modules/input/Makefile.in    2008-02-13 09:22:47.000000000 +0100 
     4016@@ -80,6 +80,7 @@ 
     4017 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     4018 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     4019 DLLTOOL = @DLLTOOL@ 
     4020+DSYMUTIL = @DSYMUTIL@ 
     4021 ECHO = @ECHO@ 
     4022 ECHO_C = @ECHO_C@ 
     4023 ECHO_N = @ECHO_N@ 
     4024@@ -89,6 +90,8 @@ 
    14314025 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    14324026 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    14374031 F77 = @F77@ 
    14384032 FFLAGS = @FFLAGS@ 
    1439 @@ -112,6 +114,7 @@ 
     4033@@ -112,6 +115,7 @@ 
    14404034 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    14414035 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    14454039 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    14464040 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1447 @@ -431,9 +434,10 @@ 
     4041@@ -219,6 +223,7 @@ 
     4042 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     4043 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     4044 NM = @NM@ 
     4045+NMEDIT = @NMEDIT@ 
     4046 OBJDUMP = @OBJDUMP@ 
     4047 OBJEXT = @OBJEXT@ 
     4048 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     4049@@ -431,9 +436,10 @@ 
    14484050  
    14494051 imconffiledir = $(sysconfdir)/gtk-2.0 
    … …  
    14574059 module_LTLIBRARIES = \ 
    14584060        $(IM_XIM_MODULE)                        \ 
    1459 @@ -986,7 +990,18 @@ 
     4061@@ -986,7 +992,18 @@ 
    14604062        rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules 
    14614063  
    … …  
    14774079 @CROSS_COMPILING_FALSE@all-local: gtk.immodules 
    14784080 # Tell versions [3.59,3.63) of GNU make to not export all variables. 
    1479 --- a/modules/Makefile.in       2008-01-29 10:05:20.000000000 +0100 
    1480 +++ b/modules/Makefile.in       2008-01-29 10:05:43.000000000 +0100 
    1481 @@ -89,6 +89,8 @@ 
     4081diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/Makefile.in gtk+2.0-2.12.8/modules/Makefile.in 
     4082--- gtk+2.0-2.12.8.old/modules/Makefile.in      2008-02-12 18:58:33.000000000 +0100 
     4083+++ gtk+2.0-2.12.8/modules/Makefile.in  2008-02-13 09:22:46.000000000 +0100 
     4084@@ -80,6 +80,7 @@ 
     4085 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     4086 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     4087 DLLTOOL = @DLLTOOL@ 
     4088+DSYMUTIL = @DSYMUTIL@ 
     4089 ECHO = @ECHO@ 
     4090 ECHO_C = @ECHO_C@ 
     4091 ECHO_N = @ECHO_N@ 
     4092@@ -89,6 +90,8 @@ 
    14824093 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    14834094 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    14884099 F77 = @F77@ 
    14894100 FFLAGS = @FFLAGS@ 
    1490 @@ -112,6 +114,7 @@ 
     4101@@ -112,6 +115,7 @@ 
    14914102 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    14924103 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    14964107 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    14974108 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1498 --- a/modules/printbackends/cups/Makefile.in    2008-01-29 10:05:20.000000000 +0100 
    1499 +++ b/modules/printbackends/cups/Makefile.in    2008-01-29 10:05:43.000000000 +0100 
    1500 @@ -89,6 +89,8 @@ 
     4109@@ -219,6 +223,7 @@ 
     4110 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     4111 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     4112 NM = @NM@ 
     4113+NMEDIT = @NMEDIT@ 
     4114 OBJDUMP = @OBJDUMP@ 
     4115 OBJEXT = @OBJEXT@ 
     4116 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     4117diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.12.8/modules/printbackends/cups/Makefile.in 
     4118--- gtk+2.0-2.12.8.old/modules/printbackends/cups/Makefile.in   2008-02-12 18:58:34.000000000 +0100 
     4119+++ gtk+2.0-2.12.8/modules/printbackends/cups/Makefile.in       2008-02-13 09:22:47.000000000 +0100 
     4120@@ -80,6 +80,7 @@ 
     4121 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     4122 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     4123 DLLTOOL = @DLLTOOL@ 
     4124+DSYMUTIL = @DSYMUTIL@ 
     4125 ECHO = @ECHO@ 
     4126 ECHO_C = @ECHO_C@ 
     4127 ECHO_N = @ECHO_N@ 
     4128@@ -89,6 +90,8 @@ 
    15014129 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    15024130 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    15074135 F77 = @F77@ 
    15084136 FFLAGS = @FFLAGS@ 
    1509 @@ -112,6 +114,7 @@ 
     4137@@ -112,6 +115,7 @@ 
    15104138 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    15114139 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    15154143 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    15164144 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1517 --- a/modules/printbackends/file/Makefile.in    2008-01-29 10:05:20.000000000 +0100 
    1518 +++ b/modules/printbackends/file/Makefile.in    2008-01-29 10:05:43.000000000 +0100 
    1519 @@ -89,6 +89,8 @@ 
     4145@@ -219,6 +223,7 @@ 
     4146 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     4147 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     4148 NM = @NM@ 
     4149+NMEDIT = @NMEDIT@ 
     4150 OBJDUMP = @OBJDUMP@ 
     4151 OBJEXT = @OBJEXT@ 
     4152 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     4153diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/printbackends/file/Makefile.in gtk+2.0-2.12.8/modules/printbackends/file/Makefile.in 
     4154--- gtk+2.0-2.12.8.old/modules/printbackends/file/Makefile.in   2008-02-12 18:58:34.000000000 +0100 
     4155+++ gtk+2.0-2.12.8/modules/printbackends/file/Makefile.in       2008-02-13 09:22:47.000000000 +0100 
     4156@@ -80,6 +80,7 @@ 
     4157 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     4158 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     4159 DLLTOOL = @DLLTOOL@ 
     4160+DSYMUTIL = @DSYMUTIL@ 
     4161 ECHO = @ECHO@ 
     4162 ECHO_C = @ECHO_C@ 
     4163 ECHO_N = @ECHO_N@ 
     4164@@ -89,6 +90,8 @@ 
    15204165 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    15214166 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    15264171 F77 = @F77@ 
    15274172 FFLAGS = @FFLAGS@ 
    1528 @@ -112,6 +114,7 @@ 
     4173@@ -112,6 +115,7 @@ 
    15294174 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    15304175 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    15344179 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    15354180 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1536 --- a/modules/printbackends/lpr/Makefile.in     2008-01-29 10:05:20.000000000 +0100 
    1537 +++ b/modules/printbackends/lpr/Makefile.in     2008-01-29 10:05:43.000000000 +0100 
    1538 @@ -89,6 +89,8 @@ 
     4181@@ -219,6 +223,7 @@ 
     4182 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     4183 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     4184 NM = @NM@ 
     4185+NMEDIT = @NMEDIT@ 
     4186 OBJDUMP = @OBJDUMP@ 
     4187 OBJEXT = @OBJEXT@ 
     4188 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     4189diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.12.8/modules/printbackends/lpr/Makefile.in 
     4190--- gtk+2.0-2.12.8.old/modules/printbackends/lpr/Makefile.in    2008-02-12 18:58:34.000000000 +0100 
     4191+++ gtk+2.0-2.12.8/modules/printbackends/lpr/Makefile.in        2008-02-13 09:22:48.000000000 +0100 
     4192@@ -80,6 +80,7 @@ 
     4193 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     4194 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     4195 DLLTOOL = @DLLTOOL@ 
     4196+DSYMUTIL = @DSYMUTIL@ 
     4197 ECHO = @ECHO@ 
     4198 ECHO_C = @ECHO_C@ 
     4199 ECHO_N = @ECHO_N@ 
     4200@@ -89,6 +90,8 @@ 
    15394201 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    15404202 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    15454207 F77 = @F77@ 
    15464208 FFLAGS = @FFLAGS@ 
    1547 @@ -112,6 +114,7 @@ 
     4209@@ -112,6 +115,7 @@ 
    15484210 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    15494211 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    15534215 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    15544216 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1555 --- a/modules/printbackends/Makefile.in 2008-01-29 10:05:20.000000000 +0100 
    1556 +++ b/modules/printbackends/Makefile.in 2008-01-29 10:05:43.000000000 +0100 
    1557 @@ -91,6 +91,8 @@ 
     4217@@ -219,6 +223,7 @@ 
     4218 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     4219 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     4220 NM = @NM@ 
     4221+NMEDIT = @NMEDIT@ 
     4222 OBJDUMP = @OBJDUMP@ 
     4223 OBJEXT = @OBJEXT@ 
     4224 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     4225diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/printbackends/Makefile.in gtk+2.0-2.12.8/modules/printbackends/Makefile.in 
     4226--- gtk+2.0-2.12.8.old/modules/printbackends/Makefile.in        2008-02-12 18:58:34.000000000 +0100 
     4227+++ gtk+2.0-2.12.8/modules/printbackends/Makefile.in    2008-02-13 09:22:47.000000000 +0100 
     4228@@ -82,6 +82,7 @@ 
     4229 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     4230 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     4231 DLLTOOL = @DLLTOOL@ 
     4232+DSYMUTIL = @DSYMUTIL@ 
     4233 ECHO = @ECHO@ 
     4234 ECHO_C = @ECHO_C@ 
     4235 ECHO_N = @ECHO_N@ 
     4236@@ -91,6 +92,8 @@ 
    15584237 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    15594238 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    15644243 F77 = @F77@ 
    15654244 FFLAGS = @FFLAGS@ 
    1566 @@ -114,6 +116,7 @@ 
     4245@@ -114,6 +117,7 @@ 
    15674246 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    15684247 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    15724251 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    15734252 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1574 --- a/modules/printbackends/test/Makefile.in    2008-01-29 10:05:20.000000000 +0100 
    1575 +++ b/modules/printbackends/test/Makefile.in    2008-01-29 10:05:43.000000000 +0100 
    1576 @@ -89,6 +89,8 @@ 
     4253@@ -221,6 +225,7 @@ 
     4254 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     4255 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     4256 NM = @NM@ 
     4257+NMEDIT = @NMEDIT@ 
     4258 OBJDUMP = @OBJDUMP@ 
     4259 OBJEXT = @OBJEXT@ 
     4260 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     4261diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/printbackends/test/Makefile.in gtk+2.0-2.12.8/modules/printbackends/test/Makefile.in 
     4262--- gtk+2.0-2.12.8.old/modules/printbackends/test/Makefile.in   2008-02-12 18:58:34.000000000 +0100 
     4263+++ gtk+2.0-2.12.8/modules/printbackends/test/Makefile.in       2008-02-13 09:22:48.000000000 +0100 
     4264@@ -80,6 +80,7 @@ 
     4265 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     4266 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     4267 DLLTOOL = @DLLTOOL@ 
     4268+DSYMUTIL = @DSYMUTIL@ 
     4269 ECHO = @ECHO@ 
     4270 ECHO_C = @ECHO_C@ 
     4271 ECHO_N = @ECHO_N@ 
     4272@@ -89,6 +90,8 @@ 
    15774273 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    15784274 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    15834279 F77 = @F77@ 
    15844280 FFLAGS = @FFLAGS@ 
    1585 @@ -112,6 +114,7 @@ 
     4281@@ -112,6 +115,7 @@ 
    15864282 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    15874283 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    15914287 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    15924288 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1593 --- a/perf/Makefile.in  2008-01-29 10:05:20.000000000 +0100 
    1594 +++ b/perf/Makefile.in  2008-01-29 10:05:43.000000000 +0100 
    1595 @@ -89,6 +89,8 @@ 
     4289@@ -219,6 +223,7 @@ 
     4290 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     4291 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     4292 NM = @NM@ 
     4293+NMEDIT = @NMEDIT@ 
     4294 OBJDUMP = @OBJDUMP@ 
     4295 OBJEXT = @OBJEXT@ 
     4296 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     4297diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/perf/Makefile.in gtk+2.0-2.12.8/perf/Makefile.in 
     4298--- gtk+2.0-2.12.8.old/perf/Makefile.in 2008-02-12 18:58:34.000000000 +0100 
     4299+++ gtk+2.0-2.12.8/perf/Makefile.in     2008-02-13 09:22:48.000000000 +0100 
     4300@@ -80,6 +80,7 @@ 
     4301 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     4302 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     4303 DLLTOOL = @DLLTOOL@ 
     4304+DSYMUTIL = @DSYMUTIL@ 
     4305 ECHO = @ECHO@ 
     4306 ECHO_C = @ECHO_C@ 
     4307 ECHO_N = @ECHO_N@ 
     4308@@ -89,6 +90,8 @@ 
    15964309 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    15974310 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    16024315 F77 = @F77@ 
    16034316 FFLAGS = @FFLAGS@ 
    1604 @@ -112,6 +114,7 @@ 
     4317@@ -112,6 +115,7 @@ 
    16054318 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    16064319 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    16104323 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    16114324 GLIB_CFLAGS = @GLIB_CFLAGS@ 
    1612 --- a/tests/Makefile.in 2008-01-29 10:05:20.000000000 +0100 
    1613 +++ b/tests/Makefile.in 2008-01-29 10:05:43.000000000 +0100 
    1614 @@ -92,6 +92,8 @@ 
     4325@@ -219,6 +223,7 @@ 
     4326 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     4327 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     4328 NM = @NM@ 
     4329+NMEDIT = @NMEDIT@ 
     4330 OBJDUMP = @OBJDUMP@ 
     4331 OBJEXT = @OBJEXT@ 
     4332 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 
     4333diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/tests/Makefile.in gtk+2.0-2.12.8/tests/Makefile.in 
     4334--- gtk+2.0-2.12.8.old/tests/Makefile.in        2008-02-12 18:58:35.000000000 +0100 
     4335+++ gtk+2.0-2.12.8/tests/Makefile.in    2008-02-13 09:22:48.000000000 +0100 
     4336@@ -83,6 +83,7 @@ 
     4337 DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ 
     4338 DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ 
     4339 DLLTOOL = @DLLTOOL@ 
     4340+DSYMUTIL = @DSYMUTIL@ 
     4341 ECHO = @ECHO@ 
     4342 ECHO_C = @ECHO_C@ 
     4343 ECHO_N = @ECHO_N@ 
     4344@@ -92,6 +93,8 @@ 
    16154345 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 
    16164346 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 
    … …  
    16214351 F77 = @F77@ 
    16224352 FFLAGS = @FFLAGS@ 
    1623 @@ -115,6 +117,7 @@ 
     4353@@ -115,6 +118,7 @@ 
    16244354 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 
    16254355 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 
    … …  
    16294359 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 
    16304360 GLIB_CFLAGS = @GLIB_CFLAGS@ 
     4361@@ -222,6 +226,7 @@ 
     4362 MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ 
     4363 MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ 
     4364 NM = @NM@ 
     4365+NMEDIT = @NMEDIT@ 
     4366 OBJDUMP = @OBJDUMP@ 
     4367 OBJEXT = @OBJEXT@ 
     4368 OS_LINUX_FALSE = @OS_LINUX_FALSE@ 

  • pkg/main/gtk+2.0/trunk/debian/patches/series

    r2998 r3042  
    1515031_gtksearchenginetracker_fixes.patch 
    1616033_treeview_resizing.patch 
    17 040_filechooser_single-click.patch 
    1817041_ia32-libs.patch 
    1918042_treeview_single-focus.patch 
    … …  
    2221091_workaround_no_gtk_init_incorrect_display.patch 
    2322092_recentfiles-recursion-fix.patch 
    24 093_directfb-type-changes.patch 
    25 094_directfb-deprecation-fixes.patch 
    2623095_gtk-im-module-setting.patch 
Note: See TracChangeset for help on using the changeset viewer.