Imported Upstream version 5.1.98.2

1 files changed, 97 insertions, 2054 deletions

diff --git a/configure b/configure
index f435330..de9cde8 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.151.2.5 .
+# From configure.ac Revision: 1.180 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for gutenprint 5.0.2.
+# Generated by GNU Autoconf 2.61 for gutenprint 5.1.98.2.
 #
 # Report bugs to <gimp-print-devel@lists.sourceforge.net>.
 #
@@ -746,8 +746,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='gutenprint'
 PACKAGE_TARNAME='gutenprint'
-PACKAGE_VERSION='5.0.2'
-PACKAGE_STRING='gutenprint 5.0.2'
+PACKAGE_VERSION='5.1.98.2'
+PACKAGE_STRING='gutenprint 5.1.98.2'
 PACKAGE_BUGREPORT='gimp-print-devel@lists.sourceforge.net'
 
 ac_unique_file="src/main/print-vars.c"
@@ -831,9 +831,6 @@ GUTENPRINT_CURRENT_INTERFACE
 GUTENPRINT_INTERFACE_AGE
 GUTENPRINT_BINARY_AGE
 GUTENPRINT_VERSION
-GUTENPRINTUI_CURRENT_INTERFACE
-GUTENPRINTUI_INTERFACE_AGE
-GUTENPRINTUI_BINARY_AGE
 GUTENPRINTUI2_CURRENT_INTERFACE
 GUTENPRINTUI2_INTERFACE_AGE
 GUTENPRINTUI2_BINARY_AGE
@@ -911,10 +908,6 @@ CUPS_CONFIG
 FOOMATIC_CONFIGURE
 FOOMATIC_PPDFILE
 IJS_CONFIG
-GIMPTOOL_CHECK
-GTK_CONFIG
-GTK_CFLAGS
-GTK_LIBS
 GIMPTOOL2_CHECK
 PKG_CONFIG
 GTK2_CFLAGS
@@ -954,16 +947,6 @@ LIBINTL
 LTLIBINTL
 POSUB
 GNUCFLAGS
-GLIB_CONFIG
-GLIB_CFLAGS
-GLIB_LIBS
-GIMPTOOL
-GIMP_CFLAGS
-GIMP_LIBS
-GIMP_CFLAGS_NOUI
-GIMP_LIBS_NOUI
-GIMP_DATA_DIR
-GIMP_PLUGIN_DIR
 BUILD_FOOMATIC_TRUE
 BUILD_FOOMATIC_FALSE
 BUILD_FOOMATIC_3_TRUE
@@ -990,12 +973,8 @@ BUILD_TEST_TRUE
 BUILD_TEST_FALSE
 BUILD_TESTPATTERN_TRUE
 BUILD_TESTPATTERN_FALSE
-BUILD_LIBGUTENPRINTUI_TRUE
-BUILD_LIBGUTENPRINTUI_FALSE
 BUILD_LIBGUTENPRINTUI2_TRUE
 BUILD_LIBGUTENPRINTUI2_FALSE
-BUILD_GIMP_TRUE
-BUILD_GIMP_FALSE
 BUILD_GIMP2_TRUE
 BUILD_GIMP2_FALSE
 BUILD_GIMP2_AS_GUTENPRINT_TRUE
@@ -1025,15 +1004,10 @@ GENPPD_LIBS
 IJS_CFLAGS
 IJS_LIBS
 RM
-gimp_plug_indir
 gimp2_plug_indir
 GUTENPRINT_CFLAGS
 GUTENPRINT_LIBS
 GUTENPRINT_LIBDEPS
-GUTENPRINTUI_CFLAGS
-GUTENPRINTUI_LIBS
-GUTENPRINTUI_LIBDEPS
-GUTENPRINTUI_VERSION
 GUTENPRINTUI2_CFLAGS
 GUTENPRINTUI2_LIBS
 GUTENPRINTUI2_LIBDEPS
@@ -1041,9 +1015,6 @@ GUTENPRINTUI2_VERSION
 gutenprint_cflags
 gutenprint_libs
 gutenprint_libdeps
-gutenprintui_cflags
-gutenprintui_libs
-gutenprintui_libdeps
 gutenprintui2_cflags
 gutenprintui2_libs
 gutenprintui2_libdeps
@@ -1580,7 +1551,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gutenprint 5.0.2 to adapt to many kinds of systems.
+\`configure' configures gutenprint 5.1.98.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1650,7 +1621,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gutenprint 5.0.2:";;
+     short | recursive ) echo "Configuration of gutenprint 5.1.98.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1684,10 +1655,6 @@ Optional Features:
                           --disable-static-genppd! [(automatic)]
   --enable-debug          turn on debugging in build [no]
   --enable-profile        turn on profiling in build [no]
-  --disable-gtktest       Do not try to compile and run a test GTK program
-  --enable-libgutenprintui
-                          build Gutenprint GTK+-1.2 user interface library
-                          [(automatic)]
   --enable-libgutenprintui2
                           build Gutenprint GTK+-2.0 user interface library
                           [(automatic)]
@@ -1698,8 +1665,6 @@ Optional Features:
   --enable-user-install   install GIMP plugin in home directory [no]
   --disable-rpath         do not hardcode runtime library paths
   --disable-nls           do not use Native Language Support
-  --disable-glibtest       Do not try to compile and run a test GLIB program
-  --disable-gimptest      Do not try to compile and run a test GIMP 1.2 program
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1717,9 +1682,6 @@ Optional Packages:
                           static) [(automatic)]
   --with-readline         use readline (default tries -lncurses, -lcurses,
                           -ltermcap) [yes]
-  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)
-  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
-  --with-gimp             build GIMP 1.2 Print plugin [(automatic)]
   --with-gimp2            build GIMP 2.x Print plugin [(automatic)]
   --with-gimp2-as-gutenprint
                           name GIMP 2.x Print plugin gutenprint (requires GIMP
@@ -1730,10 +1692,6 @@ Optional Packages:
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix=DIR  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir
-  --with-glib-prefix=PFX   Prefix where GLIB is installed (optional)
-  --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)
-  --with-gimp-prefix=PFX  Prefix where GIMP 1.2 is installed (optional)
-  --with-gimp-exec-prefix=PFX Exec prefix where GIMP 1.2 is installed (optional)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1825,7 +1783,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gutenprint configure 5.0.2
+gutenprint configure 5.1.98.2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1856,7 +1814,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gutenprint $as_me 5.0.2, which was
+It was created by gutenprint $as_me 5.1.98.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2247,16 +2205,13 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 GUTENPRINT_MAJOR_VERSION=5
-GUTENPRINT_MINOR_VERSION=0
-GUTENPRINT_MICRO_VERSION=2
-GUTENPRINT_EXTRA_VERSION=
+GUTENPRINT_MINOR_VERSION=1
+GUTENPRINT_MICRO_VERSION=98
+GUTENPRINT_EXTRA_VERSION=.2
 GUTENPRINT_CURRENT_INTERFACE=2
 GUTENPRINT_INTERFACE_AGE=0
 GUTENPRINT_BINARY_AGE=0
-GUTENPRINT_VERSION=5.0.2
-GUTENPRINTUI_CURRENT_INTERFACE=1
-GUTENPRINTUI_INTERFACE_AGE=0
-GUTENPRINTUI_BINARY_AGE=0
+GUTENPRINT_VERSION=5.1.98.2
 GUTENPRINTUI2_CURRENT_INTERFACE=1
 GUTENPRINTUI2_INTERFACE_AGE=0
 GUTENPRINTUI2_BINARY_AGE=0
@@ -2282,12 +2237,6 @@ GUTENPRINTUI2_BINARY_AGE=0
 
 
 
-
-
-
-
-
-
 CFLAGS="${CFLAGS:=}"
 CPPFLAGS="${CPPFLAGS:=}"
 CXXFLAGS="${CXXFLAGS:=}"
@@ -2600,7 +2549,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gutenprint'
- VERSION='5.0.2'
+ VERSION='5.1.98.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2833,13 +2782,10 @@ echo "${ECHO_T}$am_cv_prog_tar_ustar" >&6; }
 
 
 GUTENPRINT_LIBS="-lgutenprint"
-GUTENPRINTUI_LIBS="-lgutenprintui"
 GUTENPRINTUI2_LIBS="-lgutenprintui2"
 gutenprint_version=${GUTENPRINT_VERSION}
-gutenprintui_version=${GUTENPRINT_VERSION}
 gutenprintui2_version=${GUTENPRINT_VERSION}
 
-GUTENPRINTUI_LIBDEPS="${GUTENPRINTUI_LIBDEPS} \$(GUTENPRINT_LIBS)"
 GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} \$(GUTENPRINT_LIBS)"
 
 ac_config_headers="$ac_config_headers config.h"
@@ -4750,7 +4696,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4753 "configure"' > conftest.$ac_ext
+  echo '#line 4699 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7492,11 +7438,11 @@ else
    -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:7495: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7441: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7499: \$? = $ac_status" >&5
+   echo "$as_me:7445: \$? = $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.
@@ -7782,11 +7728,11 @@ else
    -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:7785: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7731: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7789: \$? = $ac_status" >&5
+   echo "$as_me:7735: \$? = $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.
@@ -7886,11 +7832,11 @@ else
    -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:7889: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7835: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7893: \$? = $ac_status" >&5
+   echo "$as_me:7839: \$? = $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
@@ -10235,7 +10181,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10238 "configure"
+#line 10184 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10335,7 +10281,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10338 "configure"
+#line 10284 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12755,11 +12701,11 @@ else
    -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:12758: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12704: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12762: \$? = $ac_status" >&5
+   echo "$as_me:12708: \$? = $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.
@@ -12859,11 +12805,11 @@ else
    -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:12862: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12808: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12866: \$? = $ac_status" >&5
+   echo "$as_me:12812: \$? = $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
@@ -14421,11 +14367,11 @@ else
    -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:14424: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14370: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14428: \$? = $ac_status" >&5
+   echo "$as_me:14374: \$? = $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.
@@ -14525,11 +14471,11 @@ else
    -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:14528: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14474: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14532: \$? = $ac_status" >&5
+   echo "$as_me:14478: \$? = $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
@@ -16712,11 +16658,11 @@ else
    -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:16715: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16661: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16719: \$? = $ac_status" >&5
+   echo "$as_me:16665: \$? = $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.
@@ -17002,11 +16948,11 @@ else
    -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:17005: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16951: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17009: \$? = $ac_status" >&5
+   echo "$as_me:16955: \$? = $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.
@@ -17106,11 +17052,11 @@ else
    -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:17109: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17055: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17113: \$? = $ac_status" >&5
+   echo "$as_me:17059: \$? = $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
@@ -20522,453 +20468,6 @@ if test -z "${USE_READLINE}" ; then
 fi
 
 
-for ac_prog in gimptool-1.2 gimptool
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_GIMPTOOL_CHECK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $GIMPTOOL_CHECK in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GIMPTOOL_CHECK="$GIMPTOOL_CHECK" # Let the user override the test with a path.
-  ;;
-  *)
-  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_path_GIMPTOOL_CHECK="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-GIMPTOOL_CHECK=$ac_cv_path_GIMPTOOL_CHECK
-if test -n "$GIMPTOOL_CHECK"; then
-  { echo "$as_me:$LINENO: result: $GIMPTOOL_CHECK" >&5
-echo "${ECHO_T}$GIMPTOOL_CHECK" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$GIMPTOOL_CHECK" && break
-done
-
-if test -z "${GIMPTOOL_CHECK}" ; then
-  BUILD_GIMP="no"
-else
-  # Check we have version 1.2
-  gimptool_check_version=`${GIMPTOOL_CHECK} --version`
-  gimptool_check_major=`echo "$gimptool_check_version" | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\1/'`
-  gimptool_check_minor=`echo "$gimptool_check_version" | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\2/'`
-  if test "$gimptool_check_major" -eq 1 -a "$gimptool_check_minor" -eq 2; then
-    BUILD_GIMP="yes"
-  else
-    BUILD_GIMP="no"
-  fi
-fi
-
-
-# Check whether --with-gtk-prefix was given.
-if test "${with_gtk_prefix+set}" = set; then
-  withval=$with_gtk_prefix; gtk_config_prefix="$withval"
-else
-  gtk_config_prefix=""
-fi
-
-
-# Check whether --with-gtk-exec-prefix was given.
-if test "${with_gtk_exec_prefix+set}" = set; then
-  withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval"
-else
-  gtk_config_exec_prefix=""
-fi
-
-# Check whether --enable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then
-  enableval=$enable_gtktest;
-else
-  enable_gtktest=yes
-fi
-
-
-  for module in .
-  do
-      case "$module" in
-         gthread)
-             gtk_config_args="$gtk_config_args gthread"
-         ;;
-      esac
-  done
-
-  if test x$gtk_config_exec_prefix != x ; then
-     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-     fi
-  fi
-  if test x$gtk_config_prefix != x ; then
-     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-     fi
-  fi
-
-  # Extract the first word of "gtk-config", so it can be a program name with args.
-set dummy gtk-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $GTK_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  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_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    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_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
-  ;;
-esac
-fi
-GTK_CONFIG=$ac_cv_path_GTK_CONFIG
-if test -n "$GTK_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
-echo "${ECHO_T}$GTK_CONFIG" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  min_gtk_version=1.2.0
-  { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; }
-  no_gtk=""
-  if test "$GTK_CONFIG" = "no" ; then
-    no_gtk=yes
-  else
-    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
-    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-      rm -f conf.gtktest
-      if test "$cross_compiling" = yes; then
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.gtktest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If gtk-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
-      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    }
-#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-#endif /* defined (GTK_MAJOR_VERSION) ... */
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
-        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-no_gtk=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-     BUILD_LIBGUTENPRINTUI="yes"
-  GUTENPRINTUI_LIBDEPS="${GUTENPRINTUI_LIBDEPS} ${GTK_LIBS}"
-  else
-     { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-     if test "$GTK_CONFIG" = "no" ; then
-       echo "*** The gtk-config script installed by GTK could not be found"
-       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GTK_CONFIG environment variable to the"
-       echo "*** full path to gtk-config."
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK test program, checking why..."
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <gtk/gtk.h>
-#include <stdio.h>
-
-int
-main ()
-{
- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-   echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK or finding the wrong"
-          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
-          echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     BUILD_LIBGUTENPRINTUI="no"
-  fi
-
-
-  rm -f conf.gtktest
-
-
-# create custom command-line --with option
-{ echo "$as_me:$LINENO: checking whether to build GIMP 1.2 Print plugin" >&5
-echo $ECHO_N "checking whether to build GIMP 1.2 Print plugin... $ECHO_C" >&6; }
-
-# Check whether --with-gimp was given.
-if test "${with_gimp+set}" = set; then
-  withval=$with_gimp; case "${withval}" in
-
-                yes) BUILD_GIMP="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_GIMP}" >&5
-echo "${ECHO_T}${BUILD_GIMP}" >&6; } ;;
-                no) BUILD_GIMP="no" ; { echo "$as_me:$LINENO: result: ${BUILD_GIMP}" >&5
-echo "${ECHO_T}${BUILD_GIMP}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-gimp" >&5
-echo "$as_me: error: bad value ${withval} for --with-gimp" >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-	    esac
-else
-  if test -z "${BUILD_GIMP}" ; then
-               BUILD_GIMP="(automatic)"
-             fi
-             { echo "$as_me:$LINENO: result: ${BUILD_GIMP}" >&5
-echo "${ECHO_T}${BUILD_GIMP}" >&6; } ;
-fi
-
-if test -z "${BUILD_GIMP}" ; then
-  BUILD_GIMP="(automatic)"
-fi
-
-
-# create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to build Gutenprint GTK+-1.2 user interface library" >&5
-echo $ECHO_N "checking whether to build Gutenprint GTK+-1.2 user interface library... $ECHO_C" >&6; }
-# Check whether --enable-libgutenprintui was given.
-if test "${enable_libgutenprintui+set}" = set; then
-  enableval=$enable_libgutenprintui; case "${enableval}" in
-
-                yes) BUILD_LIBGUTENPRINTUI="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI}" >&5
-echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI}" >&6; } ;;
-                no) BUILD_LIBGUTENPRINTUI="no" ; { echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI}" >&5
-echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-libgutenprintui" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-libgutenprintui" >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-	    esac
-else
-  if test -z "${BUILD_LIBGUTENPRINTUI}" ; then
-               BUILD_LIBGUTENPRINTUI="(automatic)"
-             fi
-             { echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI}" >&5
-echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI}" >&6; } ;
-fi
-
-if test -z "${BUILD_LIBGUTENPRINTUI}" ; then
-  BUILD_LIBGUTENPRINTUI="(automatic)"
-fi
-
-
 for ac_prog in gimptool-2.0 gimptool
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -21159,11 +20658,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for GTK2" >&5
 echo $ECHO_N "checking for GTK2... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GTK2_CFLAGS"; then
-        pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GTK2_CFLAGS"; then
+    pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
   ac_status=$?
@@ -21173,15 +20671,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GTK2_LIBS"; then
-        pkg_cv_GTK2_LIBS="$GTK2_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GTK2_LIBS"; then
+    pkg_cv_GTK2_LIBS="$GTK2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
   ac_status=$?
@@ -21191,9 +20687,8 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -21206,9 +20701,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GTK2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0"`
+	        GTK2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0" 2>&1`
         else
-	        GTK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"`
+	        GTK2_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK2_PKG_ERRORS" >&5
@@ -21236,11 +20731,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for GIMP2" >&5
 echo $ECHO_N "checking for GIMP2... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GIMP2_CFLAGS"; then
-        pkg_cv_GIMP2_CFLAGS="$GIMP2_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GIMP2_CFLAGS"; then
+    pkg_cv_GIMP2_CFLAGS="$GIMP2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gimpui-2.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "gimpui-2.0") 2>&5
   ac_status=$?
@@ -21250,15 +20744,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GIMP2_LIBS"; then
-        pkg_cv_GIMP2_LIBS="$GIMP2_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GIMP2_LIBS"; then
+    pkg_cv_GIMP2_LIBS="$GIMP2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gimpui-2.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "gimpui-2.0") 2>&5
   ac_status=$?
@@ -21268,9 +20760,8 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -21283,9 +20774,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GIMP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gimpui-2.0"`
+	        GIMP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gimpui-2.0" 2>&1`
         else
-	        GIMP2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gimpui-2.0"`
+	        GIMP2_PKG_ERRORS=`$PKG_CONFIG --print-errors "gimpui-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GIMP2_PKG_ERRORS" >&5
@@ -26030,7 +25521,7 @@ _ACEOF
 
 
 
-PKGXMLDATADIR="${PACKAGE_DATA_DIR}/${PACKAGE_VERSION}/xml"
+PKGXMLDATADIR="${PACKAGE_DATA_DIR}/${GUTENPRINT_RELEASE_VERSION}/xml"
 cat >>confdefs.h <<_ACEOF
 #define PKGXMLDATADIR "$PKGXMLDATADIR"
 _ACEOF
@@ -26038,7 +25529,7 @@ _ACEOF
 
 
 
-PKGMODULEDIR="${PACKAGE_LIB_DIR}/${PACKAGE_VERSION}/modules"
+PKGMODULEDIR="${PACKAGE_LIB_DIR}/${GUTENPRINT_RELEASE_VERSION}/modules"
 cat >>confdefs.h <<_ACEOF
 #define PKGMODULEDIR "$PKGMODULEDIR"
 _ACEOF
@@ -26046,7 +25537,7 @@ _ACEOF
 
 if test x$ac_compiler_gnu = "xyes"; then
 
-  for stp_ac_arg in -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=1048576 ; do
+  for stp_ac_arg in -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=131072 ; do
 
   { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
 echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6; }
@@ -27800,1353 +27291,6 @@ fi
 fi
 
 
-if test x$BUILD_LEXMARKUTIL = xyes -o x$BUILD_GUTENPRINTUI = xyes ; then
-
-# Check whether --with-gtk-prefix was given.
-if test "${with_gtk_prefix+set}" = set; then
-  withval=$with_gtk_prefix; gtk_config_prefix="$withval"
-else
-  gtk_config_prefix=""
-fi
-
-
-# Check whether --with-gtk-exec-prefix was given.
-if test "${with_gtk_exec_prefix+set}" = set; then
-  withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval"
-else
-  gtk_config_exec_prefix=""
-fi
-
-# Check whether --enable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then
-  enableval=$enable_gtktest;
-else
-  enable_gtktest=yes
-fi
-
-
-  for module in .
-  do
-      case "$module" in
-         gthread)
-             gtk_config_args="$gtk_config_args gthread"
-         ;;
-      esac
-  done
-
-  if test x$gtk_config_exec_prefix != x ; then
-     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-     fi
-  fi
-  if test x$gtk_config_prefix != x ; then
-     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-     fi
-  fi
-
-  # Extract the first word of "gtk-config", so it can be a program name with args.
-set dummy gtk-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $GTK_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  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_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    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_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
-  ;;
-esac
-fi
-GTK_CONFIG=$ac_cv_path_GTK_CONFIG
-if test -n "$GTK_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
-echo "${ECHO_T}$GTK_CONFIG" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  min_gtk_version=1.2.0
-  { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; }
-  no_gtk=""
-  if test "$GTK_CONFIG" = "no" ; then
-    no_gtk=yes
-  else
-    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
-    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-      rm -f conf.gtktest
-      if test "$cross_compiling" = yes; then
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.gtktest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If gtk-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
-      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    }
-#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-#endif /* defined (GTK_MAJOR_VERSION) ... */
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
-        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-no_gtk=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-     :
-  else
-     { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-     if test "$GTK_CONFIG" = "no" ; then
-       echo "*** The gtk-config script installed by GTK could not be found"
-       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GTK_CONFIG environment variable to the"
-       echo "*** full path to gtk-config."
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK test program, checking why..."
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <gtk/gtk.h>
-#include <stdio.h>
-
-int
-main ()
-{
- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-   echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK or finding the wrong"
-          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
-          echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     { { echo "$as_me:$LINENO: error: Cannot find GTK: Is gtk-config in path?" >&5
-echo "$as_me: error: Cannot find GTK: Is gtk-config in path?" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-
-
-  rm -f conf.gtktest
-
-fi
-
-if test x${BUILD_GIMP} = xyes ; then
-  if test x$GIMP_SOURCE_TREE_SUBDIR = xyes ; then
-
-# Check whether --with-gtk-prefix was given.
-if test "${with_gtk_prefix+set}" = set; then
-  withval=$with_gtk_prefix; gtk_config_prefix="$withval"
-else
-  gtk_config_prefix=""
-fi
-
-
-# Check whether --with-gtk-exec-prefix was given.
-if test "${with_gtk_exec_prefix+set}" = set; then
-  withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval"
-else
-  gtk_config_exec_prefix=""
-fi
-
-# Check whether --enable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then
-  enableval=$enable_gtktest;
-else
-  enable_gtktest=yes
-fi
-
-
-  for module in .
-  do
-      case "$module" in
-         gthread)
-             gtk_config_args="$gtk_config_args gthread"
-         ;;
-      esac
-  done
-
-  if test x$gtk_config_exec_prefix != x ; then
-     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-     fi
-  fi
-  if test x$gtk_config_prefix != x ; then
-     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-     fi
-  fi
-
-  # Extract the first word of "gtk-config", so it can be a program name with args.
-set dummy gtk-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $GTK_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  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_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    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_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
-  ;;
-esac
-fi
-GTK_CONFIG=$ac_cv_path_GTK_CONFIG
-if test -n "$GTK_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
-echo "${ECHO_T}$GTK_CONFIG" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  min_gtk_version=0.99.7
-  { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; }
-  no_gtk=""
-  if test "$GTK_CONFIG" = "no" ; then
-    no_gtk=yes
-  else
-    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
-    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-      rm -f conf.gtktest
-      if test "$cross_compiling" = yes; then
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.gtktest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If gtk-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
-      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    }
-#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-#endif /* defined (GTK_MAJOR_VERSION) ... */
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
-        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-no_gtk=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-     :
-  else
-     { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-     if test "$GTK_CONFIG" = "no" ; then
-       echo "*** The gtk-config script installed by GTK could not be found"
-       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GTK_CONFIG environment variable to the"
-       echo "*** full path to gtk-config."
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK test program, checking why..."
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <gtk/gtk.h>
-#include <stdio.h>
-
-int
-main ()
-{
- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-   echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK or finding the wrong"
-          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
-          echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     :
-  fi
-
-
-  rm -f conf.gtktest
-
-
-# Check whether --with-glib-prefix was given.
-if test "${with_glib_prefix+set}" = set; then
-  withval=$with_glib_prefix; glib_config_prefix="$withval"
-else
-  glib_config_prefix=""
-fi
-
-
-# Check whether --with-glib-exec-prefix was given.
-if test "${with_glib_exec_prefix+set}" = set; then
-  withval=$with_glib_exec_prefix; glib_config_exec_prefix="$withval"
-else
-  glib_config_exec_prefix=""
-fi
-
-# Check whether --enable-glibtest was given.
-if test "${enable_glibtest+set}" = set; then
-  enableval=$enable_glibtest;
-else
-  enable_glibtest=yes
-fi
-
-
-  if test x$glib_config_exec_prefix != x ; then
-     glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
-     fi
-  fi
-  if test x$glib_config_prefix != x ; then
-     glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_prefix/bin/glib-config
-     fi
-  fi
-
-  for module in .
-  do
-      case "$module" in
-         gmodule)
-             glib_config_args="$glib_config_args gmodule"
-         ;;
-         gthread)
-             glib_config_args="$glib_config_args gthread"
-         ;;
-      esac
-  done
-
-  # Extract the first word of "glib-config", so it can be a program name with args.
-set dummy glib-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_GLIB_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $GLIB_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  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_path_GLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    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_path_GLIB_CONFIG" && ac_cv_path_GLIB_CONFIG="no"
-  ;;
-esac
-fi
-GLIB_CONFIG=$ac_cv_path_GLIB_CONFIG
-if test -n "$GLIB_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $GLIB_CONFIG" >&5
-echo "${ECHO_T}$GLIB_CONFIG" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  min_glib_version=0.99.7
-  { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
-echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; }
-  no_glib=""
-  if test "$GLIB_CONFIG" = "no" ; then
-    no_glib=yes
-  else
-    GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-    GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-    glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-    glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-    glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-      rm -f conf.glibtest
-      if test "$cross_compiling" = yes; then
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.glibtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If glib-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
-      printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    }
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the glib-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
-        printf("*** correct copy of glib-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-no_glib=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-     :
-  else
-     { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-     if test "$GLIB_CONFIG" = "no" ; then
-       echo "*** The glib-config script installed by GLIB could not be found"
-       echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GLIB_CONFIG environment variable to the"
-       echo "*** full path to glib-config."
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <glib.h>
-#include <stdio.h>
-
-int
-main ()
-{
- return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-   echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
-          echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
-          echo "*** may want to edit the glib-config script: $GLIB_CONFIG"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     :
-  fi
-
-
-  rm -f conf.glibtest
-
-    GIMP_CFLAGS="-I\$(top_srcdir)/../.. \$(GTK_CFLAGS) \$(GLIB_CFLAGS)"
-    GIMP_LIBS="\$(GTK_LIBS) \$(GLIB_LIBS) \$(top_builddir)/../../libgimp/libgimp.la  \$(top_builddir)/../../libgimp/libgimpui.la"
-  else
-
-# Check whether --with-gimp-prefix was given.
-if test "${with_gimp_prefix+set}" = set; then
-  withval=$with_gimp_prefix; gimptool_prefix="$withval"
-else
-  gimptool_prefix=""
-fi
-
-
-# Check whether --with-gimp-exec-prefix was given.
-if test "${with_gimp_exec_prefix+set}" = set; then
-  withval=$with_gimp_exec_prefix; gimptool_exec_prefix="$withval"
-else
-  gimptool_exec_prefix=""
-fi
-
-# Check whether --enable-gimptest was given.
-if test "${enable_gimptest+set}" = set; then
-  enableval=$enable_gimptest;
-else
-  enable_gimptest=yes
-fi
-
-
-  if test x$gimptool_exec_prefix != x ; then
-     gimptool_args="$gimptool_args --exec-prefix=$gimptool_exec_prefix"
-     if test x${GIMPTOOL+set} != xset ; then
-        GIMPTOOL=$gimptool_exec_prefix/bin/gimptool-1.2
-     fi
-  fi
-  if test x$gimptool_prefix != x ; then
-     gimptool_args="$gimptool_args --prefix=$gimptool_prefix"
-     if test x${GIMPTOOL+set} != xset ; then
-        GIMPTOOL=$gimptool_prefix/bin/gimptool-1.2
-     fi
-  fi
-
-  for ac_prog in gimptool-1.2 gimptool
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_GIMPTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $GIMPTOOL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GIMPTOOL="$GIMPTOOL" # Let the user override the test with a path.
-  ;;
-  *)
-  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_path_GIMPTOOL="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-GIMPTOOL=$ac_cv_path_GIMPTOOL
-if test -n "$GIMPTOOL"; then
-  { echo "$as_me:$LINENO: result: $GIMPTOOL" >&5
-echo "${ECHO_T}$GIMPTOOL" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$GIMPTOOL" && break
-done
-test -n "$GIMPTOOL" || GIMPTOOL="no"
-
-  min_gimp_version=1.2.0
-  { echo "$as_me:$LINENO: checking for GIMP 1.2 - version >= $min_gimp_version" >&5
-echo $ECHO_N "checking for GIMP 1.2 - version >= $min_gimp_version... $ECHO_C" >&6; }
-  no_gimp=""
-  if test "$GIMPTOOL" = "no" ; then
-    no_gimp=yes
-  else
-    GIMP_CFLAGS=`$GIMPTOOL $gimptool_args --cflags`
-    GIMP_LIBS=`$GIMPTOOL $gimptool_args --libs`
-
-    GIMP_CFLAGS_NOUI=`$GIMPTOOL $gimptool_args --cflags-noui`
-    noui_test=`echo $GIMP_CFLAGS_NOUI | sed 's/^\(Usage\).*/\1/'`
-    if test "$noui_test" = "Usage" ; then
-       GIMP_CFLAGS_NOUI=$GIMP_CFLAGS
-       GIMP_LIBS_NOUI=$GIMP_LIBS
-    else
-       GIMP_LIBS_NOUI=`$GIMPTOOL $gimptool_args --libs-noui`
-    fi
-
-    GIMP_DATA_DIR=`$GIMPTOOL $gimptool_args --gimpdatadir`
-    GIMP_PLUGIN_DIR=`$GIMPTOOL $gimptool_args --gimpplugindir`
-    nodatadir_test=`echo $GIMP_DATA_DIR | sed 's/^\(Usage\).*/\1/'`
-    if test "$nodatadir_test" = "Usage" ; then
-       GIMP_DATA_DIR=""
-       GIMP_PLUGIN_DIR=""
-    fi
-
-    gimptool_major_version=`$GIMPTOOL $gimptool_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-    gimptool_minor_version=`$GIMPTOOL $gimptool_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-    gimptool_micro_version=`$GIMPTOOL $gimptool_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    if test "x$enable_gimptest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GIMP_CFLAGS"
-      LIBS="$LIBS $GIMP_LIBS"
-      rm -f conf.gimptest
-      if test "$cross_compiling" = yes; then
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <libgimp/gimp.h>
-
-#ifndef GIMP_CHECK_VERSION
-#define GIMP_CHECK_VERSION(major, minor, micro) \
-    (GIMP_MAJOR_VERSION == (major) && \
-     GIMP_MINOR_VERSION == (minor) && \
-     GIMP_MICRO_VERSION >= (micro))
-#endif
-
-#if GIMP_CHECK_VERSION(1,2,0)
-GimpPlugInInfo
-#else
-GPlugInInfo
-#endif
-PLUG_IN_INFO =
-{
-  NULL,  /* init_proc */
-  NULL,  /* quit_proc */
-  NULL,  /* query_proc */
-  NULL   /* run_proc */
-};
-
-int main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.gimptest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gimp_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gimp_version");
-     exit(1);
-   }
-
-    if (($gimptool_major_version == major) &&
-        ($gimptool_minor_version == minor) &&
-        ($gimptool_micro_version >= micro))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'gimptool --version' returned %d.%d.%d, but the version\n", $gimptool_major_version, $gimptool_minor_version, $gimptool_micro_version);
-      printf("*** of GIMP 1.2 required is at least %d.%d.%d. If gimptool is\n", major, minor, micro);
-      printf("*** correct, then it is best to upgrade to the required version.\n");
-      printf("*** If gimptool was wrong, set the environment variable GIMPTOOL\n");
-      printf("*** to point to the correct copy of gimptool, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-no_gimp=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gimp" = x ; then
-     { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-     SAVE_GTK_LIBS="$GIMP_LIBS"
-                   SAVE_GTK_CFLAGS="$GIMP_CFLAGS"
-  else
-     { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-     if test "$GIMPTOOL" = "no" ; then
-       echo "*** The gimptool script installed by GIMP 1.2 could not be"
-       echo "*** found.  If GIMP 1.2 was installed in PREFIX, make sure"
-       echo "*** PREFIX/bin is in your path, or set the GIMPTOOL"
-       echo "*** environment variable to the full path to gimptool."
-     else
-       if test -f conf.gimptest ; then
-        :
-       else
-          echo "*** Could not run GIMP 1.2 test program, checking why..."
-          CFLAGS="$CFLAGS $GIMP_CFLAGS"
-          LIBS="$LIBS $GIMP_LIBS"
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <libgimp/gimp.h>
-
-#ifndef GIMP_CHECK_VERSION
-#define GIMP_CHECK_VERSION(major, minor, micro) \
-    (GIMP_MAJOR_VERSION == (major) && \
-     GIMP_MINOR_VERSION == (minor) && \
-     GIMP_MICRO_VERSION >= (micro))
-#endif
-
-#if GIMP_CHECK_VERSION(1,2,0)
-GimpPlugInInfo
-#else
-GPlugInInfo
-#endif
-PLUG_IN_INFO =
-{
-  NULL,  /* init_proc */
-  NULL,  /* quit_proc */
-  NULL,  /* query_proc */
-  NULL   /* run_proc */
-};
-
-int
-main ()
-{
- return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-   echo "*** The test program compiled, but did not run. This usually means that"
-          echo "*** the run-time linker is not finding GIMP 1.2 or is finding the wrong"
-          echo "*** version of GIMP.  If it is not finding GIMP 1.2, you'll need to set"
-          echo "*** your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf"
-          echo "*** to point to the installed location.  Also, make sure you have run"
-          echo "*** ldconfig if that is required on your system."
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it,"
-          echo "*** although you may also be able to get things to work by modifying"
-          echo "*** LD_LIBRARY_PATH."
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 echo "*** The test program failed to compile or link.  See the file config.log"
-          echo "*** for the exact error that occured.  This usually means GIMP 1.2 was"
-          echo "*** incorrectly installed or that you have moved GIMP 1.2 since it was"
-          echo "*** installed.  In the latter case, you may want to edit the gimptool"
-          echo "*** gimptool script: $GIMPTOOL"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GIMP_CFLAGS=""
-     GIMP_LIBS=""
-     GIMP_CFLAGS_NOUI=""
-     GIMP_LIBS_NOUI=""
-     { { echo "$as_me:$LINENO: error: Cannot find GIMP 1.2 libraries: Please run ldconfig as root, make sure gimptool is on your PATH, and if applicable ensure that you have the GIMP, GTK, and GLIB development packages installed." >&5
-echo "$as_me: error: Cannot find GIMP 1.2 libraries: Please run ldconfig as root, make sure gimptool is on your PATH, and if applicable ensure that you have the GIMP, GTK, and GLIB development packages installed." >&2;}
-   { (exit 1); exit 1; }; }
-
-  fi
-
-
-
-
-
-
-  rm -f conf.gimptest
-
-  fi
-fi
-
-
-if test x${BUILD_GIMP} = xyes ; then
-  { echo "$as_me:$LINENO: checking for GIMP 1.2 plug-in directory" >&5
-echo $ECHO_N "checking for GIMP 1.2 plug-in directory... $ECHO_C" >&6; }
-# create temporary "plug-in" to install
-  touch print
-  chmod 755 print
-  GIMPTOOL_OUTPUT=`$GIMPTOOL --dry-run --install-${PLUG_IN_PATH} print`
-  rm print
-  gimp_plug_indir=`echo "$GIMPTOOL_OUTPUT" | sed -e 's/.* \(.*\)\/print/\1/'`
-  { echo "$as_me:$LINENO: result: $gimp_plug_indir" >&5
-echo "${ECHO_T}$gimp_plug_indir" >&6; }
-else
-  gimp_plug_indir="$libdir/gimp/1.2/plug-ins"
-fi
-
 if test x${BUILD_GIMP2} = xyes ; then
   GIMP2_DATA_DIR=`$PKG_CONFIG gimp-2.0 --variable=gimpdatadir`
   GIMP2_PLUGIN_DIR=`$PKG_CONFIG gimp-2.0 --variable=gimplibdir`/plug-ins
@@ -31686,15 +29830,6 @@ else
 fi
 
 
- if test x${BUILD_LIBGUTENPRINTUI} = xyes; then
-  BUILD_LIBGUTENPRINTUI_TRUE=
-  BUILD_LIBGUTENPRINTUI_FALSE='#'
-else
-  BUILD_LIBGUTENPRINTUI_TRUE='#'
-  BUILD_LIBGUTENPRINTUI_FALSE=
-fi
-
-
  if test x${BUILD_LIBGUTENPRINTUI2} = xyes; then
   BUILD_LIBGUTENPRINTUI2_TRUE=
   BUILD_LIBGUTENPRINTUI2_FALSE='#'
@@ -31704,15 +29839,6 @@ else
 fi
 
 
- if test x${BUILD_GIMP} = xyes; then
-  BUILD_GIMP_TRUE=
-  BUILD_GIMP_FALSE='#'
-else
-  BUILD_GIMP_TRUE='#'
-  BUILD_GIMP_FALSE=
-fi
-
-
  if test x${BUILD_GIMP2} = xyes; then
   BUILD_GIMP2_TRUE=
   BUILD_GIMP2_FALSE='#'
@@ -31933,7 +30059,7 @@ cat >>confdefs.h <<_ACEOF
 #define CUPS_PPD_PS_LEVEL ${CUPS_PPD_PS_LEVEL}
 _ACEOF
 
-RELEASE_DATE="01 Jan 2008"
+RELEASE_DATE="27 Apr 2008"
 
 cat >>confdefs.h <<_ACEOF
 #define RELEASE_DATE "${RELEASE_DATE}"
@@ -31970,21 +30096,10 @@ RM='rm'
 
 
 
-
-
-
-
-
-
-
 gutenprint_libs="${GUTENPRINT_LIBS} ${gutenprint_libdeps}"
 
 
 
-gutenprintui_libs="${GUTENPRINTUI_LIBS} ${gutenprintui_libdeps}"
-
-
-
 gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}"
 
 
@@ -32009,8 +30124,6 @@ ac_config_files="$ac_config_files include/Makefile"
 
 ac_config_files="$ac_config_files include/gutenprint/Makefile"
 
-ac_config_files="$ac_config_files include/gutenprintui/Makefile"
-
 ac_config_files="$ac_config_files include/gutenprintui2/Makefile"
 
 ac_config_files="$ac_config_files include/gutenprint/gutenprint-version.h"
@@ -32021,8 +30134,6 @@ ac_config_files="$ac_config_files man/cups-calibrate.8"
 
 ac_config_files="$ac_config_files man/cups-genppd.8"
 
-ac_config_files="$ac_config_files man/cups-genppdconfig.8"
-
 ac_config_files="$ac_config_files man/cups-genppdupdate.8"
 
 ac_config_files="$ac_config_files man/escputil.1"
@@ -32037,8 +30148,6 @@ ac_config_files="$ac_config_files src/Makefile"
 
 ac_config_files="$ac_config_files src/cups/Makefile"
 
-ac_config_files="$ac_config_files src/cups/cups-genppdconfig"
-
 ac_config_files="$ac_config_files src/cups/cups-genppdupdate"
 
 ac_config_files="$ac_config_files src/escputil/Makefile"
@@ -32057,18 +30166,12 @@ ac_config_files="$ac_config_files src/ghost/Makefile"
 
 ac_config_files="$ac_config_files src/testpattern/Makefile"
 
-ac_config_files="$ac_config_files src/gimp/Makefile"
-
 ac_config_files="$ac_config_files src/gimp2/Makefile"
 
 ac_config_files="$ac_config_files src/main/Makefile"
 
 ac_config_files="$ac_config_files src/main/gutenprint.pc"
 
-ac_config_files="$ac_config_files src/gutenprintui/Makefile"
-
-ac_config_files="$ac_config_files src/gutenprintui/gutenprintui.pc"
-
 ac_config_files="$ac_config_files src/gutenprintui2/Makefile"
 
 ac_config_files="$ac_config_files src/gutenprintui2/gutenprintui2.pc"
@@ -32309,13 +30412,6 @@ echo "$as_me: error: conditional \"BUILD_TESTPATTERN\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${BUILD_LIBGUTENPRINTUI_TRUE}" && test -z "${BUILD_LIBGUTENPRINTUI_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_LIBGUTENPRINTUI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_LIBGUTENPRINTUI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${BUILD_LIBGUTENPRINTUI2_TRUE}" && test -z "${BUILD_LIBGUTENPRINTUI2_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"BUILD_LIBGUTENPRINTUI2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -32323,13 +30419,6 @@ echo "$as_me: error: conditional \"BUILD_LIBGUTENPRINTUI2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${BUILD_GIMP_TRUE}" && test -z "${BUILD_GIMP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_GIMP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_GIMP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${BUILD_GIMP2_TRUE}" && test -z "${BUILD_GIMP2_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"BUILD_GIMP2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -32683,7 +30772,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gutenprint $as_me 5.0.2, which was
+This file was extended by gutenprint $as_me 5.1.98.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -32736,7 +30825,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-gutenprint config.status 5.0.2
+gutenprint config.status 5.1.98.2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -32869,13 +30958,11 @@ do
     "doc/developer/Makefile") CONFIG_FILES="$CONFIG_FILES doc/developer/Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
     "include/gutenprint/Makefile") CONFIG_FILES="$CONFIG_FILES include/gutenprint/Makefile" ;;
-    "include/gutenprintui/Makefile") CONFIG_FILES="$CONFIG_FILES include/gutenprintui/Makefile" ;;
     "include/gutenprintui2/Makefile") CONFIG_FILES="$CONFIG_FILES include/gutenprintui2/Makefile" ;;
     "include/gutenprint/gutenprint-version.h") CONFIG_FILES="$CONFIG_FILES include/gutenprint/gutenprint-version.h" ;;
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
     "man/cups-calibrate.8") CONFIG_FILES="$CONFIG_FILES man/cups-calibrate.8" ;;
     "man/cups-genppd.8") CONFIG_FILES="$CONFIG_FILES man/cups-genppd.8" ;;
-    "man/cups-genppdconfig.8") CONFIG_FILES="$CONFIG_FILES man/cups-genppdconfig.8" ;;
     "man/cups-genppdupdate.8") CONFIG_FILES="$CONFIG_FILES man/cups-genppdupdate.8" ;;
     "man/escputil.1") CONFIG_FILES="$CONFIG_FILES man/escputil.1" ;;
     "man/ijsgutenprint.1") CONFIG_FILES="$CONFIG_FILES man/ijsgutenprint.1" ;;
@@ -32883,7 +30970,6 @@ do
     "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/cups/Makefile") CONFIG_FILES="$CONFIG_FILES src/cups/Makefile" ;;
-    "src/cups/cups-genppdconfig") CONFIG_FILES="$CONFIG_FILES src/cups/cups-genppdconfig" ;;
     "src/cups/cups-genppdupdate") CONFIG_FILES="$CONFIG_FILES src/cups/cups-genppdupdate" ;;
     "src/escputil/Makefile") CONFIG_FILES="$CONFIG_FILES src/escputil/Makefile" ;;
     "src/foomatic/Makefile") CONFIG_FILES="$CONFIG_FILES src/foomatic/Makefile" ;;
@@ -32893,12 +30979,9 @@ do
     "src/cups/test-rastertogutenprint") CONFIG_FILES="$CONFIG_FILES src/cups/test-rastertogutenprint" ;;
     "src/ghost/Makefile") CONFIG_FILES="$CONFIG_FILES src/ghost/Makefile" ;;
     "src/testpattern/Makefile") CONFIG_FILES="$CONFIG_FILES src/testpattern/Makefile" ;;
-    "src/gimp/Makefile") CONFIG_FILES="$CONFIG_FILES src/gimp/Makefile" ;;
     "src/gimp2/Makefile") CONFIG_FILES="$CONFIG_FILES src/gimp2/Makefile" ;;
     "src/main/Makefile") CONFIG_FILES="$CONFIG_FILES src/main/Makefile" ;;
     "src/main/gutenprint.pc") CONFIG_FILES="$CONFIG_FILES src/main/gutenprint.pc" ;;
-    "src/gutenprintui/Makefile") CONFIG_FILES="$CONFIG_FILES src/gutenprintui/Makefile" ;;
-    "src/gutenprintui/gutenprintui.pc") CONFIG_FILES="$CONFIG_FILES src/gutenprintui/gutenprintui.pc" ;;
     "src/gutenprintui2/Makefile") CONFIG_FILES="$CONFIG_FILES src/gutenprintui2/Makefile" ;;
     "src/gutenprintui2/gutenprintui2.pc") CONFIG_FILES="$CONFIG_FILES src/gutenprintui2/gutenprintui2.pc" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
@@ -33010,9 +31093,6 @@ GUTENPRINT_CURRENT_INTERFACE!$GUTENPRINT_CURRENT_INTERFACE$ac_delim
 GUTENPRINT_INTERFACE_AGE!$GUTENPRINT_INTERFACE_AGE$ac_delim
 GUTENPRINT_BINARY_AGE!$GUTENPRINT_BINARY_AGE$ac_delim
 GUTENPRINT_VERSION!$GUTENPRINT_VERSION$ac_delim
-GUTENPRINTUI_CURRENT_INTERFACE!$GUTENPRINTUI_CURRENT_INTERFACE$ac_delim
-GUTENPRINTUI_INTERFACE_AGE!$GUTENPRINTUI_INTERFACE_AGE$ac_delim
-GUTENPRINTUI_BINARY_AGE!$GUTENPRINTUI_BINARY_AGE$ac_delim
 GUTENPRINTUI2_CURRENT_INTERFACE!$GUTENPRINTUI2_CURRENT_INTERFACE$ac_delim
 GUTENPRINTUI2_INTERFACE_AGE!$GUTENPRINTUI2_INTERFACE_AGE$ac_delim
 GUTENPRINTUI2_BINARY_AGE!$GUTENPRINTUI2_BINARY_AGE$ac_delim
@@ -33063,6 +31143,9 @@ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
 CCDEPMODE!$CCDEPMODE$ac_delim
 am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
 am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+SED!$SED$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -33104,9 +31187,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-SED!$SED$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
 LN_S!$LN_S$ac_delim
 ECHO!$ECHO$ac_delim
 AR!$AR$ac_delim
@@ -33131,10 +31211,6 @@ CUPS_CONFIG!$CUPS_CONFIG$ac_delim
 FOOMATIC_CONFIGURE!$FOOMATIC_CONFIGURE$ac_delim
 FOOMATIC_PPDFILE!$FOOMATIC_PPDFILE$ac_delim
 IJS_CONFIG!$IJS_CONFIG$ac_delim
-GIMPTOOL_CHECK!$GIMPTOOL_CHECK$ac_delim
-GTK_CONFIG!$GTK_CONFIG$ac_delim
-GTK_CFLAGS!$GTK_CFLAGS$ac_delim
-GTK_LIBS!$GTK_LIBS$ac_delim
 GIMPTOOL2_CHECK!$GIMPTOOL2_CHECK$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
 GTK2_CFLAGS!$GTK2_CFLAGS$ac_delim
@@ -33174,16 +31250,6 @@ LIBINTL!$LIBINTL$ac_delim
 LTLIBINTL!$LTLIBINTL$ac_delim
 POSUB!$POSUB$ac_delim
 GNUCFLAGS!$GNUCFLAGS$ac_delim
-GLIB_CONFIG!$GLIB_CONFIG$ac_delim
-GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
-GLIB_LIBS!$GLIB_LIBS$ac_delim
-GIMPTOOL!$GIMPTOOL$ac_delim
-GIMP_CFLAGS!$GIMP_CFLAGS$ac_delim
-GIMP_LIBS!$GIMP_LIBS$ac_delim
-GIMP_CFLAGS_NOUI!$GIMP_CFLAGS_NOUI$ac_delim
-GIMP_LIBS_NOUI!$GIMP_LIBS_NOUI$ac_delim
-GIMP_DATA_DIR!$GIMP_DATA_DIR$ac_delim
-GIMP_PLUGIN_DIR!$GIMP_PLUGIN_DIR$ac_delim
 BUILD_FOOMATIC_TRUE!$BUILD_FOOMATIC_TRUE$ac_delim
 BUILD_FOOMATIC_FALSE!$BUILD_FOOMATIC_FALSE$ac_delim
 BUILD_FOOMATIC_3_TRUE!$BUILD_FOOMATIC_3_TRUE$ac_delim
@@ -33201,6 +31267,23 @@ CUPS_PPDS_AT_TOP_LEVEL_FALSE!$CUPS_PPDS_AT_TOP_LEVEL_FALSE$ac_delim
 BUILD_TRANSLATED_CUPS_PPDS_TRUE!$BUILD_TRANSLATED_CUPS_PPDS_TRUE$ac_delim
 BUILD_TRANSLATED_CUPS_PPDS_FALSE!$BUILD_TRANSLATED_CUPS_PPDS_FALSE$ac_delim
 BUILD_SIMPLIFIED_CUPS_PPDS_TRUE!$BUILD_SIMPLIFIED_CUPS_PPDS_TRUE$ac_delim
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE!$BUILD_SIMPLIFIED_CUPS_PPDS_FALSE$ac_delim
+USE_LEVEL3_PS_TRUE!$USE_LEVEL3_PS_TRUE$ac_delim
+USE_LEVEL3_PS_FALSE!$USE_LEVEL3_PS_FALSE$ac_delim
+BUILD_ESCPUTIL_TRUE!$BUILD_ESCPUTIL_TRUE$ac_delim
+BUILD_ESCPUTIL_FALSE!$BUILD_ESCPUTIL_FALSE$ac_delim
+BUILD_TEST_TRUE!$BUILD_TEST_TRUE$ac_delim
+BUILD_TEST_FALSE!$BUILD_TEST_FALSE$ac_delim
+BUILD_TESTPATTERN_TRUE!$BUILD_TESTPATTERN_TRUE$ac_delim
+BUILD_TESTPATTERN_FALSE!$BUILD_TESTPATTERN_FALSE$ac_delim
+BUILD_LIBGUTENPRINTUI2_TRUE!$BUILD_LIBGUTENPRINTUI2_TRUE$ac_delim
+BUILD_LIBGUTENPRINTUI2_FALSE!$BUILD_LIBGUTENPRINTUI2_FALSE$ac_delim
+BUILD_GIMP2_TRUE!$BUILD_GIMP2_TRUE$ac_delim
+BUILD_GIMP2_FALSE!$BUILD_GIMP2_FALSE$ac_delim
+BUILD_GIMP2_AS_GUTENPRINT_TRUE!$BUILD_GIMP2_AS_GUTENPRINT_TRUE$ac_delim
+BUILD_GIMP2_AS_GUTENPRINT_FALSE!$BUILD_GIMP2_AS_GUTENPRINT_FALSE$ac_delim
+INSTALL_SAMPLES_TRUE!$INSTALL_SAMPLES_TRUE$ac_delim
+INSTALL_SAMPLES_FALSE!$INSTALL_SAMPLES_FALSE$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -33242,27 +31325,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-BUILD_SIMPLIFIED_CUPS_PPDS_FALSE!$BUILD_SIMPLIFIED_CUPS_PPDS_FALSE$ac_delim
-USE_LEVEL3_PS_TRUE!$USE_LEVEL3_PS_TRUE$ac_delim
-USE_LEVEL3_PS_FALSE!$USE_LEVEL3_PS_FALSE$ac_delim
-BUILD_ESCPUTIL_TRUE!$BUILD_ESCPUTIL_TRUE$ac_delim
-BUILD_ESCPUTIL_FALSE!$BUILD_ESCPUTIL_FALSE$ac_delim
-BUILD_TEST_TRUE!$BUILD_TEST_TRUE$ac_delim
-BUILD_TEST_FALSE!$BUILD_TEST_FALSE$ac_delim
-BUILD_TESTPATTERN_TRUE!$BUILD_TESTPATTERN_TRUE$ac_delim
-BUILD_TESTPATTERN_FALSE!$BUILD_TESTPATTERN_FALSE$ac_delim
-BUILD_LIBGUTENPRINTUI_TRUE!$BUILD_LIBGUTENPRINTUI_TRUE$ac_delim
-BUILD_LIBGUTENPRINTUI_FALSE!$BUILD_LIBGUTENPRINTUI_FALSE$ac_delim
-BUILD_LIBGUTENPRINTUI2_TRUE!$BUILD_LIBGUTENPRINTUI2_TRUE$ac_delim
-BUILD_LIBGUTENPRINTUI2_FALSE!$BUILD_LIBGUTENPRINTUI2_FALSE$ac_delim
-BUILD_GIMP_TRUE!$BUILD_GIMP_TRUE$ac_delim
-BUILD_GIMP_FALSE!$BUILD_GIMP_FALSE$ac_delim
-BUILD_GIMP2_TRUE!$BUILD_GIMP2_TRUE$ac_delim
-BUILD_GIMP2_FALSE!$BUILD_GIMP2_FALSE$ac_delim
-BUILD_GIMP2_AS_GUTENPRINT_TRUE!$BUILD_GIMP2_AS_GUTENPRINT_TRUE$ac_delim
-BUILD_GIMP2_AS_GUTENPRINT_FALSE!$BUILD_GIMP2_AS_GUTENPRINT_FALSE$ac_delim
-INSTALL_SAMPLES_TRUE!$INSTALL_SAMPLES_TRUE$ac_delim
-INSTALL_SAMPLES_FALSE!$INSTALL_SAMPLES_FALSE$ac_delim
 INSTALL_USER_GUIDE_TRUE!$INSTALL_USER_GUIDE_TRUE$ac_delim
 INSTALL_USER_GUIDE_FALSE!$INSTALL_USER_GUIDE_FALSE$ac_delim
 USE_NLS_TRUE!$USE_NLS_TRUE$ac_delim
@@ -33286,15 +31348,10 @@ GENPPD_LIBS!$GENPPD_LIBS$ac_delim
 IJS_CFLAGS!$IJS_CFLAGS$ac_delim
 IJS_LIBS!$IJS_LIBS$ac_delim
 RM!$RM$ac_delim
-gimp_plug_indir!$gimp_plug_indir$ac_delim
 gimp2_plug_indir!$gimp2_plug_indir$ac_delim
 GUTENPRINT_CFLAGS!$GUTENPRINT_CFLAGS$ac_delim
 GUTENPRINT_LIBS!$GUTENPRINT_LIBS$ac_delim
 GUTENPRINT_LIBDEPS!$GUTENPRINT_LIBDEPS$ac_delim
-GUTENPRINTUI_CFLAGS!$GUTENPRINTUI_CFLAGS$ac_delim
-GUTENPRINTUI_LIBS!$GUTENPRINTUI_LIBS$ac_delim
-GUTENPRINTUI_LIBDEPS!$GUTENPRINTUI_LIBDEPS$ac_delim
-GUTENPRINTUI_VERSION!$GUTENPRINTUI_VERSION$ac_delim
 GUTENPRINTUI2_CFLAGS!$GUTENPRINTUI2_CFLAGS$ac_delim
 GUTENPRINTUI2_LIBS!$GUTENPRINTUI2_LIBS$ac_delim
 GUTENPRINTUI2_LIBDEPS!$GUTENPRINTUI2_LIBDEPS$ac_delim
@@ -33302,9 +31359,6 @@ GUTENPRINTUI2_VERSION!$GUTENPRINTUI2_VERSION$ac_delim
 gutenprint_cflags!$gutenprint_cflags$ac_delim
 gutenprint_libs!$gutenprint_libs$ac_delim
 gutenprint_libdeps!$gutenprint_libdeps$ac_delim
-gutenprintui_cflags!$gutenprintui_cflags$ac_delim
-gutenprintui_libs!$gutenprintui_libs$ac_delim
-gutenprintui_libdeps!$gutenprintui_libdeps$ac_delim
 gutenprintui2_cflags!$gutenprintui2_cflags$ac_delim
 gutenprintui2_libs!$gutenprintui2_libs$ac_delim
 gutenprintui2_libdeps!$gutenprintui2_libdeps$ac_delim
@@ -33318,7 +31372,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
 LTALLOCA!$LTALLOCA$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 45; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -33980,14 +32034,7 @@ done
         ;;
       esac
     done ;;
-    "src/cups/cups-genppdconfig":F) chmod +x src/cups/cups-genppdconfig;
-		 rm -f src/cups/cups-genppdconfig.${GUTENPRINT_RELEASE_VERSION};
-		 mv src/cups/cups-genppdconfig src/cups/cups-genppdconfig.${GUTENPRINT_RELEASE_VERSION};
-		 echo "    *** Ignore any warning that may follow that sed can't read src/cups/cups-genppdconfig" ;;
-    "src/cups/cups-genppdupdate":F) chmod +x src/cups/cups-genppdupdate;
-		 rm -f src/cups/cups-genppdupdate.${GUTENPRINT_RELEASE_VERSION};
-		 mv src/cups/cups-genppdupdate src/cups/cups-genppdupdate.${GUTENPRINT_RELEASE_VERSION};
-		 echo "    *** Ignore any warning that may follow that sed can't read src/cups/cups-genppdupdate" ;;
+    "src/cups/cups-genppdupdate":F) chmod +x src/cups/cups-genppdupdate ;;
     "src/foomatic/foomatic-generator":F) chmod +x src/foomatic/foomatic-generator ;;
     "src/foomatic/mk_printerlist":F) chmod +x src/foomatic/mk_printerlist ;;
     "src/testpattern/run-testpattern-2":F) chmod +x src/testpattern/run-testpattern-2 ;;
@@ -34070,16 +32117,12 @@ echo "    Build Foomatic data:                        $BUILD_FOOMATIC"
 if test "$BUILD_FOOMATIC" != "no" ; then
     echo "        Build Foomatic 3.x data:                $BUILD_FOOMATIC_3"
 fi
-if test "$BUILD_GIMP" != "no" -o "$BUILD_GIMP2" != "no" ; then
+if test "$BUILD_GIMP2" != "no" ; then
     echo "    Build enhanced Print plugin for GIMP:       yes"
-    echo "        Build GIMP 1.2 plugin:                  $BUILD_GIMP"
-    echo "        Build GIMP 2.x plugin:                  $BUILD_GIMP2"
-    if test "$BUILD_GIMP2" != "no" ; then
-	if test "$BUILD_GIMP2_AS_GUTENPRINT" != "no" ; then
-	    echo "            GIMP 2.x plugin will be named:      gutenprint"
-	else
-	    echo "            GIMP 2.x plugin will be named:      print"
-	fi
+    if test "$BUILD_GIMP2_AS_GUTENPRINT" != "no" ; then
+	echo "        GIMP plugin will be named:              gutenprint"
+    else
+	echo "        GIMP plugin will be named:              print"
     fi
     echo "        Install plugin(s) in home directory:    $USER_INSTALL"
 else