Imported Upstream version 5.0.0

1 files changed, 151 insertions, 110 deletions

diff --git a/configure b/configure
index 4116ac0..79a53a4 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.139 .
+# From configure.ac Revision: 1.145 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for gutenprint 5.0.0-rc3.
+# Generated by GNU Autoconf 2.59 for gutenprint 5.0.0.
 #
 # Report bugs to <gimp-print-devel@lists.sourceforge.net>.
 #
@@ -441,8 +441,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='gutenprint'
 PACKAGE_TARNAME='gutenprint'
-PACKAGE_VERSION='5.0.0-rc3'
-PACKAGE_STRING='gutenprint 5.0.0-rc3'
+PACKAGE_VERSION='5.0.0'
+PACKAGE_STRING='gutenprint 5.0.0'
 PACKAGE_BUGREPORT='gimp-print-devel@lists.sourceforge.net'
 
 ac_unique_file="src/main/print-vars.c"
@@ -483,7 +483,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS GUTENPRINT_MAJOR_VERSION GUTENPRINT_MINOR_VERSION GUTENPRINT_MICRO_VERSION 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ALL_LINGUAS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CUPS_CONFIG FOOMATIC_CONFIGURE FOOMATIC_PPDFILE IJS_CONFIG GIMPTOOL_CHECK GTK_CONFIG GTK_CFLAGS GTK_LIBS GIMPTOOL2_CHECK PKG_CONFIG ac_pt_PKG_CONFIG GTK2_CFLAGS GTK2_LIBS GIMP2_CFLAGS GIMP2_LIBS LEX LEXLIB LEX_OUTPUT_ROOT YACC FIND PERL GLIB_MKENUMS CONVERT TEXI2HTML DVIPS DB2PDF DVIPDF DB2PS DB2HTML DOXYGEN DIALOG FOOMATIC_KITLOAD MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS 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 BUILD_FOOMATIC_3_FALSE BUILD_GHOSTSCRIPT_TRUE BUILD_GHOSTSCRIPT_FALSE BUILD_CUPS_TRUE BUILD_CUPS_FALSE BUILD_CUPS_PPDS_TRUE BUILD_CUPS_PPDS_FALSE CUPS_PPDS_AT_TOP_LEVEL_TRUE CUPS_PPDS_AT_TOP_LEVEL_FALSE BUILD_TRANSLATED_CUPS_PPDS_TRUE BUILD_TRANSLATED_CUPS_PPDS_FALSE USE_LEVEL3_PS_TRUE USE_LEVEL3_PS_FALSE BUILD_ESCPUTIL_TRUE BUILD_ESCPUTIL_FALSE 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 INSTALL_SAMPLES_TRUE INSTALL_SAMPLES_FALSE INSTALL_USER_GUIDE_TRUE INSTALL_USER_GUIDE_FALSE USE_NLS_TRUE USE_NLS_FALSE BUILD_MODULES_TRUE BUILD_MODULES_FALSE BUILD_GENPPD_STATIC_TRUE BUILD_GENPPD_STATIC_FALSE RELEASE_DATE cups_prefix cups_exec_prefix cups_bindir cups_sbindir cups_conf_datadir cups_conf_serverbin cups_conf_serverroot CUPS_CFLAGS CUPS_LIBS CUPS_PPD_PS_LEVEL 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 GUTENPRINTUI2_VERSION gutenprint_cflags gutenprint_libs gutenprint_libdeps gutenprintui_cflags gutenprintui_libs gutenprintui_libdeps gutenprintui2_cflags gutenprintui2_libs gutenprintui2_libdeps LIBREADLINE_DEPS MAINTAINER_CFLAGS PLUG_IN_PATH WHICH_PPDS LIBOBJS LTLIBOBJS LTALLOCA'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS GUTENPRINT_MAJOR_VERSION GUTENPRINT_MINOR_VERSION GUTENPRINT_MICRO_VERSION 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ALL_LINGUAS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CUPS_CONFIG FOOMATIC_CONFIGURE FOOMATIC_PPDFILE IJS_CONFIG GIMPTOOL_CHECK GTK_CONFIG GTK_CFLAGS GTK_LIBS GIMPTOOL2_CHECK PKG_CONFIG ac_pt_PKG_CONFIG GTK2_CFLAGS GTK2_LIBS GIMP2_CFLAGS GIMP2_LIBS LEX LEXLIB LEX_OUTPUT_ROOT YACC FIND PERL GLIB_MKENUMS CONVERT TEXI2HTML DVIPS DB2PDF DVIPDF DB2PS DB2HTML DOXYGEN DIALOG FOOMATIC_KITLOAD MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS 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 BUILD_FOOMATIC_3_FALSE BUILD_GHOSTSCRIPT_TRUE BUILD_GHOSTSCRIPT_FALSE BUILD_CUPS_TRUE BUILD_CUPS_FALSE BUILD_CUPS_PPDS_TRUE BUILD_CUPS_PPDS_FALSE CUPS_PPDS_AT_TOP_LEVEL_TRUE CUPS_PPDS_AT_TOP_LEVEL_FALSE BUILD_TRANSLATED_CUPS_PPDS_TRUE BUILD_TRANSLATED_CUPS_PPDS_FALSE USE_LEVEL3_PS_TRUE USE_LEVEL3_PS_FALSE BUILD_ESCPUTIL_TRUE BUILD_ESCPUTIL_FALSE 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 BUILD_GIMP2_AS_GUTENPRINT_FALSE INSTALL_SAMPLES_TRUE INSTALL_SAMPLES_FALSE INSTALL_USER_GUIDE_TRUE INSTALL_USER_GUIDE_FALSE USE_NLS_TRUE USE_NLS_FALSE BUILD_MODULES_TRUE BUILD_MODULES_FALSE BUILD_GENPPD_STATIC_TRUE BUILD_GENPPD_STATIC_FALSE RELEASE_DATE cups_prefix cups_exec_prefix cups_bindir cups_sbindir cups_conf_datadir cups_conf_serverbin cups_conf_serverroot CUPS_CFLAGS CUPS_LIBS CUPS_PPD_PS_LEVEL 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 GUTENPRINTUI2_VERSION gutenprint_cflags gutenprint_libs gutenprint_libdeps gutenprintui_cflags gutenprintui_libs gutenprintui_libdeps gutenprintui2_cflags gutenprintui2_libs gutenprintui2_libdeps LIBREADLINE_DEPS MAINTAINER_CFLAGS PLUG_IN_PATH WHICH_PPDS LIBOBJS LTLIBOBJS LTALLOCA'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -992,7 +992,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.0-rc3 to adapt to many kinds of systems.
+\`configure' configures gutenprint 5.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1058,7 +1058,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gutenprint 5.0.0-rc3:";;
+     short | recursive ) echo "Configuration of gutenprint 5.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1086,7 +1086,9 @@ Optional Features:
                           generate PostScript level 3 PPD files
                           [(automatic)]
   --enable-static-genppd  build a statically-linked cups-genppd and
-                          rastertogutenprint [(automatic)]
+                          rastertogutenprint. WARNING: Please read the README
+                          and NEWS (release notes) CAREFULLY before disabling
+                          this! [(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
@@ -1097,7 +1099,6 @@ Optional Features:
                           build Gutenprint GTK+-2.0 user interface library
                           [(automatic)]
   --enable-samples        install sample images [yes]
-  --enable-user-guide     install user guide [yes]
   --enable-escputil       build escputil [yes]
   --enable-test           build test programs [yes]
   --enable-testpattern    build testpattern generator [(automatic)]
@@ -1129,6 +1130,10 @@ Optional Packages:
   --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.0 Print plugin [(automatic)]
+  --with-gimp2-as-gutenprint
+                          name GIMP 2.x Print plugin gutenprint (requires GIMP
+                          2.2; normally used with GIMP 2.4 or above)
+                          [(automatic)]
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
@@ -1258,7 +1263,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-gutenprint configure 5.0.0-rc3
+gutenprint configure 5.0.0
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1289,7 +1294,7 @@ cat >&5 <<_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.0-rc3, which was
+It was created by gutenprint $as_me 5.0.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1659,11 +1664,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 GUTENPRINT_MAJOR_VERSION=5
 GUTENPRINT_MINOR_VERSION=0
 GUTENPRINT_MICRO_VERSION=0
-GUTENPRINT_EXTRA_VERSION=-rc3
+GUTENPRINT_EXTRA_VERSION=
 GUTENPRINT_CURRENT_INTERFACE=2
 GUTENPRINT_INTERFACE_AGE=0
 GUTENPRINT_BINARY_AGE=0
-GUTENPRINT_VERSION=5.0.0-rc3
+GUTENPRINT_VERSION=5.0.0
 GUTENPRINTUI_CURRENT_INTERFACE=1
 GUTENPRINTUI_INTERFACE_AGE=0
 GUTENPRINTUI_BINARY_AGE=0
@@ -1980,7 +1985,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gutenprint'
- VERSION='5.0.0-rc3'
+ VERSION='5.0.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3767,7 +3772,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3770 "configure"' > conftest.$ac_ext
+  echo '#line 3775 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5257,7 +5262,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:5260:" \
+echo "$as_me:5265:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6320,11 +6325,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:6323: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6328: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6327: \$? = $ac_status" >&5
+   echo "$as_me:6332: \$? = $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.
@@ -6588,11 +6593,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:6591: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6596: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6595: \$? = $ac_status" >&5
+   echo "$as_me:6600: \$? = $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.
@@ -6692,11 +6697,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:6695: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6700: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6699: \$? = $ac_status" >&5
+   echo "$as_me:6704: \$? = $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
@@ -9037,7 +9042,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9040 "configure"
+#line 9045 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9137,7 +9142,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9140 "configure"
+#line 9145 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11477,11 +11482,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:11480: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11485: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11484: \$? = $ac_status" >&5
+   echo "$as_me:11489: \$? = $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.
@@ -11581,11 +11586,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:11584: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11589: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11588: \$? = $ac_status" >&5
+   echo "$as_me:11593: \$? = $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
@@ -13151,11 +13156,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:13154: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13159: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13158: \$? = $ac_status" >&5
+   echo "$as_me:13163: \$? = $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.
@@ -13255,11 +13260,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:13258: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13263: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13262: \$? = $ac_status" >&5
+   echo "$as_me:13267: \$? = $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
@@ -15458,11 +15463,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:15461: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15466: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15465: \$? = $ac_status" >&5
+   echo "$as_me:15470: \$? = $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.
@@ -15726,11 +15731,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:15729: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15734: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15733: \$? = $ac_status" >&5
+   echo "$as_me:15738: \$? = $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.
@@ -15830,11 +15835,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:15833: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15838: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15837: \$? = $ac_status" >&5
+   echo "$as_me:15842: \$? = $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
@@ -18812,8 +18817,8 @@ fi
 
 STATIC_GENPPD="$enable_static"
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to build a statically-linked cups-genppd and rastertogutenprint" >&5
-echo $ECHO_N "checking whether to build a statically-linked cups-genppd and rastertogutenprint... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking whether to build a statically-linked cups-genppd and rastertogutenprint.  WARNING: Please read the README and NEWS (release notes) CAREFULLY before disabling this!" >&5
+echo $ECHO_N "checking whether to build a statically-linked cups-genppd and rastertogutenprint.  WARNING: Please read the README and NEWS (release notes) CAREFULLY before disabling this!... $ECHO_C" >&6
 # Check whether --enable-static-genppd or --disable-static-genppd was given.
 if test "${enable_static_genppd+set}" = set; then
   enableval="$enable_static_genppd"
@@ -19714,8 +19719,14 @@ else
   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 2; then
     BUILD_GIMP2="yes"
+    if test "$gimptool_check_minor" -ge 4 ; then
+      BUILD_GIMP2_AS_GUTENPRINT="yes"
+    else
+      BUILD_GIMP2_AS_GUTENPRINT="no"
+    fi
   else
     BUILD_GIMP2="no"
+    BUILD_GIMP2_AS_GUTENPRINT="no"
   fi
 fi
 
@@ -20002,6 +20013,38 @@ if test -z "${BUILD_GIMP2}" ; then
 fi
 
 
+# create custom command-line --with option
+echo "$as_me:$LINENO: checking whether to name GIMP 2.x Print plugin gutenprint (requires GIMP 2.2; normally used with GIMP 2.4 or above)" >&5
+echo $ECHO_N "checking whether to name GIMP 2.x Print plugin gutenprint (requires GIMP 2.2; normally used with GIMP 2.4 or above)... $ECHO_C" >&6
+
+# Check whether --with-gimp2-as-gutenprint or --without-gimp2-as-gutenprint was given.
+if test "${with_gimp2_as_gutenprint+set}" = set; then
+  withval="$with_gimp2_as_gutenprint"
+  case "${withval}" in
+
+                yes) BUILD_GIMP2_AS_GUTENPRINT="yes" ; echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
+echo "${ECHO_T}${BUILD_GIMP2_AS_GUTENPRINT}" >&6 ;;
+                no) BUILD_GIMP2_AS_GUTENPRINT="no" ; echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
+echo "${ECHO_T}${BUILD_GIMP2_AS_GUTENPRINT}" >&6 ;;
+                *) echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6
+                   { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-gimp2-as-gutenprint" >&5
+echo "$as_me: error: bad value ${withval} for --with-gimp2-as-gutenprint" >&2;}
+   { (exit 1); exit 1; }; } ;;
+
+	    esac
+else
+  if test -z "${BUILD_GIMP2_AS_GUTENPRINT}" ; then
+               BUILD_GIMP2_AS_GUTENPRINT="(automatic)"
+             fi
+             echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
+echo "${ECHO_T}${BUILD_GIMP2_AS_GUTENPRINT}" >&6 ;
+fi;
+if test -z "${BUILD_GIMP2_AS_GUTENPRINT}" ; then
+  BUILD_GIMP2_AS_GUTENPRINT="(automatic)"
+fi
+
+
 # create custom command-line --enable option
 echo "$as_me:$LINENO: checking whether to build Gutenprint GTK+-2.0 user interface library" >&5
 echo $ECHO_N "checking whether to build Gutenprint GTK+-2.0 user interface library... $ECHO_C" >&6
@@ -20065,37 +20108,6 @@ fi
 
 
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to install user guide" >&5
-echo $ECHO_N "checking whether to install user guide... $ECHO_C" >&6
-# Check whether --enable-user-guide or --disable-user-guide was given.
-if test "${enable_user_guide+set}" = set; then
-  enableval="$enable_user_guide"
-  case "${enableval}" in
-
-                yes) INSTALL_USER_GUIDE="yes" ; echo "$as_me:$LINENO: result: ${INSTALL_USER_GUIDE}" >&5
-echo "${ECHO_T}${INSTALL_USER_GUIDE}" >&6 ;;
-                no) INSTALL_USER_GUIDE="no" ; echo "$as_me:$LINENO: result: ${INSTALL_USER_GUIDE}" >&5
-echo "${ECHO_T}${INSTALL_USER_GUIDE}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-user-guide" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-user-guide" >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-	    esac
-else
-  if test -z "${INSTALL_USER_GUIDE}" ; then
-               INSTALL_USER_GUIDE="yes"
-             fi
-             echo "$as_me:$LINENO: result: ${INSTALL_USER_GUIDE}" >&5
-echo "${ECHO_T}${INSTALL_USER_GUIDE}" >&6 ;
-fi;
-if test -z "${INSTALL_USER_GUIDE}" ; then
-  INSTALL_USER_GUIDE="yes"
-fi
-
-
-# create custom command-line --enable option
 echo "$as_me:$LINENO: checking whether to build escputil" >&5
 echo $ECHO_N "checking whether to build escputil... $ECHO_C" >&6
 # Check whether --enable-escputil or --disable-escputil was given.
@@ -22424,8 +22436,8 @@ fi
 
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${CONVERT} = x ; then
-    { echo "$as_me:$LINENO: WARNING: PostScript user's guide cannot be regenerated!" >&5
-echo "$as_me: WARNING: PostScript user's guide cannot be regenerated!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: PostScript developer's guide cannot be regenerated!" >&5
+echo "$as_me: WARNING: PostScript developer's guide cannot be regenerated!" >&2;}
   fi
 fi
 # Extract the first word of "texi2html", so it can be a program name with args.
@@ -22559,8 +22571,8 @@ fi
 
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${DB2PDF} = x ; then
-    { echo "$as_me:$LINENO: WARNING: PDF user's guide cannot be regenerated!" >&5
-echo "$as_me: WARNING: PDF user's guide cannot be regenerated!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: PDF developer's guide cannot be regenerated!" >&5
+echo "$as_me: WARNING: PDF developer's guide cannot be regenerated!" >&2;}
   fi
 fi
 for ac_prog in dvipdf dvipdfm
@@ -22654,8 +22666,8 @@ fi
 
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${DB2PS} = x ; then
-    { echo "$as_me:$LINENO: WARNING: PostScript user's guide cannot be regenerated!" >&5
-echo "$as_me: WARNING: PostScript user's guide cannot be regenerated!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: PostScript developer's guide cannot be regenerated!" >&5
+echo "$as_me: WARNING: PostScript developer's guide cannot be regenerated!" >&2;}
   fi
 fi
 # Extract the first word of "db2html", so it can be a program name with args.
@@ -22699,8 +22711,8 @@ fi
 
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${DB2HTML} = x ; then
-    { echo "$as_me:$LINENO: WARNING: HTML user's guide cannot be regenerated!" >&5
-echo "$as_me: WARNING: HTML user's guide cannot be regenerated!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: HTML developer's guide cannot be regenerated!" >&5
+echo "$as_me: WARNING: HTML developer's guide cannot be regenerated!" >&2;}
   fi
 fi
 # Extract the first word of "doxygen", so it can be a program name with args.
@@ -22744,8 +22756,8 @@ fi
 
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${DOXYGEN} = x ; then
-    { echo "$as_me:$LINENO: WARNING: HTML user's guide cannot be regenerated!" >&5
-echo "$as_me: WARNING: HTML user's guide cannot be regenerated!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: HTML developer's guide cannot be regenerated!" >&5
+echo "$as_me: WARNING: HTML developer's guide cannot be regenerated!" >&2;}
   fi
 fi
 
@@ -30118,6 +30130,17 @@ fi
 
 
 
+if test x${BUILD_GIMP2_AS_GUTENPRINT} = xyes; then
+  BUILD_GIMP2_AS_GUTENPRINT_TRUE=
+  BUILD_GIMP2_AS_GUTENPRINT_FALSE='#'
+else
+  BUILD_GIMP2_AS_GUTENPRINT_TRUE='#'
+  BUILD_GIMP2_AS_GUTENPRINT_FALSE=
+fi
+
+
+
+
 if test x${INSTALL_SAMPLES} = xyes; then
   INSTALL_SAMPLES_TRUE=
   INSTALL_SAMPLES_FALSE='#'
@@ -30293,15 +30316,6 @@ else
 fi
 
 
-if test "$enable_static" = no -a "$BUILD_CUPS" = yes ; then
-  { echo "$as_me:$LINENO: WARNING: --enable-static is disabled, but CUPS is being built." >&5
-echo "$as_me: WARNING: --enable-static is disabled, but CUPS is being built." >&2;}
-  { echo "$as_me:$LINENO: WARNING: This may result in a *SILENTLY* incorrect build." >&5
-echo "$as_me: WARNING: This may result in a *SILENTLY* incorrect build." >&2;}
-  { echo "$as_me:$LINENO: WARNING: Please read the release notes carefully!" >&5
-echo "$as_me: WARNING: Please read the release notes carefully!" >&2;}
-fi
-
 
 
 
@@ -30337,7 +30351,7 @@ cat >>confdefs.h <<_ACEOF
 #define CUPS_PPD_PS_LEVEL ${CUPS_PPD_PS_LEVEL}
 _ACEOF
 
-RELEASE_DATE="14 May 2006"
+RELEASE_DATE="22 Jul 2006"
 
 cat >>confdefs.h <<_ACEOF
 #define RELEASE_DATE "${RELEASE_DATE}"
@@ -30408,8 +30422,6 @@ gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}"
 
           ac_config_files="$ac_config_files doc/developer/Makefile"
 
-          ac_config_files="$ac_config_files doc/users_guide/Makefile"
-
           ac_config_files="$ac_config_files include/Makefile"
 
           ac_config_files="$ac_config_files include/gutenprint/Makefile"
@@ -30688,6 +30700,13 @@ echo "$as_me: error: conditional \"BUILD_GIMP2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${BUILD_GIMP2_AS_GUTENPRINT_TRUE}" && test -z "${BUILD_GIMP2_AS_GUTENPRINT_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_GIMP2_AS_GUTENPRINT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_GIMP2_AS_GUTENPRINT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${INSTALL_SAMPLES_TRUE}" && test -z "${INSTALL_SAMPLES_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"INSTALL_SAMPLES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -30998,7 +31017,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by gutenprint $as_me 5.0.0-rc3, which was
+This file was extended by gutenprint $as_me 5.0.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31061,7 +31080,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-gutenprint config.status 5.0.0-rc3
+gutenprint config.status 5.0.0
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -31184,7 +31203,6 @@ do
   "doc/gutenprint.dox" ) CONFIG_FILES="$CONFIG_FILES doc/gutenprint.dox" ;;
   "doc/gutenprintui2.dox" ) CONFIG_FILES="$CONFIG_FILES doc/gutenprintui2.dox" ;;
   "doc/developer/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/developer/Makefile" ;;
-  "doc/users_guide/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/users_guide/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" ;;
@@ -31465,6 +31483,8 @@ s,@BUILD_GIMP_TRUE@,$BUILD_GIMP_TRUE,;t t
 s,@BUILD_GIMP_FALSE@,$BUILD_GIMP_FALSE,;t t
 s,@BUILD_GIMP2_TRUE@,$BUILD_GIMP2_TRUE,;t t
 s,@BUILD_GIMP2_FALSE@,$BUILD_GIMP2_FALSE,;t t
+s,@BUILD_GIMP2_AS_GUTENPRINT_TRUE@,$BUILD_GIMP2_AS_GUTENPRINT_TRUE,;t t
+s,@BUILD_GIMP2_AS_GUTENPRINT_FALSE@,$BUILD_GIMP2_AS_GUTENPRINT_FALSE,;t t
 s,@INSTALL_SAMPLES_TRUE@,$INSTALL_SAMPLES_TRUE,;t t
 s,@INSTALL_SAMPLES_FALSE@,$INSTALL_SAMPLES_FALSE,;t t
 s,@INSTALL_USER_GUIDE_TRUE@,$INSTALL_USER_GUIDE_TRUE,;t t
@@ -32261,13 +32281,15 @@ if test "$no_create" != yes; then
 fi
 
 
+warnings_emitted=0
 echo
-echo "Build Summary:"
-echo "----- --------"
+echo "Configuration Summary:"
+echo "------------- --------"
 echo
 echo "If you have any problems, please report the information below to"
 echo "$PACKAGE_BUGREPORT"
 echo
+echo "================================================================"
 echo "  Release: $PACKAGE_STRING generated on $RELEASE_DATE"
 echo
 echo "  Features:"
@@ -32278,10 +32300,15 @@ if test "$BUILD_CUPS" != "no" ; then
     echo "            Build simplified CUPS PPD files:    $BUILD_SIMPLIFIED_CUPS_PPDS"
     echo "            Generate PS level 3 CUPS PPD files: $USE_LEVEL3_PS"
     echo "        Install CUPS PPD files at top level:    $CUPS_PPDS_AT_TOP_LEVEL"
-    if test "$STATIC_GENPPD" = "no" -a "$enable_shared" = "yes" ; then
-        echo "        Build genppd statically:                $STATIC_GENPPD (please read the release notes!)"
-    else
-        echo "        Build genppd statically:                $STATIC_GENPPD"
+    echo "        Build genppd statically:                $STATIC_GENPPD"
+
+    if test "$STATIC_GENPPD" = "no" ; then
+        echo "            ***WARNING: Use of --disable-static-genppd or --disable-static"
+	echo "                        when building CUPS is very dangerous.  The build may"
+	echo "                        fail when building the PPD files, or may *SILENTLY*"
+	echo "                        build incorrect PPD files or cause other problems."
+	echo "                        Please review the README and release notes carefully!"
+	warnings_emitted=1
     fi
 fi
 echo "    Build Ghostscript IJS driver:               $BUILD_GHOSTSCRIPT"
@@ -32289,10 +32316,20 @@ echo "    Build Foomatic data:                        $BUILD_FOOMATIC"
 if test "$BUILD_FOOMATIC" != "no" ; then
     echo "        Build Foomatic 3.x data:                $BUILD_FOOMATIC_3"
 fi
-echo "    Build GIMP 1.2 plugin:                      $BUILD_GIMP"
-echo "    Build GIMP 2.0 plugin:                      $BUILD_GIMP2"
-if test "$BUILD_GIMP" != "no" -o "$BUILD_GIMP2" != no ; then
-    echo "        Install plugin in home directory:       $USER_INSTALL"
+if test "$BUILD_GIMP" != "no" -o "$BUILD_GIMP2" != "no" ; then
+    echo "    Build enhanced Print plugin for the 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
+    fi
+    echo "        Install plugin(s) in home directory:    $USER_INSTALL"
+else
+    echo "    Build enhanced Print plugin for the GIMP:   no"
 fi
 echo "    Build EPSON Stylus utility:                 $BUILD_ESCPUTIL"
 echo "    Build test programs:                        $BUILD_TEST"
@@ -32304,10 +32341,9 @@ echo "    Data directory:                             $PACKAGE_DATA_DIR"
 echo "    Library directory:                          $PACKAGE_LIB_DIR"
 echo "    XML data directory:                         $PKGXMLDATADIR"
 echo "    Module directory:                           $PKGMODULEDIR"
-echo "    Install user guide:                         $INSTALL_USER_GUIDE"
 echo "    Install sample images:                      $INSTALL_SAMPLES"
 echo
-echo "Configuration:"
+echo "General configuration:"
 if test x$ac_compiler_gnu = "xyes"; then
     echo "    Compiler options:                           $CFLAGS $GNUCFLAGS"
 else
@@ -32324,7 +32360,12 @@ if test -n "$EXTRA_LIBREADLINE_DEPS" ; then
 else
     echo "    Use readline libraries:                     $USE_READLINE"
 fi
+echo "================================================================"
+if test $warnings_emitted -ne 0 ; then
+    echo
+    echo '*** NOTE: Please review the warnings shown above carefully!'
+fi
 echo
-echo "Finished configuring."
-echo "Type 'make' to build the package"
+echo "Finished configuring.  Please review the configuration summary above."
+echo "Type 'make clean' followed by 'make' to build the package"
 echo "then 'make install' to install it."