--- libgsf-1.14.16.old/configure	2009-10-12 03:43:59.000000000 +0200
+++ libgsf-1.14.16.new/configure	2009-10-22 18:51:03.000000000 +0200
@@ -790,11 +790,10 @@
 LIBOBJS
 WITH_GCONF_FALSE
 WITH_GCONF_TRUE
-GCONF_SCHEMA_FILE_DIR
-GCONF_SCHEMA_CONFIG_SOURCE
-GCONFTOOL
 GCONF_SCHEMAS_INSTALL_FALSE
 GCONF_SCHEMAS_INSTALL_TRUE
+GCONF_SCHEMA_FILE_DIR
+GCONF_SCHEMA_CONFIG_SOURCE
 WITH_LIBGSF_BONOBO_FALSE
 WITH_LIBGSF_BONOBO_TRUE
 WITH_LIBGSF_GNOMEVFS_FALSE
@@ -851,6 +850,7 @@
 LIBGSF_LIBS
 LIBGSF_CFLAGS
 GETTEXT_PACKAGE
+MKINSTALLDIRS
 POSUB
 POFILES
 PO_IN_DATADIR_FALSE
@@ -1031,6 +1031,7 @@
 with_gnome_vfs
 with_bonobo
 with_gdk_pixbuf
+with_gconf
 with_gconf_source
 with_gconf_schema_file_dir
 enable_schemas_install
@@ -1704,7 +1705,8 @@
                           Turn on compiler warnings
   --enable-iso-c          Try to warn if code is not ISO C
   --enable-gtk-doc        use gtk-doc to build documentation [default=no]
-  --disable-schemas-install	Disable the schemas installation
+  --disable-schemas-install
+                          Disable the schemas installation
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1720,6 +1722,7 @@
 --{with,without}-gnome-vfs   Build wrappers for GNOME-VFS
   --without-bonobo        disable the use of bonobo
   --without-gdk-pixbuf    disable the use of gdk-pixbuf
+  --without-gconf         disable the use of gconf (default: auto)
   --with-gconf-source=sourceaddress
                           Config database for installing schema files.
   --with-gconf-schema-file-dir=dir
@@ -4885,13 +4888,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4888: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4891: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4891: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4894: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4894: output\"" >&5)
+  (eval echo "\"\$as_me:4897: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6094,7 +6097,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6097 "configure"' > conftest.$ac_ext
+  echo '#line 6100 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7949,11 +7952,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7952: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7955: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7956: \$? = $ac_status" >&5
+   echo "$as_me:7959: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8288,11 +8291,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8291: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8294: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8295: \$? = $ac_status" >&5
+   echo "$as_me:8298: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8393,11 +8396,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8396: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8399: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8400: \$? = $ac_status" >&5
+   echo "$as_me:8403: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8448,11 +8451,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8451: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8454: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8455: \$? = $ac_status" >&5
+   echo "$as_me:8458: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11248,7 +11251,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11251 "configure"
+#line 11254 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11344,7 +11347,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11347 "configure"
+#line 11350 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14280,6 +14283,15 @@
      fi
    fi
 
+            MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+
+
          test -d po || mkdir po
    if test "x$srcdir" != "x."; then
      if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
@@ -17908,59 +17920,33 @@
 # ===================
 # GConf configuration
 
- if false; then
-  GCONF_SCHEMAS_INSTALL_TRUE=
-  GCONF_SCHEMAS_INSTALL_FALSE='#'
+# Check whether --with-gconf was given.
+if test "${with_gconf+set}" = set; then
+  withval=$with_gconf;
 else
-  GCONF_SCHEMAS_INSTALL_TRUE='#'
-  GCONF_SCHEMAS_INSTALL_FALSE=
+  with_gconf=auto
 fi
 
 
-
-GCONFTOOL=
-# Extract the first word of "gconftool-2", so it can be a program name with args.
-set dummy gconftool-2; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_GCONFTOOL+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$GCONFTOOL"; then
-  ac_cv_prog_GCONFTOOL="$GCONFTOOL" # Let the user override the test.
+have_gconf=not_tested
+if test "x$with_gconf" = "xyes" -o "x$with_gconf" = "xauto" ; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= 2.24.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= 2.24.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  have_gconf=yes
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_GCONFTOOL="gconftool-2"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_GCONFTOOL" && ac_cv_prog_GCONFTOOL="no"
+  have_gconf=no
 fi
 fi
-GCONFTOOL=$ac_cv_prog_GCONFTOOL
-if test -n "$GCONFTOOL"; then
-  { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
-$as_echo "$GCONFTOOL" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
 
-if test "x$GCONFTOOL" = "xno"; then
-    { $as_echo "$as_me:$LINENO: WARNING: thumbnailer will not be built, unable to find gconftool-2" >&5
-$as_echo "$as_me: WARNING: thumbnailer will not be built, unable to find gconftool-2" >&2;}
-else
+if test "x$with_gconf" = "xyes" -a "x$have_gconf" != "xyes" ; then
+    { { $as_echo "$as_me:$LINENO: error: gconf support requested, but not available." >&5
+$as_echo "$as_me: error: gconf support requested, but not available." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
   if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
     GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -18013,8 +17999,26 @@
 fi
 
 
-fi
- if test "x$GCONFTOOL" != "xno"; then
+# ===================
+
+# ===================
+# thumbnailer configuration
+build_thumbnailer=dont_know
+case "${with_gconf}" in
+no)
+    { $as_echo "$as_me:$LINENO: WARNING: gconf support disabled as requested (the thumbnailer won't be built)" >&5
+$as_echo "$as_me: WARNING: gconf support disabled as requested (the thumbnailer won't be built)" >&2;};
+    build_thumbnailer=no;;
+yes)
+    build_thumbnailer=yes;;
+auto)
+    if test "xhave_conf" = "xyes"; then
+        build_thumbnailer=yes;
+    else
+        build_thumbnailer=no;
+    fi;;
+esac
+ if test "x$build_thumbnailer" = "xyes"; then
   WITH_GCONF_TRUE=
   WITH_GCONF_FALSE='#'
 else
@@ -18022,6 +18026,7 @@
   WITH_GCONF_FALSE=
 fi
 
+# ===================
 
 LDFLAGS="-no-undefined $LDFLAGS"
 
@@ -18233,13 +18238,6 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${WITH_GCONF_TRUE}" && test -z "${WITH_GCONF_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_GCONF\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -19690,7 +19688,16 @@
 
 
   case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
+# are listed without --file.  Let's play safe and only enable the eval
+# if we detect the quoting.
+case $CONFIG_FILES in
+*\'*) eval set x "$CONFIG_FILES" ;;
+*)   set x $CONFIG_FILES ;;
+esac
+shift
+for mf
+do
   # Strip MF so we end up with the name of the file.
   mf=`echo "$mf" | sed -e 's/:.*$//'`
   # Check whether this is an Automake generated Makefile or not.