Imported Upstream version 3.10.2

1 files changed, 83 insertions, 63 deletions

diff --git a/configure b/configure
index ce5ed65c5..f00220469 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for HP Linux Imaging and Printing 3.9.12.
+# Generated by GNU Autoconf 2.63 for HP Linux Imaging and Printing 3.10.2.
 #
-# Report bugs to <3.9.12.29>.
+# Report bugs to <3.10.2rc1.9>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -750,9 +750,9 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='HP Linux Imaging and Printing'
 PACKAGE_TARNAME='hplip'
-PACKAGE_VERSION='3.9.12'
-PACKAGE_STRING='HP Linux Imaging and Printing 3.9.12'
-PACKAGE_BUGREPORT='3.9.12.29'
+PACKAGE_VERSION='3.10.2'
+PACKAGE_STRING='HP Linux Imaging and Printing 3.10.2'
+PACKAGE_BUGREPORT='3.10.2rc1.9'
 
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -846,6 +846,8 @@ cupsfilterdir
 cupsbackenddir
 systraydir
 icondir
+mimedir
+abs_mimedir
 abs_drvdir
 abs_ppddir
 abs_docdir
@@ -1050,6 +1052,7 @@ with_cupsfilterdir
 with_icondir
 with_systraydir
 with_hpppddir
+with_mimedir
 with_docdir
 enable_foomatic_ppd_install
 with_drvdir
@@ -1633,7 +1636,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 HP Linux Imaging and Printing 3.9.12 to adapt to many kinds of systems.
+\`configure' configures HP Linux Imaging and Printing 3.10.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1703,7 +1706,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.9.12:";;
+     short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.10.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1762,6 +1765,7 @@ Optional Packages:
                           default=/etc/xdg/autostart
   --with-hpppddir=DIR     set hp ppd install directory
                           default=datadir/ppd/HP
+  --with-mimedir=DIR      set cups mime.types location default=abs_mimedir
   --with-docdir=DIR       set hplip documentation directory
                           default=datadir/doc
   --with-drvdir=DIR       set cups drv install directory
@@ -1791,7 +1795,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <3.9.12.29>.
+Report bugs to <3.10.2rc1.9>.
 _ACEOF
 ac_status=$?
 fi
@@ -1854,7 +1858,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HP Linux Imaging and Printing configure 3.9.12
+HP Linux Imaging and Printing configure 3.10.2
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1868,7 +1872,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 HP Linux Imaging and Printing $as_me 3.9.12, which was
+It was created by HP Linux Imaging and Printing $as_me 3.10.2, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2718,7 +2722,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hplip'
- VERSION='3.9.12'
+ VERSION='3.10.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4661,7 +4665,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4664 "configure"' > conftest.$ac_ext
+  echo '#line 4668 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5464,9 +5468,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
-## ------------------------ ##
-## Report this to 3.9.12.29 ##
-## ------------------------ ##
+## -------------------------- ##
+## Report this to 3.10.2rc1.9 ##
+## -------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -7766,11 +7770,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:7769: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7773: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7773: \$? = $ac_status" >&5
+   echo "$as_me:7777: \$? = $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.
@@ -8056,11 +8060,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:8059: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8063: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8063: \$? = $ac_status" >&5
+   echo "$as_me:8067: \$? = $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.
@@ -8160,11 +8164,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:8163: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8167: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8167: \$? = $ac_status" >&5
+   echo "$as_me:8171: \$? = $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
@@ -10562,7 +10566,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10565 "configure"
+#line 10569 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10662,7 +10666,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10665 "configure"
+#line 10669 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13071,11 +13075,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:13074: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13078: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13078: \$? = $ac_status" >&5
+   echo "$as_me:13082: \$? = $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.
@@ -13175,11 +13179,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:13178: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13182: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13182: \$? = $ac_status" >&5
+   echo "$as_me:13186: \$? = $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
@@ -14760,11 +14764,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:14763: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14767: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14767: \$? = $ac_status" >&5
+   echo "$as_me:14771: \$? = $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.
@@ -14864,11 +14868,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:14867: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14871: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14871: \$? = $ac_status" >&5
+   echo "$as_me:14875: \$? = $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
@@ -17081,11 +17085,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:17084: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17088: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17088: \$? = $ac_status" >&5
+   echo "$as_me:17092: \$? = $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.
@@ -17371,11 +17375,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:17374: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17378: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17378: \$? = $ac_status" >&5
+   echo "$as_me:17382: \$? = $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.
@@ -17475,11 +17479,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:17478: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17482: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17482: \$? = $ac_status" >&5
+   echo "$as_me:17486: \$? = $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
@@ -21985,9 +21989,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
-## ------------------------ ##
-## Report this to 3.9.12.29 ##
-## ------------------------ ##
+## -------------------------- ##
+## Report this to 3.10.2rc1.9 ##
+## -------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -22140,9 +22144,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
-## ------------------------ ##
-## Report this to 3.9.12.29 ##
-## ------------------------ ##
+## -------------------------- ##
+## Report this to 3.10.2rc1.9 ##
+## -------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -23223,6 +23227,20 @@ else
 fi
 
 
+if test -f "/usr/share/cups/mime/mime.types"; then
+   abs_mimedir="/usr/share/cups/mime/"
+else
+   abs_mimedir="/etc/cups/"
+fi
+
+# Check whether --with-mimedir was given.
+if test "${with_mimedir+set}" = set; then
+  withval=$with_mimedir; mimedir=$withval
+else
+  mimedir="$abs_mimedir"
+fi
+
+
 
 # Check whether --with-docdir was given.
 if test "${with_docdir+set}" = set; then
@@ -23856,9 +23874,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
-## ------------------------ ##
-## Report this to 3.9.12.29 ##
-## ------------------------ ##
+## -------------------------- ##
+## Report this to 3.10.2rc1.9 ##
+## -------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -24012,9 +24030,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
-## ------------------------ ##
-## Report this to 3.9.12.29 ##
-## ------------------------ ##
+## -------------------------- ##
+## Report this to 3.10.2rc1.9 ##
+## -------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -24171,9 +24189,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
-## ------------------------ ##
-## Report this to 3.9.12.29 ##
-## ------------------------ ##
+## -------------------------- ##
+## Report this to 3.10.2rc1.9 ##
+## -------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -24402,9 +24420,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
-## ------------------------ ##
-## Report this to 3.9.12.29 ##
-## ------------------------ ##
+## -------------------------- ##
+## Report this to 3.10.2rc1.9 ##
+## -------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -24630,9 +24648,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
-## ------------------------ ##
-## Report this to 3.9.12.29 ##
-## ------------------------ ##
+## -------------------------- ##
+## Report this to 3.10.2rc1.9 ##
+## -------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -25011,9 +25029,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
-## ------------------------ ##
-## Report this to 3.9.12.29 ##
-## ------------------------ ##
+## -------------------------- ##
+## Report this to 3.10.2rc1.9 ##
+## -------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -25525,6 +25543,8 @@ abs_ppddir=${abs_hpppddir%/*}
 
 
 
+
+
 ac_config_files="$ac_config_files Makefile hplip.conf hplip.desktop hplip-systray.desktop prnt/drv/hpijs.drv prnt/drv/hpcups.drv hplip.list data/policykit/com.hp.hplip.service"
 
 cat >confcache <<\_ACEOF
@@ -26194,7 +26214,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 HP Linux Imaging and Printing $as_me 3.9.12, which was
+This file was extended by HP Linux Imaging and Printing $as_me 3.10.2, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26248,7 +26268,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-HP Linux Imaging and Printing config.status 3.9.12
+HP Linux Imaging and Printing config.status 3.10.2
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"