Gigantor Merge!

Conflicts: cholerab/news/Candidate - add Ante scriptum cholerab/shirts/bestellliste - merged as theirs oncology/dpfhack_display - now a submodule add bug-fixing for adv_graphgen, as well as a Makefile
author: EUcancER <root@euer.krebsco.de> 2011-08-31 12:52:15 +0200
committer: EUcancER <root@euer.krebsco.de> 2011-08-31 12:52:15 +0200
commit: 8e2af5a9f643632b96564706313edd4524f81bfd (patch)
tree: 10e31222000cc4e289c555f6eb487502c273afb4 /oncology/dpfhack_display/lcd4linux-svn1142-dpf.patch
parent: efe72ae286caa4ecf88edcbcb619fb0ceb886ca8 (diff)
parent: 9030631edd4f5e44234fe77348b92190874f42a2 (diff)
1 files changed, 0 insertions, 2713 deletions
diff --git a/oncology/dpfhack_display/lcd4linux-svn1142-dpf.patch b/oncology/dpfhack_display/lcd4linux-svn1142-dpf.patch
deleted file mode 100644
index acf97406..00000000
--- a/oncology/dpfhack_display/lcd4linux-svn1142-dpf.patch
+++ /dev/null
@@ -1,2713 +0,0 @@
-diff -rupN --exclude=.svn --exclude='*.conf' --exclude='*.png' --exclude=Makefile.in --exclude=config.h.in --exclude=aclocal.m4 --exclude=autom4te.cache --exclude=ltmain.sh --exclude=libtool.m4 --exclude=ltoptions.m4 --exclude=ltsugar.m4 lcd4linux.orig/configure lcd4linux/configure
---- lcd4linux.orig/configure	2011-04-11 14:04:31.000000000 +0200
-+++ lcd4linux/configure	2011-04-11 14:09:43.000000000 +0200
-@@ -1,15 +1,13 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.67 for LCD4Linux 0.11.0-SVN.
-+# Generated by GNU Autoconf 2.64 for LCD4Linux 0.11.0-SVN.
- #
- # Report bugs to <lcd4linux-users@lists.sourceforge.net>.
- #
--#
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
- # Foundation, Inc.
- #
--#
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## -------------------- ##
-@@ -319,7 +317,7 @@ $as_echo X"$as_dir" |
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
- 
- 
- } # as_fn_mkdir_p
-@@ -359,19 +357,19 @@ else
- fi # as_fn_arith
- 
- 
--# as_fn_error STATUS ERROR [LINENO LOG_FD]
--# ----------------------------------------
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
--# script with STATUS, using 1 if that was 0.
-+# script with status $?, using 1 if that was 0.
- as_fn_error ()
- {
--  as_status=$1; test $as_status -eq 0 && as_status=1
--  if test "$4"; then
--    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-   fi
--  $as_echo "$as_me: error: $2" >&2
-+  $as_echo "$as_me: error: $1" >&2
-   as_fn_exit $as_status
- } # as_fn_error
- 
-@@ -678,11 +676,10 @@ fi
- 
- 
- 
--test -n "$DJDIR" || exec 7<&0 </dev/null
--exec 6>&1
-+exec 7<&0 </dev/null 6>&1
- 
- # Name of the host.
--# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
- 
-@@ -796,8 +793,6 @@ EGREP
- GREP
- CURSES_INCLUDEDIR
- CURSES_LIBS
--PKG_CONFIG_LIBDIR
--PKG_CONFIG_PATH
- PKG_CONFIG
- LN_S
- CPP
-@@ -911,8 +906,6 @@ LIBS
- CPPFLAGS
- CPP
- PKG_CONFIG
--PKG_CONFIG_PATH
--PKG_CONFIG_LIBDIR
- XMKMF
- PYTHON_VERSION
- DBUS_CFLAGS
-@@ -979,9 +972,8 @@ do
-   fi
- 
-   case $ac_option in
--  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
--  *=)   ac_optarg= ;;
--  *)    ac_optarg=yes ;;
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
-   esac
- 
-   # Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1026,7 +1018,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error $? "invalid feature name: $ac_useropt"
-+      as_fn_error "invalid feature name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1052,7 +1044,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error $? "invalid feature name: $ac_useropt"
-+      as_fn_error "invalid feature name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1256,7 +1248,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error $? "invalid package name: $ac_useropt"
-+      as_fn_error "invalid package name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1272,7 +1264,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error $? "invalid package name: $ac_useropt"
-+      as_fn_error "invalid package name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1302,8 +1294,8 @@ do
-   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-     x_libraries=$ac_optarg ;;
- 
--  -*) as_fn_error $? "unrecognized option: \`$ac_option'
--Try \`$0 --help' for more information"
-+  -*) as_fn_error "unrecognized option: \`$ac_option'
-+Try \`$0 --help' for more information."
-     ;;
- 
-   *=*)
-@@ -1311,7 +1303,7 @@ Try \`$0 --help' for more information"
-     # Reject names that are not valid shell variable names.
-     case $ac_envvar in #(
-       '' | [0-9]* | *[!_$as_cr_alnum]* )
--      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-     esac
-     eval $ac_envvar=\$ac_optarg
-     export $ac_envvar ;;
-@@ -1329,13 +1321,13 @@ done
- 
- if test -n "$ac_prev"; then
-   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
--  as_fn_error $? "missing argument to $ac_option"
-+  as_fn_error "missing argument to $ac_option"
- fi
- 
- if test -n "$ac_unrecognized_opts"; then
-   case $enable_option_checking in
-     no) ;;
--    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-   esac
- fi
-@@ -1358,7 +1350,7 @@ do
-     [\\/$]* | ?:[\\/]* )  continue;;
-     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-   esac
--  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
- done
- 
- # There might be people who depend on the old broken behavior: `$host'
-@@ -1372,8 +1364,8 @@ target=$target_alias
- if test "x$host_alias" != x; then
-   if test "x$build_alias" = x; then
-     cross_compiling=maybe
--    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
--    If a cross compiler is detected then cross compile mode will be used" >&2
-+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+    If a cross compiler is detected then cross compile mode will be used." >&2
-   elif test "x$build_alias" != "x$host_alias"; then
-     cross_compiling=yes
-   fi
-@@ -1388,9 +1380,9 @@ test "$silent" = yes && exec 6>/dev/null
- ac_pwd=`pwd` && test -n "$ac_pwd" &&
- ac_ls_di=`ls -di .` &&
- ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
--  as_fn_error $? "working directory cannot be determined"
-+  as_fn_error "working directory cannot be determined"
- test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
--  as_fn_error $? "pwd does not report name of working directory"
-+  as_fn_error "pwd does not report name of working directory"
- 
- 
- # Find the source files, if location was not specified.
-@@ -1429,11 +1421,11 @@ else
- fi
- if test ! -r "$srcdir/$ac_unique_file"; then
-   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
--  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
- fi
- ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
- ac_abs_confdir=`(
--	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
- 	pwd)`
- # When building in place, set srcdir=.
- if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1473,7 +1465,7 @@ Configuration:
-       --help=short        display options specific to this package
-       --help=recursive    display the short help of all the included packages
-   -V, --version           display version information and exit
--  -q, --quiet, --silent   do not print \`checking ...' messages
-+  -q, --quiet, --silent   do not print \`checking...' messages
-       --cache-file=FILE   cache test results in FILE [disabled]
-   -C, --config-cache      alias for \`--cache-file=config.cache'
-   -n, --no-create         do not create output files
-@@ -1568,7 +1560,7 @@ Optional Packages:
-                           drivers may be excluded with 'all,!<driver>',
-                           (try 'all,\!<driver>' if your shell complains...)
-                           possible drivers are:
--                          ASTUSB, BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux, D4D,
-+                          ASTUSB, BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux, D4D, DPF
-                           EA232Graphic, EFN, FW8888, G15, GLCD2USB, HD44780, HD44780-I2C,
-                           IRLCD, LCD2USB, LCDLinux, LEDMatrix, LCDTerm, LPH7508, LUIse,
-                           LW_ABP, M50530, MatrixOrbital, MatrixOrbitalGX,
-@@ -1594,14 +1586,10 @@ Some influential environment variables:
-   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-               nonstandard directory <lib dir>
-   LIBS        libraries to pass to the linker, e.g. -l<library>
--  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-               you have headers in a nonstandard directory <include dir>
-   CPP         C preprocessor
-   PKG_CONFIG  path to pkg-config utility
--  PKG_CONFIG_PATH
--              directories to add to pkg-config's search path
--  PKG_CONFIG_LIBDIR
--              path overriding pkg-config's built-in search path
-   XMKMF       Path to xmkmf, Makefile generator for X Window System
-   PYTHON_VERSION
-               The installed Python version to use, for example '2.3'. This
-@@ -1677,9 +1665,9 @@ test -n "$ac_init_help" && exit $ac_stat
- if $ac_init_version; then
-   cat <<\_ACEOF
- LCD4Linux configure 0.11.0-SVN
--generated by GNU Autoconf 2.67
-+generated by GNU Autoconf 2.64
- 
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1724,7 +1712,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_retval=1
- fi
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  as_fn_set_status $ac_retval
-+  return $ac_retval
- 
- } # ac_fn_c_try_compile
- 
-@@ -1749,7 +1737,7 @@ $as_echo "$ac_try_echo"; } >&5
-     mv -f conftest.er1 conftest.err
-   fi
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } > conftest.i && {
-+  test $ac_status = 0; } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then :
-@@ -1761,7 +1749,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
-     ac_retval=1
- fi
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  as_fn_set_status $ac_retval
-+  return $ac_retval
- 
- } # ac_fn_c_try_cpp
- 
-@@ -1807,7 +1795,7 @@ fi
-   # left behind by Apple's compiler.  We do this before executing the actions.
-   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  as_fn_set_status $ac_retval
-+  return $ac_retval
- 
- } # ac_fn_c_try_link
- 
-@@ -1819,7 +1807,7 @@ ac_fn_c_check_func ()
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1886,10 +1874,10 @@ $as_echo "$ac_res" >&6; }
- ac_fn_c_check_header_mongrel ()
- {
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if eval "test \"\${$3+set}\"" = set; then :
-+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- fi
- eval ac_res=\$$3
-@@ -1925,7 +1913,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
- else
-   ac_header_preproc=no
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
- $as_echo "$ac_header_preproc" >&6; }
- 
-@@ -1948,15 +1936,17 @@ $as_echo "$as_me: WARNING: $2: see the A
- $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
--( $as_echo "## ---------------------------------------------------- ##
-+( cat <<\_ASBOX
-+## ---------------------------------------------------- ##
- ## Report this to lcd4linux-users@lists.sourceforge.net ##
--## ---------------------------------------------------- ##"
-+## ---------------------------------------------------- ##
-+_ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   eval "$3=\$ac_header_compiler"
-@@ -2007,7 +1997,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- fi
-   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  as_fn_set_status $ac_retval
-+  return $ac_retval
- 
- } # ac_fn_c_try_run
- 
-@@ -2020,7 +2010,7 @@ ac_fn_c_check_header_compile ()
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2051,7 +2041,7 @@ ac_fn_c_check_type ()
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   eval "$3=no"
-@@ -2100,7 +2090,7 @@ This file contains any messages produced
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by LCD4Linux $as_me 0.11.0-SVN, which was
--generated by GNU Autoconf 2.67.  Invocation command line was
-+generated by GNU Autoconf 2.64.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -2210,9 +2200,11 @@ trap 'exit_status=$?
-   {
-     echo
- 
--    $as_echo "## ---------------- ##
-+    cat <<\_ASBOX
-+## ---------------- ##
- ## Cache variables. ##
--## ---------------- ##"
-+## ---------------- ##
-+_ASBOX
-     echo
-     # The following way of writing the cache mishandles newlines in values,
- (
-@@ -2246,9 +2238,11 @@ $as_echo "$as_me: WARNING: cache variabl
- )
-     echo
- 
--    $as_echo "## ----------------- ##
-+    cat <<\_ASBOX
-+## ----------------- ##
- ## Output variables. ##
--## ----------------- ##"
-+## ----------------- ##
-+_ASBOX
-     echo
-     for ac_var in $ac_subst_vars
-     do
-@@ -2261,9 +2255,11 @@ $as_echo "$as_me: WARNING: cache variabl
-     echo
- 
-     if test -n "$ac_subst_files"; then
--      $as_echo "## ------------------- ##
-+      cat <<\_ASBOX
-+## ------------------- ##
- ## File substitutions. ##
--## ------------------- ##"
-+## ------------------- ##
-+_ASBOX
-       echo
-       for ac_var in $ac_subst_files
-       do
-@@ -2277,9 +2273,11 @@ $as_echo "$as_me: WARNING: cache variabl
-     fi
- 
-     if test -s confdefs.h; then
--      $as_echo "## ----------- ##
-+      cat <<\_ASBOX
-+## ----------- ##
- ## confdefs.h. ##
--## ----------- ##"
-+## ----------- ##
-+_ASBOX
-       echo
-       cat confdefs.h
-       echo
-@@ -2334,12 +2332,7 @@ _ACEOF
- ac_site_file1=NONE
- ac_site_file2=NONE
- if test -n "$CONFIG_SITE"; then
--  # We do not want a PATH search for config.site.
--  case $CONFIG_SITE in #((
--    -*)  ac_site_file1=./$CONFIG_SITE;;
--    */*) ac_site_file1=$CONFIG_SITE;;
--    *)   ac_site_file1=./$CONFIG_SITE;;
--  esac
-+  ac_site_file1=$CONFIG_SITE
- elif test "x$prefix" != xNONE; then
-   ac_site_file1=$prefix/share/config.site
-   ac_site_file2=$prefix/etc/config.site
-@@ -2350,22 +2343,18 @@ fi
- for ac_site_file in "$ac_site_file1" "$ac_site_file2"
- do
-   test "x$ac_site_file" = xNONE && continue
--  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-+  if test -r "$ac_site_file"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
-     sed 's/^/| /' "$ac_site_file" >&5
--    . "$ac_site_file" \
--      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "failed to load site script $ac_site_file
--See \`config.log' for more details" "$LINENO" 5 ; }
-+    . "$ac_site_file"
-   fi
- done
- 
- if test -r "$cache_file"; then
--  # Some versions of bash will fail to source /dev/null (special files
--  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
--  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-+  # Some versions of bash will fail to source /dev/null (special
-+  # files actually), so we avoid doing that.
-+  if test -f "$cache_file"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
- $as_echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-@@ -2434,7 +2423,7 @@ if $ac_cache_corrupted; then
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
- $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
- fi
- ## -------------------- ##
- ## Main body of script. ##
-@@ -2452,22 +2441,16 @@ am__api_version='1.11'
- 
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
--  if test -f "$ac_dir/install-sh"; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/install-sh -c"
--    break
--  elif test -f "$ac_dir/install.sh"; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/install.sh -c"
--    break
--  elif test -f "$ac_dir/shtool"; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/shtool install -c"
--    break
--  fi
-+  for ac_t in install-sh install.sh shtool; do
-+    if test -f "$ac_dir/$ac_t"; then
-+      ac_aux_dir=$ac_dir
-+      ac_install_sh="$ac_aux_dir/$ac_t -c"
-+      break 2
-+    fi
-+  done
- done
- if test -z "$ac_aux_dir"; then
--  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
- fi
- 
- # These three variables are undocumented and unsupported,
-@@ -2583,11 +2566,11 @@ am_lf='
- '
- case `pwd` in
-   *[\\\"\#\$\&\'\`$am_lf]*)
--    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
-+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
- esac
- case $srcdir in
-   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
--    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
-+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
- esac
- 
- # Do `set' in a subshell so we don't clobber the current shell's
-@@ -2609,7 +2592,7 @@ if (
-       # if, for instance, CONFIG_SHELL is bash and it inherits a
-       # broken ls alias from the environment.  This has actually
-       # happened.  Such a system could not be considered "sane".
--      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
- alias in your environment" "$LINENO" 5
-    fi
- 
-@@ -2619,7 +2602,7 @@ then
-    # Ok.
-    :
- else
--   as_fn_error $? "newly created file is older than distributed files!
-+   as_fn_error "newly created file is older than distributed files!
- Check your system clock" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -2791,7 +2774,6 @@ IFS=$as_save_IFS
- 
- fi
- 
--  test -d ./--version && rmdir ./--version
-   if test "${ac_cv_path_mkdir+set}" = set; then
-     MKDIR_P="$ac_cv_path_mkdir -p"
-   else
-@@ -2799,6 +2781,7 @@ fi
-     # value for MKDIR_P within a source directory, because that will
-     # break other packages using the cache if that directory is
-     # removed, or if the value is a relative name.
-+    test -d ./--version && rmdir ./--version
-     MKDIR_P="$ac_install_sh -d"
-   fi
- fi
-@@ -2857,7 +2840,7 @@ done
- $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
- set x ${MAKE-make}
- ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.make <<\_ACEOF
-@@ -2865,7 +2848,7 @@ SHELL = /bin/sh
- all:
- 	@echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
--# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- case `${MAKE-make} -f conftest.make 2>/dev/null` in
-   *@@@%%%=?*=@@@%%%*)
-     eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -2899,7 +2882,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
-   am__isrc=' -I$(srcdir)'
-   # test to see if srcdir already configured
-   if test -f $srcdir/config.status; then
--    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-   fi
- fi
- 
-@@ -3259,8 +3242,8 @@ fi
- 
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "no acceptable C compiler found in \$PATH
--See \`config.log' for more details" "$LINENO" 5 ; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
- 
- # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3281,30 +3264,32 @@ $as_echo "$ac_try_echo"; } >&5
- ... rest of stderr output deleted ...
-          10q' conftest.err >conftest.er1
-     cat conftest.er1 >&5
-+    rm -f conftest.er1 conftest.err
-   fi
--  rm -f conftest.er1 conftest.err
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }
- done
- 
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--
-+#include <stdio.h>
- int
- main ()
- {
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- 
- # The possible output files:
-@@ -3366,28 +3351,62 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
- else
-   ac_file=''
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--$as_echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error 77 "C compiler cannot create executables
--See \`config.log' for more details" "$LINENO" 5 ; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
-+{ as_fn_set_status 77
-+as_fn_error "C compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 5; }; }
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
- ac_exeext=$ac_cv_exeext
- 
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-+# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
-+# If not cross compiling, check that we can run a simple program.
-+if test "$cross_compiling" != yes; then
-+  if { ac_try='./$ac_file'
-+  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-+    cross_compiling=no
-+  else
-+    if test "$cross_compiling" = maybe; then
-+	cross_compiling=yes
-+    else
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+    fi
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
- ac_clean_files=$ac_clean_files_save
-+# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
- if { { ac_try="$ac_link"
-@@ -3417,75 +3436,16 @@ done
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details" "$LINENO" 5 ; }
-+as_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
--rm -f conftest conftest$ac_cv_exeext
-+rm -f conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <stdio.h>
--int
--main ()
--{
--FILE *f = fopen ("conftest.out", "w");
-- return ferror (f) || fclose (f) != 0;
--
--  ;
--  return 0;
--}
--_ACEOF
--ac_clean_files="$ac_clean_files conftest.out"
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
--if test "$cross_compiling" != yes; then
--  { { ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }
--  if { ac_try='./conftest$ac_cv_exeext'
--  { { case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; }; then
--    cross_compiling=no
--  else
--    if test "$cross_compiling" = maybe; then
--	cross_compiling=yes
--    else
--	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details" "$LINENO" 5 ; }
--    fi
--  fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
--
--rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
--ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then :
-@@ -3528,8 +3488,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot compute suffix of object files: cannot compile
--See \`config.log' for more details" "$LINENO" 5 ; }
-+as_fn_error "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
-@@ -3980,7 +3940,7 @@ else
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -3996,11 +3956,11 @@ else
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.i conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
-   break
- fi
-@@ -4039,7 +3999,7 @@ else
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -4055,18 +4015,18 @@ else
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.i conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
- 
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details" "$LINENO" 5 ; }
-+as_fn_error "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
- 
- ac_ext=c
-@@ -4091,7 +4051,7 @@ fi
- $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
- set x ${MAKE-make}
- ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.make <<\_ACEOF
-@@ -4099,7 +4059,7 @@ SHELL = /bin/sh
- all:
- 	@echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
--# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- case `${MAKE-make} -f conftest.make 2>/dev/null` in
-   *@@@%%%=?*=@@@%%%*)
-     eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -4120,10 +4080,6 @@ fi
- 
- 
- 
--
--
--
--
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- 	if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-@@ -4236,6 +4192,7 @@ $as_echo "yes" >&6; }
- $as_echo "no" >&6; }
- 		PKG_CONFIG=""
- 	fi
-+
- fi
- 
- # dmalloc
-@@ -4388,7 +4345,7 @@ esac
-   done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_GREP"; then
--    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_GREP=$GREP
-@@ -4454,7 +4411,7 @@ esac
-   done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_EGREP"; then
--    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_EGREP=$EGREP
-@@ -4821,7 +4778,7 @@ $as_echo "Please note that some screen r
- $as_echo_n "checking for ncurses version... " >&6; }
- 	ncurses_version=unknown
- cat > conftest.$ac_ext <<EOF
--#line 4824 "configure"
-+#line 4781 "configure"
- #include "confdefs.h"
- #ifdef RENAMED_NCURSES
- #include <curses.h>
-@@ -4878,7 +4835,7 @@ if test "x$with_x" = xno; then
-   have_x=disabled
- else
-   case $x_includes,$x_libraries in #(
--    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
-+    *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
-     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-@@ -4896,7 +4853,7 @@ libdir:
- 	@echo libdir='${LIBDIR}'
- _ACEOF
-   if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
--    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-+    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-     for ac_var in incroot usrlibdir libdir; do
-       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-     done
-@@ -4982,7 +4939,7 @@ else
-   fi
- done
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- fi # $ac_x_includes = no
- 
- if test "$ac_x_libraries" = no; then
-@@ -5667,7 +5624,8 @@ do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
- "
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -5681,7 +5639,8 @@ for ac_header in X11/Xlib.h X11/Xutil.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -5705,7 +5664,8 @@ for ac_header in gd/gd.h gd.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -5797,6 +5757,22 @@ fi
- done
- 
- 
-+# check for dpf libs
-+for ac_header in dpf.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "dpf.h" "ac_cv_header_dpf_h" "$ac_includes_default"
-+if test "x$ac_cv_header_dpf_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_DPF_H 1
-+_ACEOF
-+ has_dpf="true"
-+else
-+  has_dpf="false"
-+fi
-+
-+done
-+
-+
- # check for vncserver libs
- for ac_header in rfb/rfb.h
- do :
-@@ -5818,7 +5794,8 @@ for ac_header in linux/lcd-linux.h linux
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -5997,7 +5974,7 @@ fi
- 
- 
- 	if test -z "$PYTHON"; then
--	   as_fn_error $? "Cannot find python$PYTHON_VERSION in your system path" "$LINENO" 5
-+	   as_fn_error "Cannot find python$PYTHON_VERSION in your system path" "$LINENO" 5
- 	   PYTHON_VERSION=""
- 	fi
- 
-@@ -6015,7 +5992,7 @@ $as_echo_n "checking for a version of Py
- $as_echo "no" >&6; }
- 			{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "
-+as_fn_error "
- This version of the AC_PYTHON_DEVEL macro
- doesn't work properly with versions of Python before
- 2.1.0. You may need to re-run configure, setting the
-@@ -6024,7 +6001,7 @@ PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLA
- Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
- to something else than an empty string.
- 
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details." "$LINENO" 5; }
- 		else
- 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: skip at user request" >&5
- $as_echo "skip at user request" >&6; }
-@@ -6049,7 +6026,7 @@ $as_echo "yes" >&6; }
- 		else
- 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--			as_fn_error $? "this package requires Python .
-+			as_fn_error "this package requires Python .
- If you have it installed, but it isn't the default Python
- interpreter in your system path, please pass the PYTHON_VERSION
- variable to configure. See \`\`configure --help'' for reference.
-@@ -6070,7 +6047,7 @@ $as_echo "yes" >&6; }
- 	else
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--		as_fn_error $? "cannot import Python module \"distutils\".
-+		as_fn_error "cannot import Python module \"distutils\".
- Please check your Python installation. The error was:
- $ac_distutils_result" "$LINENO" 5
- 		PYTHON_VERSION=""
-@@ -6175,7 +6152,7 @@ EOD`
- 		fi
- 
- 		if test -z "PYTHON_LDFLAGS"; then
--			as_fn_error $? "
-+			as_fn_error "
-   Cannot determine location of your Python DSO. Please check it was installed with
-   dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand.
- 			" "$LINENO" 5
-@@ -6278,7 +6255,7 @@ $as_echo "$pythonexists" >&6; }
-         if test ! "x$pythonexists" = "xyes"; then
- 	   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "
-+as_fn_error "
-   Could not link test program to Python. Maybe the main Python library has been
-   installed in some non-standard library path. If so, pass it to configure,
-   via the LDFLAGS environment variable.
-@@ -6289,7 +6266,7 @@ as_fn_error $? "
-    for your distribution.  The exact name of this package varies among them.
-   ============================================================================
- 
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details." "$LINENO" 5; }
- 	  PYTHON_VERSION=""
- 	fi
- 
-@@ -6305,7 +6282,8 @@ for ac_header in asm/io.h linux/parport.
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -6356,6 +6334,7 @@ for driver in $drivers; do
-          CURSES="yes"
-          CWLINUX="yes"
-          D4D="yes"
-+         DPF="yes"
-          EA232graphic="yes"
-          EFN="yes"
-          FW8888="yes"
-@@ -6420,6 +6399,9 @@ for driver in $drivers; do
-       D4D)
-          D4D=$val
-          ;;
-+      DPF)
-+         DPF=$val
-+         ;;
-       EA232graphic)
-          EA232graphic=$val
-          ;;
-@@ -6547,7 +6529,7 @@ for driver in $drivers; do
-          X11=$val
-          ;;
-       *)
--         as_fn_error $? "Unknown driver '$driver'" "$LINENO" 5
-+         as_fn_error "Unknown driver '$driver'" "$LINENO" 5
-          ;;
-    esac
- done
-@@ -6659,6 +6641,20 @@ $as_echo "#define WITH_D4D 1" >>confdefs
- 
- fi
- 
-+if test "$DPF" = "yes"; then
-+   if test "$has_dpf" = "true"; then
-+      GRAPHIC="yes"
-+      DRIVERS="$DRIVERS drv_dpf.o"
-+      DRVLIBS="$DRVLIBS -L/usr/local/lib -ldpf -lusb"
-+
-+$as_echo "#define WITH_DPF 1" >>confdefs.h
-+
-+   else
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dpf.h not found: DPF driver disabled" >&5
-+$as_echo "$as_me: WARNING: dpf.h not found: DPF driver disabled" >&2;}
-+   fi
-+fi
-+
- if test "$EA232graphic" = "yes"; then
-    GRAPHIC="yes"
-    SERIAL="yes"
-@@ -7093,6 +7089,7 @@ $as_echo "$as_me: WARNING: st2205.h not 
-    fi
- fi
- 
-+
- if test "$T6963" = "yes"; then
-    if test "$has_parport" = "true"; then
-       GRAPHIC="yes"
-@@ -7214,7 +7211,7 @@ if test "$IMAGE" = "yes"; then
- fi
- 
- if test "$DRIVERS" = ""; then
--   as_fn_error $? "You should activate at least one driver..." "$LINENO" 5
-+   as_fn_error "You should activate at least one driver..." "$LINENO" 5
- fi
- 
- # generic text driver
-@@ -7282,7 +7279,7 @@ if test "$LIBFTDI" = "yes"; then
- fi
- 
- if test "$DRIVERS" = ""; then
--   as_fn_error $? "You should include at least one driver..." "$LINENO" 5
-+   as_fn_error "You should include at least one driver..." "$LINENO" 5
- fi
- 
- 
-@@ -7333,7 +7330,7 @@ $as_echo "available plugins:
-              loadavg,meminfo,mpd,mpris_dbus,mysql,netdev,netinfo,pop3,ppp,
- 	     proc_stat,python,qnaplog,sample,seti,statfs,uname,uptime,
-              w1retap,wireless,xmms" >&6; }
--         as_fn_error $? "run ./configure --with-plugins=..." "$LINENO" 5
-+         as_fn_error "run ./configure --with-plugins=..." "$LINENO" 5
-          ;;
-       all)
-          PLUGIN_APM="yes"
-@@ -7494,7 +7491,7 @@ $as_echo "available plugins:
-          PLUGIN_XMMS=$val
-          ;;
-       *)
--         as_fn_error $? "Unknown plugin '$plugin'" "$LINENO" 5
-+         as_fn_error "Unknown plugin '$plugin'" "$LINENO" 5
-          ;;
-    esac
- done
-@@ -7558,10 +7555,11 @@ pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
- $as_echo_n "checking for DBUS... " >&6; }
- 
--if test -n "$DBUS_CFLAGS"; then
--    pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DBUS_CFLAGS"; then
-+        pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0.0\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0.0") 2>&5
-   ac_status=$?
-@@ -7571,13 +7569,15 @@ if test -n "$DBUS_CFLAGS"; then
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DBUS_LIBS"; then
--    pkg_cv_DBUS_LIBS="$DBUS_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DBUS_LIBS"; then
-+        pkg_cv_DBUS_LIBS="$DBUS_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0.0\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0.0") 2>&5
-   ac_status=$?
-@@ -7587,15 +7587,14 @@ if test -n "$DBUS_LIBS"; then
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
- 
- if test $pkg_failed = yes; then
--   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
- 
- if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-         _pkg_short_errors_supported=yes
-@@ -7603,17 +7602,17 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 1.0.0" 2>&1`
-+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1 >= 1.0.0"`
-         else
--	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 1.0.0" 2>&1`
-+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= 1.0.0"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DBUS_PKG_ERRORS" >&5
- 
--	HAVE_DBUS="no"
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-+                HAVE_DBUS="no"
-+elif test $pkg_failed = untried; then
- 	HAVE_DBUS="no"
- else
- 	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
-@@ -7846,7 +7845,7 @@ fi
- if test "$PLUGIN_ICONV" = "yes"; then
-    # Make sure we can run config.sub.
- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
--  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
- $as_echo_n "checking build system type... " >&6; }
-@@ -7857,16 +7856,16 @@ else
- test "x$ac_build_alias" = x &&
-   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
- test "x$ac_build_alias" = x &&
--  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
- ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
--  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
- 
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
- $as_echo "$ac_cv_build" >&6; }
- case $ac_cv_build in
- *-*-*) ;;
--*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
-+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
- esac
- build=$ac_cv_build
- ac_save_IFS=$IFS; IFS='-'
-@@ -7891,7 +7890,7 @@ else
-   ac_cv_host=$ac_cv_build
- else
-   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
--    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
- fi
- 
- fi
-@@ -7899,7 +7898,7 @@ fi
- $as_echo "$ac_cv_host" >&6; }
- case $ac_cv_host in
- *-*-*) ;;
--*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
-+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
- esac
- host=$ac_cv_host
- ac_save_IFS=$IFS; IFS='-'
-@@ -7971,7 +7970,7 @@ $as_echo_n "checking for ld used by GCC.
-       # Canonicalize the path of ld
-       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
--        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-       done
-       test -z "$LD" && LD="$ac_prog"
-       ;;
-@@ -8005,9 +8004,9 @@ else
-       # Break only if it was the GNU/non-GNU ld that we prefer.
-       case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
-       *GNU* | *'with BFD'*)
--        test "$with_gnu_ld" != no && break ;;
-+	test "$with_gnu_ld" != no && break ;;
-       *)
--        test "$with_gnu_ld" != yes && break ;;
-+	test "$with_gnu_ld" != yes && break ;;
-       esac
-     fi
-   done
-@@ -8025,7 +8024,7 @@ else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
- $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
- if test "${acl_cv_prog_gnu_ld+set}" = set; then :
-@@ -8079,70 +8078,23 @@ fi
- 
- 
- 
--
--  acl_libdirstem=lib
--  acl_libdirstem2=
--  case "$host_os" in
--    solaris*)
--                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
--$as_echo_n "checking for 64-bit host... " >&6; }
--if test "${gl_cv_solaris_64bit+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--#ifdef _LP64
--sixtyfour bits
--#endif
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
--  gl_cv_solaris_64bit=yes
--else
--  gl_cv_solaris_64bit=no
--fi
--rm -f conftest*
--
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
--$as_echo "$gl_cv_solaris_64bit" >&6; }
--      if test $gl_cv_solaris_64bit = yes; then
--        acl_libdirstem=lib/64
--        case "$host_cpu" in
--          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
--          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
-+                  acl_libdirstem=lib
-+  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-+  if test -n "$searchpath"; then
-+    acl_save_IFS="${IFS= 	}"; IFS=":"
-+    for searchdir in $searchpath; do
-+      if test -d "$searchdir"; then
-+        case "$searchdir" in
-+          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-+          *) searchdir=`cd "$searchdir" && pwd`
-+             case "$searchdir" in
-+               */lib64 ) acl_libdirstem=lib64 ;;
-+             esac ;;
-         esac
-       fi
--      ;;
--    *)
--      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
--      if test -n "$searchpath"; then
--        acl_save_IFS="${IFS= 	}"; IFS=":"
--        for searchdir in $searchpath; do
--          if test -d "$searchdir"; then
--            case "$searchdir" in
--              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
--              */../ | */.. )
--                # Better ignore directories of this form. They are misleading.
--                ;;
--              *) searchdir=`cd "$searchdir" && pwd`
--                 case "$searchdir" in
--                   */lib64 ) acl_libdirstem=lib64 ;;
--                 esac ;;
--            esac
--          fi
--        done
--        IFS="$acl_save_IFS"
--      fi
--      ;;
--  esac
--  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
--
--
--
-+    done
-+    IFS="$acl_save_IFS"
-+  fi
- 
- 
- 
-@@ -8188,10 +8140,6 @@ if test "${with_libiconv_prefix+set}" = 
-       else
-         additional_includedir="$withval/include"
-         additional_libdir="$withval/$acl_libdirstem"
--        if test "$acl_libdirstem2" != "$acl_libdirstem" \
--           && ! test -d "$withval/$acl_libdirstem"; then
--          additional_libdir="$withval/$acl_libdirstem2"
--        fi
-       fi
-     fi
- 
-@@ -8201,7 +8149,6 @@ fi
-   LTLIBICONV=
-   INCICONV=
-   LIBICONV_PREFIX=
--      HAVE_LIBICONV=
-   rpathdirs=
-   ltrpathdirs=
-   names_already_handled=
-@@ -8344,9 +8291,7 @@ fi
-           if test "X$found_dir" != "X"; then
-                         LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
-             if test "X$found_so" != "X"; then
--                                                        if test "$enable_rpath" = no \
--                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
--                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
-+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
-                                 LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-               else
-                                                                                 haveit=
-@@ -8413,16 +8358,7 @@ fi
-             case "$found_dir" in
-               */$acl_libdirstem | */$acl_libdirstem/)
-                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
--                if test "$name" = 'iconv'; then
--                  LIBICONV_PREFIX="$basedir"
--                fi
--                additional_includedir="$basedir/include"
--                ;;
--              */$acl_libdirstem2 | */$acl_libdirstem2/)
--                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
--                if test "$name" = 'iconv'; then
--                  LIBICONV_PREFIX="$basedir"
--                fi
-+                LIBICONV_PREFIX="$basedir"
-                 additional_includedir="$basedir/include"
-                 ;;
-             esac
-@@ -8471,11 +8407,9 @@ fi
-                 case "$dep" in
-                   -L*)
-                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
--                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
--                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
-+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
-                       haveit=
--                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
--                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
-+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
-                         if test -n "$GCC"; then
-                           case $host_os in
-                             linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-@@ -8607,11 +8541,6 @@ fi
- 
- 
- 
--
--
--
--
--
-           am_save_CPPFLAGS="$CPPFLAGS"
- 
-   for element in $INCICONV; do
-@@ -8736,25 +8665,6 @@ int main ()
-           return 1;
-       }
-   }
--  /* Test against Solaris 10 bug: Failures are not distinguishable from
--     successful returns.  */
--  {
--    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
--    if (cd_ascii_to_88591 != (iconv_t)(-1))
--      {
--        static const char input[] = "\263";
--        char buf[10];
--        const char *inptr = input;
--        size_t inbytesleft = strlen (input);
--        char *outptr = buf;
--        size_t outbytesleft = sizeof (buf);
--        size_t res = iconv (cd_ascii_to_88591,
--                            (char **) &inptr, &inbytesleft,
--                            &outptr, &outbytesleft);
--        if (res == 0)
--          return 1;
--      }
--  }
- #if 0 /* This bug could be worked around by the caller.  */
-   /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-   {
-@@ -8868,10 +8778,10 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
-     am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result:
--         $am_cv_proto_iconv" >&5
--$as_echo "
--         $am_cv_proto_iconv" >&6; }
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
-+         }$am_cv_proto_iconv" >&5
-+$as_echo "${ac_t:-
-+         }$am_cv_proto_iconv" >&6; }
- 
- cat >>confdefs.h <<_ACEOF
- #define ICONV_CONST $am_cv_proto_iconv_arg1
-@@ -9436,7 +9346,7 @@ $as_echo "#define PLUGIN_XMMS 1" >>confd
- fi
- 
- if test "$PLUGINS" = ""; then
--   as_fn_error $? "You should include at least one plugin..." "$LINENO" 5
-+   as_fn_error "You should include at least one plugin..." "$LINENO" 5
- fi
- 
- 
-@@ -9449,7 +9359,7 @@ for ac_hdr in dirent.h sys/ndir.h sys/di
-   as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
- $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
--if eval "test \"\${$as_ac_Header+set}\"" = set; then :
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -9476,7 +9386,8 @@ fi
- eval ac_res=\$$as_ac_Header
- 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
- _ACEOF
-@@ -9718,7 +9629,8 @@ for ac_header in arpa/inet.h fcntl.h net
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -10056,7 +9968,8 @@ for ac_func in fork vfork
- do :
-   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
--if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -10309,7 +10222,8 @@ for ac_header in sys/select.h sys/socket
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -10413,8 +10327,8 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
--$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
-+$as_echo_n "checking whether lstat dereferences a symlink specified with a trailing slash... " >&6; }
- if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-@@ -10431,7 +10345,7 @@ int
- main ()
- {
- struct stat sbuf;
--     /* Linux will dereference the symlink and fail, as required by POSIX.
-+     /* Linux will dereference the symlink and fail.
- 	That is better in the sense that it means we will not
- 	have to compile and use the lstat wrapper.  */
-      return lstat ("conftest.sym/", &sbuf) == 0;
-@@ -10466,7 +10380,7 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
- 
- 
--if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
-+if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
-   case " $LIBOBJS " in
-   *" lstat.$ac_objext "* ) ;;
-   *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
-@@ -10693,7 +10607,8 @@ for ac_func in dup2 floor gethostbyname 
- do :
-   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
--if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -10787,7 +10702,6 @@ DEFS=-DHAVE_CONFIG_H
- 
- ac_libobjs=
- ac_ltlibobjs=
--U=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-   # 1. Remove the extension, and $U if already installed.
-   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-@@ -10811,11 +10725,11 @@ else
- fi
- 
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
--  as_fn_error $? "conditional \"AMDEP\" was never defined.
-+  as_fn_error "conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
--  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- 
-@@ -10965,19 +10879,19 @@ export LANGUAGE
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- 
--# as_fn_error STATUS ERROR [LINENO LOG_FD]
--# ----------------------------------------
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
--# script with STATUS, using 1 if that was 0.
-+# script with status $?, using 1 if that was 0.
- as_fn_error ()
- {
--  as_status=$1; test $as_status -eq 0 && as_status=1
--  if test "$4"; then
--    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-   fi
--  $as_echo "$as_me: error: $2" >&2
-+  $as_echo "$as_me: error: $1" >&2
-   as_fn_exit $as_status
- } # as_fn_error
- 
-@@ -11173,7 +11087,7 @@ $as_echo X"$as_dir" |
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
- 
- 
- } # as_fn_mkdir_p
-@@ -11227,7 +11141,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
- # values after options handling.
- ac_log="
- This file was extended by LCD4Linux $as_me 0.11.0-SVN, which was
--generated by GNU Autoconf 2.67.  Invocation command line was
-+generated by GNU Autoconf 2.64.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -11267,7 +11181,6 @@ Usage: $0 [OPTION]... [TAG]...
- 
-   -h, --help       print this help, then exit
-   -V, --version    print version number and configuration settings, then exit
--      --config     print configuration, then exit
-   -q, --quiet, --silent
-                    do not print progress messages
-   -d, --debug      don't remove temporary files
-@@ -11290,13 +11203,12 @@ Report bugs to <lcd4linux-users@lists.so
- 
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
--ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- LCD4Linux config.status 0.11.0-SVN
--configured by $0, generated by GNU Autoconf 2.67,
--  with options \\"\$ac_cs_config\\"
-+configured by $0, generated by GNU Autoconf 2.64,
-+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
- 
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- 
-@@ -11314,16 +11226,11 @@ ac_need_defaults=:
- while test $# != 0
- do
-   case $1 in
--  --*=?*)
-+  --*=*)
-     ac_option=`expr "X$1" : 'X\([^=]*\)='`
-     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-     ac_shift=:
-     ;;
--  --*=)
--    ac_option=`expr "X$1" : 'X\([^=]*\)='`
--    ac_optarg=
--    ac_shift=:
--    ;;
-   *)
-     ac_option=$1
-     ac_optarg=$2
-@@ -11337,15 +11244,12 @@ do
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     $as_echo "$ac_cs_version"; exit ;;
--  --config | --confi | --conf | --con | --co | --c )
--    $as_echo "$ac_cs_config"; exit ;;
-   --debug | --debu | --deb | --de | --d | -d )
-     debug=: ;;
-   --file | --fil | --fi | --f )
-     $ac_shift
-     case $ac_optarg in
-     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
--    '') as_fn_error $? "missing file argument" ;;
-     esac
-     as_fn_append CONFIG_FILES " '$ac_optarg'"
-     ac_need_defaults=false;;
-@@ -11358,7 +11262,7 @@ do
-     ac_need_defaults=false;;
-   --he | --h)
-     # Conflict between --help and --header
--    as_fn_error $? "ambiguous option: \`$1'
-+    as_fn_error "ambiguous option: \`$1'
- Try \`$0 --help' for more information.";;
-   --help | --hel | -h )
-     $as_echo "$ac_cs_usage"; exit ;;
-@@ -11367,7 +11271,7 @@ Try \`$0 --help' for more information.";
-     ac_cs_silent=: ;;
- 
-   # This is an error.
--  -*) as_fn_error $? "unrecognized option: \`$1'
-+  -*) as_fn_error "unrecognized option: \`$1'
- Try \`$0 --help' for more information." ;;
- 
-   *) as_fn_append ac_config_targets " $1"
-@@ -11425,7 +11329,7 @@ do
-     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- 
--  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
-+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-   esac
- done
- 
-@@ -11463,7 +11367,7 @@ $debug ||
- {
-   tmp=./conf$$-$RANDOM
-   (umask 077 && mkdir "$tmp")
--} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
- 
- # Set up the scripts for CONFIG_FILES section.
- # No need to generate them if there are no CONFIG_FILES.
-@@ -11480,7 +11384,7 @@ if test "x$ac_cr" = x; then
- fi
- ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
- if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
--  ac_cs_awk_cr='\\r'
-+  ac_cs_awk_cr='\r'
- else
-   ac_cs_awk_cr=$ac_cr
- fi
-@@ -11494,18 +11398,18 @@ _ACEOF
-   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-   echo "_ACEOF"
- } >conf$$subs.sh ||
--  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
--ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   . ./conf$$subs.sh ||
--    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- 
-   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-   if test $ac_delim_n = $ac_delim_num; then
-     break
-   elif $ac_last_try; then
--    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
-@@ -11527,7 +11431,7 @@ s/'"$ac_delim"'$//
- t delim
- :nl
- h
--s/\(.\{148\}\)..*/\1/
-+s/\(.\{148\}\).*/\1/
- t more1
- s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
- p
-@@ -11541,7 +11445,7 @@ s/.\{148\}//
- t nl
- :delim
- h
--s/\(.\{148\}\)..*/\1/
-+s/\(.\{148\}\).*/\1/
- t more2
- s/["\\]/\\&/g; s/^/"/; s/$/"/
- p
-@@ -11594,28 +11498,20 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
- else
-   cat
- fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
--  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
- _ACEOF
- 
--# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
--# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
- # (actually we leave an empty line to preserve line numbers).
- if test "x$srcdir" = x.; then
--  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
--h
--s///
--s/^/:/
--s/[	 ]*$/:/
--s/:\$(srcdir):/:/g
--s/:\${srcdir}:/:/g
--s/:@srcdir@:/:/g
--s/^:*//
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[	 ]*\):*/\1/
- s/:*$//
--x
--s/\(=[	 ]*\).*/\1/
--G
--s/\n//
- s/^[^=]*=[	 ]*$//
- }'
- fi
-@@ -11643,7 +11539,7 @@ for ac_last_try in false false :; do
-   if test -z "$ac_t"; then
-     break
-   elif $ac_last_try; then
--    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
-@@ -11728,7 +11624,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
- _ACAWK
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
--  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
- fi # test -n "$CONFIG_HEADERS"
- 
- 
-@@ -11741,7 +11637,7 @@ do
-   esac
-   case $ac_mode$ac_tag in
-   :[FHL]*:*);;
--  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
-+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-   :[FH]-) ac_tag=-:-;;
-   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-   esac
-@@ -11769,7 +11665,7 @@ do
- 	   [\\/$]*) false;;
- 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- 	   esac ||
--	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
-+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-       esac
-       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-       as_fn_append ac_file_inputs " '$ac_f'"
-@@ -11796,7 +11692,7 @@ $as_echo "$as_me: creating $ac_file" >&6
- 
-     case $ac_tag in
-     *:-:* | *:-) cat >"$tmp/stdin" \
--      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-     esac
-     ;;
-   esac
-@@ -11933,22 +11829,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
- $ac_datarootdir_hack
- "
- eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
--  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
- 
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
--which seems to be undefined.  Please make sure it is defined" >&5
-+which seems to be undefined.  Please make sure it is defined." >&5
- $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
--which seems to be undefined.  Please make sure it is defined" >&2;}
-+which seems to be undefined.  Please make sure it is defined." >&2;}
- 
-   rm -f "$tmp/stdin"
-   case $ac_file in
-   -) cat "$tmp/out" && rm -f "$tmp/out";;
-   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-   esac \
--  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
-  ;;
-   :H)
-   #
-@@ -11959,19 +11855,19 @@ which seems to be undefined.  Please mak
-       $as_echo "/* $configure_input  */" \
-       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-     } >"$tmp/config.h" \
--      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5
-     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
- $as_echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       rm -f "$ac_file"
-       mv "$tmp/config.h" "$ac_file" \
--	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
-     fi
-   else
-     $as_echo "/* $configure_input  */" \
-       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
--      || as_fn_error $? "could not create -" "$LINENO" 5
-+      || as_fn_error "could not create -" "$LINENO" 5
-   fi
- # Compute "$ac_file"'s index in $config_headers.
- _am_arg="$ac_file"
-@@ -12121,7 +12017,7 @@ _ACEOF
- ac_clean_files=$ac_clean_files_save
- 
- test $ac_write_fail = 0 ||
--  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
- 
- 
- # configure is writing to config.log, and then calls config.status.
-@@ -12142,7 +12038,7 @@ if test "$no_create" != yes; then
-   exec 5>>config.log
-   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-   # would make configure fail if this is the last instruction.
--  $ac_cs_success || as_fn_exit 1
-+  $ac_cs_success || as_fn_exit $?
- fi
- if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-@@ -12176,8 +12072,8 @@ esac
- 
- 
- 
--macro_version='2.2.6b'
--macro_revision='1.3017'
-+macro_version='2.2.6'
-+macro_revision='1.3012'
- 
- 
- 
-@@ -12250,7 +12146,7 @@ esac
-   done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_SED"; then
--    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
-   fi
- else
-   ac_cv_path_SED=$SED
-@@ -12329,7 +12225,7 @@ esac
-   done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_FGREP"; then
--    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_FGREP=$FGREP
-@@ -12445,7 +12341,7 @@ else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
- $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-@@ -12647,13 +12543,13 @@ if test "${lt_cv_nm_interface+set}" = se
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:12650: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:12546: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:12653: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:12549: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:12656: output\"" >&5)
-+  (eval echo "\"\$as_me:12552: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -13108,7 +13004,7 @@ irix5* | irix6* | nonstopux*)
-   ;;
- 
- # This must be Linux ELF.
--linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+linux* | k*bsd*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-@@ -13847,7 +13743,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 13850 "configure"' > conftest.$ac_ext
-+  echo '#line 13746 "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -15105,11 +15001,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:15108: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15004: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:15112: \$? = $ac_status" >&5
-+   echo "$as_me:15008: \$? = $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.
-@@ -15274,7 +15170,7 @@ $as_echo_n "checking for $compiler optio
-       lt_prog_compiler_static='-non_shared'
-       ;;
- 
--    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+    linux* | k*bsd*-gnu)
-       case $cc_basename in
-       # old Intel for x86_64 which still supported -KPIC.
-       ecc*)
-@@ -15444,11 +15340,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:15447: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15343: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:15451: \$? = $ac_status" >&5
-+   echo "$as_me:15347: \$? = $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.
-@@ -15549,11 +15445,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:15552: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15448: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:15556: \$? = $ac_status" >&5
-+   echo "$as_me:15452: \$? = $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
-@@ -15604,11 +15500,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:15607: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15503: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:15611: \$? = $ac_status" >&5
-+   echo "$as_me:15507: \$? = $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
-@@ -15747,7 +15643,6 @@ $as_echo_n "checking whether the $compil
-     fi
-     supports_anon_versioning=no
-     case `$LD -v 2>&1` in
--      *GNU\ gold*) supports_anon_versioning=yes ;;
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -15839,7 +15734,7 @@ _LT_EOF
-       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       ;;
- 
--    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-+    gnu* | linux* | tpf* | k*bsd*-gnu)
-       tmp_diet=no
-       if test "$host_os" = linux-dietlibc; then
- 	case $cc_basename in
-@@ -17301,7 +17196,7 @@ linux*oldld* | linux*aout* | linux*coff*
-   ;;
- 
- # This must be Linux ELF.
--linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+linux* | k*bsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -17988,7 +17883,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 17991 "configure"
-+#line 17886 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -18084,7 +17979,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 18087 "configure"
-+#line 17982 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-diff -rupN --exclude=.svn --exclude='*.conf' --exclude='*.png' --exclude=Makefile.in --exclude=config.h.in --exclude=aclocal.m4 --exclude=autom4te.cache --exclude=ltmain.sh --exclude=libtool.m4 --exclude=ltoptions.m4 --exclude=ltsugar.m4 lcd4linux.orig/configure.in lcd4linux/configure.in
---- lcd4linux.orig/configure.in	2011-04-11 14:04:31.000000000 +0200
-+++ lcd4linux/configure.in	2011-01-28 15:08:51.000000000 +0100
-@@ -81,6 +81,9 @@ AC_CHECK_HEADERS(serdisplib/serdisp.h, [
- # check for st2205 libs
- AC_CHECK_HEADERS(st2205.h, [has_st2205="true"], [has_st2205="false"])
- 
-+# check for dpf libs
-+AC_CHECK_HEADERS(dpf.h, [has_dpf="true"], [has_dpf="false"])
-+
- # check for vncserver libs
- AC_CHECK_HEADERS(rfb/rfb.h, [has_vncserverlib="true"], [has_vncserverlib="false"])
- 
-diff -rupN --exclude=.svn --exclude='*.conf' --exclude='*.png' --exclude=Makefile.in --exclude=config.h.in --exclude=aclocal.m4 --exclude=autom4te.cache --exclude=ltmain.sh --exclude=libtool.m4 --exclude=ltoptions.m4 --exclude=ltsugar.m4 lcd4linux.orig/drivers.m4 lcd4linux/drivers.m4
---- lcd4linux.orig/drivers.m4	2011-04-11 14:04:31.000000000 +0200
-+++ lcd4linux/drivers.m4	2011-01-28 15:08:51.000000000 +0100
-@@ -32,7 +32,7 @@ AC_ARG_WITH(
-   [                        drivers may be excluded with 'all,!<driver>',]
-   [                        (try 'all,\!<driver>' if your shell complains...)]
-   [                        possible drivers are:]
--  [                        ASTUSB, BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux, D4D,]
-+  [                        ASTUSB, BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux, D4D, DPF]
-   [                        EA232Graphic, EFN, FW8888, G15, GLCD2USB, HD44780, HD44780-I2C,]
-   [                        IRLCD, LCD2USB, LCDLinux, LEDMatrix, LCDTerm, LPH7508, LUIse,]
-   [                        LW_ABP, M50530, MatrixOrbital, MatrixOrbitalGX,]
-@@ -67,6 +67,7 @@ for driver in $drivers; do
-          CURSES="yes"
-          CWLINUX="yes"
-          D4D="yes"
-+         DPF="yes"
-          EA232graphic="yes"
-          EFN="yes"
-          FW8888="yes"
-@@ -131,6 +132,9 @@ for driver in $drivers; do
-       D4D)
-          D4D=$val
-          ;;
-+      DPF)
-+         DPF=$val
-+         ;;
-       EA232graphic)
-          EA232graphic=$val
-          ;;
-@@ -352,6 +356,17 @@ if test "$D4D" = "yes"; then
-    AC_DEFINE(WITH_D4D,1,[D4D driver])
- fi
- 
-+if test "$DPF" = "yes"; then
-+   if test "$has_dpf" = "true"; then
-+      GRAPHIC="yes"
-+      DRIVERS="$DRIVERS drv_dpf.o"
-+      DRVLIBS="$DRVLIBS -L/usr/local/lib -ldpf -lusb"
-+      AC_DEFINE(WITH_DPF,1,[DPF driver])
-+   else
-+      AC_MSG_WARN(dpf.h not found: DPF driver disabled)
-+   fi
-+fi
-+
- if test "$EA232graphic" = "yes"; then
-    GRAPHIC="yes"
-    SERIAL="yes"
-@@ -698,6 +713,7 @@ if test "$ST2205" = "yes"; then
-    fi
- fi
- 
-+
- if test "$T6963" = "yes"; then
-    if test "$has_parport" = "true"; then
-       GRAPHIC="yes"
-diff -rupN --exclude=.svn --exclude='*.conf' --exclude='*.png' --exclude=Makefile.in --exclude=config.h.in --exclude=aclocal.m4 --exclude=autom4te.cache --exclude=ltmain.sh --exclude=libtool.m4 --exclude=ltoptions.m4 --exclude=ltsugar.m4 lcd4linux.orig/drv.c lcd4linux/drv.c
---- lcd4linux.orig/drv.c	2011-04-11 14:04:31.000000000 +0200
-+++ lcd4linux/drv.c	2011-01-28 15:08:51.000000000 +0100
-@@ -54,6 +54,7 @@ extern DRIVER drv_Crystalfontz;
- extern DRIVER drv_Curses;
- extern DRIVER drv_Cwlinux;
- extern DRIVER drv_D4D;
-+extern DRIVER drv_DPF;
- extern DRIVER drv_EA232graphic;
- extern DRIVER drv_EFN;
- extern DRIVER drv_FW8888;
-@@ -125,6 +126,9 @@ DRIVER *Driver[] = {
- #ifdef WITH_D4D
-     &drv_D4D,
- #endif
-+#ifdef WITH_DPF
-+    &drv_DPF,
-+#endif
- #ifdef WITH_EA232graphic
-     &drv_EA232graphic,
- #endif
-diff -rupN --exclude=.svn --exclude='*.conf' --exclude='*.png' --exclude=Makefile.in --exclude=config.h.in --exclude=aclocal.m4 --exclude=autom4te.cache --exclude=ltmain.sh --exclude=libtool.m4 --exclude=ltoptions.m4 --exclude=ltsugar.m4 lcd4linux.orig/drv_dpf.c lcd4linux/drv_dpf.c
---- lcd4linux.orig/drv_dpf.c	1970-01-01 01:00:00.000000000 +0100
-+++ lcd4linux/drv_dpf.c	2011-04-09 11:59:51.000000000 +0200
-@@ -0,0 +1,284 @@
-+/* $Id: drv_dpf.c 980 2009-01-28 21:18:52Z michux $
-+ * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/drv_dpf.c $
-+ *
-+ * Very basic hacked picture frame driver. Uses external libdpf.
-+ * This is a first working approach for AX206 based DPFs. In future,
-+ * more DPFs might be covered by that library. Work in progress.
-+ *
-+ * See http://tech.section5.ch/news/?p=68 for more info.
-+ * 
-+ * Copyright (C) 2008 Jeroen Domburg <picframe@spritesmods.com>
-+ * Modified from sample code by:
-+ * Copyright (C) 2005 Michael Reinelt <michael@reinelt.co.at>
-+ * Copyright (C) 2005, 2006, 2007 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
-+ * Mods by <hackfin@section5.ch>
-+ *
-+ * This file is part of LCD4Linux.
-+ *
-+ * LCD4Linux is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * LCD4Linux is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+/* 
-+ *
-+ * exported fuctions:
-+ *
-+ * struct DRIVER drv_DPF
-+ *
-+ */
-+
-+#include "config.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <string.h>
-+#include <errno.h>
-+
-+#include "dpf.h"
-+
-+#include "debug.h"
-+#include "cfg.h"
-+#include "qprintf.h"
-+#include "udelay.h"
-+#include "plugin.h"
-+#include "widget.h"
-+#include "widget_text.h"
-+#include "widget_icon.h"
-+#include "widget_bar.h"
-+#include "drv.h"
-+
-+#include "drv_generic_graphic.h"
-+
-+static char Name[] = "DPF";
-+
-+static DPFContext *g_h;
-+
-+/* Display data */
-+static unsigned char *g_fb;
-+
-+static int drv_dpf_open(const char *section)
-+{
-+	int error;
-+	char *dev;
-+	int i;
-+	DPFValue val;
-+
-+	// Currently, the Port specification is unused.
-+
-+	dev = cfg_get(section, "Port", NULL);
-+	if (dev == NULL || *dev == '\0') {
-+		error("dpf: no '%s.Port' entry from %s", section, cfg_source());
-+		return -1;
-+	}
-+
-+	error = dpf_open(dev, &g_h);
-+	if (error < 0) {
-+		error("dpf: cannot open dpf device %s", dev);
-+		return -1;
-+	}
-+
-+	val.type = TYPE_INTEGER;
-+
-+    if (cfg_number(section, "Orientation", 0, 0, 3, &i) > 0) {
-+		val.value.integer = i;
-+		dpf_setproperty(g_h, PROPERTY_ORIENTATION, &val);
-+	}
-+
-+    if (cfg_number(section, "Backlight", 0, 0, 7, &i) > 0) {
-+		val.value.integer = i;
-+		dpf_setproperty(g_h, PROPERTY_BRIGHTNESS, &val);
-+    }
-+
-+	return 0;
-+}
-+
-+
-+static int drv_dpf_close(void)
-+{
-+	dpf_close(g_h);
-+
-+	return 0;
-+}
-+
-+#define _RGB565_0(p) \
-+	(( ((p.R) & 0xf8)	   ) | (((p.G) & 0xe0) >> 5))
-+#define _RGB565_1(p) \
-+	(( ((p.G) & 0x1c) << 3 ) | (((p.B) & 0xf8) >> 3))
-+
-+static void drv_dpf_blit(const int row, const int col, const int height,
-+	const int width)
-+{
-+	int r, c;
-+	short rect[4];
-+	unsigned long i;
-+	RGBA p;
-+	unsigned char *pix;
-+
-+	pix = g_fb;
-+	for (r = row; r < row + height; r++) {
-+		for (c = col; c < col + width; c++) {
-+			p = drv_generic_graphic_rgb(r, c);
-+			*pix++ = _RGB565_0(p);
-+			*pix++ = _RGB565_1(p);
-+		}
-+	}
-+	rect[0] = col; rect[1] = row;
-+	rect[2] = col + width; rect[3] = row + height;
-+	dpf_screen_blit(g_h, g_fb, rect);
-+}
-+
-+
-+/* start graphic display */
-+static int drv_dpf_start2(const char *section)
-+{
-+	char *s;
-+
-+	s = cfg_get(section, "Font", "6x8");
-+	if (s == NULL || *s == '\0') {
-+		error("%s: no '%s.Font' entry from %s", Name, section, cfg_source());
-+		return -1;
-+	}
-+
-+	XRES = -1;
-+	YRES = -1;
-+	if (sscanf(s, "%dx%d", &XRES, &YRES) != 2 || XRES < 1 || YRES < 1) {
-+		error("%s: bad Font '%s' from %s", Name, s, cfg_source());
-+		return -1;
-+	}
-+
-+	/* Fixme: provider other fonts someday... */
-+	if (XRES != 6 && YRES != 8) {
-+		error("%s: bad Font '%s' from %s (only 6x8 at the moment)",
-+			Name, s, cfg_source());
-+		return -1;
-+	}
-+
-+
-+	/* open communication with the display */
-+	if (drv_dpf_open(section) < 0) {
-+		return -1;
-+	}
-+
-+	/* you surely want to allocate a framebuffer or something... */
-+	g_fb = malloc(g_h->height * g_h->width * g_h->bpp);
-+
-+	/* set width/height from dpf firmware specs */
-+	DROWS = g_h->height;
-+	DCOLS = g_h->width;
-+
-+	return 0;
-+}
-+
-+/****************************************/
-+/***			plugins				  ***/
-+/****************************************/
-+
-+static void plugin_backlight(RESULT * result, RESULT * arg1)
-+{
-+	DPFValue val;
-+
-+	val.type = TYPE_INTEGER;
-+	val.value.integer = R2N(arg1);
-+	printf("Setting brightness...\n");
-+	dpf_setproperty(g_h, PROPERTY_BRIGHTNESS, &val);
-+	SetResult(&result, R_NUMBER, &val.value.integer);
-+}
-+
-+
-+/****************************************/
-+/***		widget callbacks		  ***/
-+/****************************************/
-+
-+
-+/* using drv_generic_text_draw(W) */
-+/* using drv_generic_text_icon_draw(W) */
-+/* using drv_generic_text_bar_draw(W) */
-+/* using drv_generic_gpio_draw(W) */
-+
-+
-+/****************************************/
-+/***		exported functions		  ***/
-+/****************************************/
-+
-+
-+/* list models */
-+int drv_dpf_list(void)
-+{
-+	printf("generic hacked photo frame");
-+	return 0;
-+}
-+
-+
-+/* initialize driver & display */
-+int drv_dpf_init2(const char *section, const int quiet)
-+{
-+	int ret;
-+
-+	/* real worker functions */
-+	drv_generic_graphic_real_blit = drv_dpf_blit;
-+
-+	/* start display */
-+	if ((ret = drv_dpf_start2(section)) != 0)
-+		return ret;
-+
-+	/* initialize generic graphic driver */
-+	if ((ret = drv_generic_graphic_init(section, Name)) != 0)
-+		return ret;
-+
-+	if (!quiet) {
-+		char buffer[40];
-+		qprintf(buffer, sizeof(buffer), "%s %dx%d", Name, DCOLS, DROWS);
-+		if (drv_generic_graphic_greet(buffer, NULL)) {
-+			sleep(3);
-+			drv_generic_graphic_clear();
-+		}
-+	}
-+
-+	/* register plugins */
-+	AddFunction("LCD::backlight", 1, plugin_backlight);
-+
-+	return 0;
-+}
-+
-+
-+/* close driver & display */
-+int drv_dpf_quit2(const int quiet)
-+{
-+	info("%s: shutting down.", Name);
-+
-+	/* clear display */
-+	drv_generic_graphic_clear();
-+
-+	/* say goodbye... */
-+	if (!quiet) {
-+		drv_generic_graphic_greet("goodbye!", NULL);
-+	}
-+
-+	drv_generic_graphic_quit();
-+
-+	debug("closing connection");
-+	drv_dpf_close();
-+
-+	return (0);
-+}
-+
-+
-+DRIVER drv_DPF = {
-+	.name = Name,
-+	.list = drv_dpf_list,
-+	.init = drv_dpf_init2,
-+	.quit = drv_dpf_quit2,
-+};
-diff -rupN --exclude=.svn --exclude='*.conf' --exclude='*.png' --exclude=Makefile.in --exclude=config.h.in --exclude=aclocal.m4 --exclude=autom4te.cache --exclude=ltmain.sh --exclude=libtool.m4 --exclude=ltoptions.m4 --exclude=ltsugar.m4 lcd4linux.orig/m4/lt~obsolete.m4 lcd4linux/m4/lt~obsolete.m4
---- lcd4linux.orig/m4/lt~obsolete.m4	1970-01-01 01:00:00.000000000 +0100
-+++ lcd4linux/m4/lt~obsolete.m4	2011-04-11 14:09:41.000000000 +0200
-@@ -0,0 +1,92 @@
-+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-+#
-+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-+#   Written by Scott James Remnant, 2004.
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# serial 4 lt~obsolete.m4
-+
-+# These exist entirely to fool aclocal when bootstrapping libtool.
-+#
-+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-+# which have later been changed to m4_define as they aren't part of the
-+# exported API, or moved to Autoconf or Automake where they belong.
-+#
-+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-+# using a macro with the same name in our local m4/libtool.m4 it'll
-+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-+# and doesn't know about Autoconf macros at all.)
-+#
-+# So we provide this file, which has a silly filename so it's always
-+# included after everything else.  This provides aclocal with the
-+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-+# because those macros already exist, or will be overwritten later.
-+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-+#
-+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-+# Yes, that means every name once taken will need to remain here until
-+# we give up compatibility with versions before 1.7, at which point
-+# we need to keep only those names which we still refer to.
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-+
-+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-+m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
-+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-diff -rupN --exclude=.svn --exclude='*.conf' --exclude='*.png' --exclude=Makefile.in --exclude=config.h.in --exclude=aclocal.m4 --exclude=autom4te.cache --exclude=ltmain.sh --exclude=libtool.m4 --exclude=ltoptions.m4 --exclude=ltsugar.m4 lcd4linux.orig/m4/ltversion.m4 lcd4linux/m4/ltversion.m4
---- lcd4linux.orig/m4/ltversion.m4	1970-01-01 01:00:00.000000000 +0100
-+++ lcd4linux/m4/ltversion.m4	2011-04-11 14:09:41.000000000 +0200
-@@ -0,0 +1,23 @@
-+# ltversion.m4 -- version numbers			-*- Autoconf -*-
-+#
-+#   Copyright (C) 2004 Free Software Foundation, Inc.
-+#   Written by Scott James Remnant, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# Generated from ltversion.in.
-+
-+# serial 3012 ltversion.m4
-+# This file is part of GNU Libtool
-+
-+m4_define([LT_PACKAGE_VERSION], [2.2.6])
-+m4_define([LT_PACKAGE_REVISION], [1.3012])
-+
-+AC_DEFUN([LTVERSION_VERSION],
-+[macro_version='2.2.6'
-+macro_revision='1.3012'
-+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-+_LT_DECL(, macro_revision, 0)
-+])
-diff -rupN --exclude=.svn --exclude='*.conf' --exclude='*.png' --exclude=Makefile.in --exclude=config.h.in --exclude=aclocal.m4 --exclude=autom4te.cache --exclude=ltmain.sh --exclude=libtool.m4 --exclude=ltoptions.m4 --exclude=ltsugar.m4 lcd4linux.orig/Makefile.am lcd4linux/Makefile.am
---- lcd4linux.orig/Makefile.am	2011-04-11 14:04:31.000000000 +0200
-+++ lcd4linux/Makefile.am	2011-01-28 15:08:51.000000000 +0100
-@@ -78,6 +78,7 @@ drv_Crystalfontz.c            \
- drv_Curses.c                  \
- drv_Cwlinux.c                 \
- drv_D4D.c                     \
-+drv_dpf.c                     \
- drv_EA232graphic.c            \
- drv_EFN.c                     \
- drv_FW8888.c                  \
author	EUcancER <root@euer.krebsco.de>	2011-08-31 12:52:15 +0200
committer	EUcancER <root@euer.krebsco.de>	2011-08-31 12:52:15 +0200
commit	8e2af5a9f643632b96564706313edd4524f81bfd (patch)
tree	10e31222000cc4e289c555f6eb487502c273afb4 /oncology/dpfhack_display/lcd4linux-svn1142-dpf.patch
parent	efe72ae286caa4ecf88edcbcb619fb0ceb886ca8 (diff)
parent	9030631edd4f5e44234fe77348b92190874f42a2 (diff)