Merge lp:~jmccrohan/lcd4linux/debian into lp:~siretart/lcd4linux/debian

[Jonathan McCrohan]

[lp:~jmccrohan/lcd4linux/debian]

767. By Jonathan McCrohan on 2011-12-27

   - raw port I/O in generic_parport driver disabled. Fixes FTBFS
     issues on mipsel, powerpc, s390x and sparc.
* debian/NEWS added to announce change in generic_parport driver

[Reinhard Tartler (siretart)]

review: Approve

=== modified file 'aclocal.m4'
--- aclocal.m4	2011-08-26 07:26:25 +0000
+++ aclocal.m4	2011-12-27 00:36:23 +0000
@@ -1348,8 +1348,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -1358,8 +1358,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -1493,6 +1493,8 @@
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -1978,7 +1980,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -2142,6 +2144,7 @@
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -2163,6 +2166,29 @@
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -2193,6 +2219,10 @@
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -2295,7 +2325,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -2303,6 +2339,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -2314,6 +2351,7 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
       [lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -2331,7 +2369,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -2376,8 +2416,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -2388,6 +2428,8 @@
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -2671,14 +2713,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -2755,13 +2810,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -2941,6 +2996,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -2980,7 +3040,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -3526,7 +3586,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -3535,7 +3595,7 @@
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -3600,7 +3660,7 @@
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -3739,7 +3799,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -3747,10 +3807,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -3758,7 +3814,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -3776,7 +3832,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -3796,7 +3852,7 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
@@ -3807,7 +3863,7 @@
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -3868,7 +3924,7 @@
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -3884,7 +3940,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -3921,9 +3977,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3998,7 +4054,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -4067,7 +4123,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -4092,7 +4148,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -4116,7 +4172,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -4147,7 +4203,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -4157,7 +4213,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -4579,7 +4635,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -4999,6 +5055,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -5583,7 +5640,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -5675,18 +5734,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -5846,7 +5920,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -5874,7 +5950,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6128,8 +6203,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -6425,6 +6499,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -6471,10 +6546,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -6487,7 +6558,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -6526,7 +6597,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -6968,9 +7038,6 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -7124,7 +7191,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -7494,7 +7560,7 @@
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -8255,12 +8321,18 @@
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -8457,7 +8529,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -8590,7 +8661,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -8773,6 +8843,73 @@
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -8842,6 +8979,13 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
@@ -9506,9 +9650,24 @@
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
@@ -9680,15 +9839,15 @@
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
 
=== modified file 'configure'
--- configure	2011-08-26 07:26:25 +0000
+++ configure	2011-12-27 00:36:23 +0000
@@ -761,6 +761,7 @@
 with_ncurses
 with_x
 with_python
+with_outb
 with_drivers
 with_plugins
 with_gnu_ld
@@ -1434,6 +1435,7 @@
   --with-ncurses=dir      Compile with ncurses/locate base dir
   --with-x                use the X Window System
   --with-python           enable python support [default=no]
+  --with-outb             enable raw port I/O support [default=no]
   --with-drivers=<list>   compile driver for displays in <list>,
                           drivers may be separated with commas,
                           'all' (default) compiles all available drivers,
@@ -1456,7 +1458,7 @@
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -4696,7 +4698,7 @@
 $as_echo_n "checking for ncurses version... " >&6; }
 	ncurses_version=unknown
 cat > conftest.$ac_ext <<EOF
-#line 4699 "configure"
+#line 4701 "configure"
 #include "confdefs.h"
 #ifdef RENAMED_NCURSES
 #include <curses.h>
@@ -6191,7 +6193,19 @@
 fi
 
 # check for parport
-#AC_CHECK_HEADERS(asm/io.h)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if raw port I/O is wanted" >&5
+$as_echo_n "checking if raw port I/O is wanted... " >&6; }
+
+# Check whether --with-outb was given.
+if test "${with_outb+set}" = set; then :
+  withval=$with_outb; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
+$as_echo "$withval" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 for ac_header in asm/io.h linux/parport.h linux/ppdev.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -6815,7 +6829,6 @@
 
 if test "$NEWHAVEN" = "yes"; then
    TEXT="yes"
-   #SERIAL="yes"
    I2C="yes"
    DRIVERS="$DRIVERS drv_Newhaven.o"
 
@@ -6847,9 +6860,7 @@
 fi
 
 if test "$PERTELIAN" = "yes"; then
-   # select either text or graphics mode
    TEXT="yes"
-   # select bus: serial (including USB), parallel or i2c
    SERIAL="yes"
    DRIVERS="$DRIVERS drv_Pertelian.o"
 
@@ -7307,6 +7318,47 @@
          PLUGIN_WIRELESS="yes"
          PLUGIN_XMMS="yes"
          ;;
+      none)
+         PLUGIN_APM="no"
+       	 PLUGIN_ASTERISK="no"
+	 PLUGIN_BUTTON_EXEC="no"
+         PLUGIN_CPUINFO="no"
+         PLUGIN_DBUS="no"
+         PLUGIN_DISKSTATS="no"
+         PLUGIN_DVB="no"
+         PLUGIN_EXEC="no"
+         PLUGIN_EVENT="no"
+         PLUGIN_FIFO="no"
+         PLUGIN_FILE="no"
+         PLUGIN_GPS="no"
+         PLUGIN_HDDTEMP="no"
+         PLUGIN_HUAWEI="no"
+         PLUGIN_I2C_SENSORS="no"
+         PLUGIN_ICONV="no"
+         PLUGIN_IMON="no"
+         PLUGIN_ISDN="no"
+         PLUGIN_KVV="no"
+         PLUGIN_LOADAVG="no"
+         PLUGIN_MEMINFO="no"
+         PLUGIN_MPD="no"
+	 PLUGIN_MPRIS_DBUS="no"
+         PLUGIN_MYSQL="no"
+         PLUGIN_NETDEV="no"
+         PLUGIN_NETINFO="no"
+         PLUGIN_POP3="no"
+         PLUGIN_PPP="no"
+         PLUGIN_PROC_STAT="no"
+         PLUGIN_PYTHON="no"
+         PLUGIN_QNAPLOG="no"
+         PLUGIN_SAMPLE="no"
+         PLUGIN_SETI="no"
+         PLUGIN_STATFS="no"
+         PLUGIN_UNAME="no"
+         PLUGIN_UPTIME="no"
+         PLUGIN_W1RETAP="no"
+         PLUGIN_WIRELESS="no"
+         PLUGIN_XMMS="no"
+         ;;
       apm)
          PLUGIN_APM=$val
          ;;
@@ -9369,10 +9421,6 @@
 
 fi
 
-if test "$PLUGINS" = ""; then
-   as_fn_error $? "You should include at least one plugin..." "$LINENO" 5
-fi
-
 
 
 
@@ -12100,18 +12148,18 @@
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: -----------------------------------------
-including drivers:
+included drivers:
   $DRIVERS
 -----------------------------------------
-including plugins:
+included plugins:
   $PLUGINS
 -----------------------------------------
 " >&5
 $as_echo "-----------------------------------------
-including drivers:
+included drivers:
   $DRIVERS
 -----------------------------------------
-including plugins:
+included plugins:
   $PLUGINS
 -----------------------------------------
 " >&6; }
@@ -12125,8 +12173,8 @@
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -12759,6 +12807,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -12798,7 +12851,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -13227,7 +13280,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -13867,13 +13920,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -14020,6 +14073,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -14408,7 +14462,7 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -14419,7 +14473,20 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -15059,7 +15126,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -15070,6 +15143,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -15102,6 +15176,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -15123,7 +15198,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -15261,7 +15338,22 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -15339,6 +15431,10 @@
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -15794,7 +15890,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -15885,18 +15983,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -16258,7 +16371,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -16511,8 +16623,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -16892,6 +17003,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -16937,6 +17049,7 @@
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -16965,10 +17078,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -16981,7 +17090,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -17020,7 +17129,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -17644,11 +17752,6 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -17738,7 +17841,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -17747,7 +17850,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -17812,7 +17915,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -17951,7 +18054,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -17959,10 +18062,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -17970,7 +18069,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -17988,7 +18087,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -18008,7 +18107,7 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
@@ -18019,7 +18118,7 @@
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -18080,7 +18179,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -18096,7 +18195,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -18133,9 +18232,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -18229,7 +18328,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -18298,7 +18397,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -18323,7 +18422,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -18347,7 +18446,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -18378,7 +18477,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -18388,7 +18487,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -19170,6 +19269,8 @@
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
 
=== modified file 'configure.in'
--- configure.in	2011-08-26 07:26:25 +0000
+++ configure.in	2011-12-27 00:36:23 +0000
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 
-# $Id: configure.in 1158 2011-07-28 02:09:16Z michael $
+# $Id: configure.in 1165 2011-12-26 06:28:05Z michael $
 # $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/configure.in $
 
 
@@ -105,7 +105,11 @@
 fi
 
 # check for parport
-#AC_CHECK_HEADERS(asm/io.h)
+AC_MSG_CHECKING(if raw port I/O is wanted)
+AC_ARG_WITH(outb,
+[  --with-outb             enable raw port I/O support [[default=no]]],
+[AC_MSG_RESULT($withval)], [AC_MSG_RESULT(no)])
+
 AC_CHECK_HEADERS([asm/io.h] [linux/parport.h linux/ppdev.h], [has_parport="true"], [has_parport="false"])
 
 # drivers
@@ -157,10 +161,10 @@
 
 AC_MSG_RESULT(
 [-----------------------------------------]
-[including drivers:]
+[included drivers:]
 [  $DRIVERS]
 [-----------------------------------------]
-[including plugins:]
+[included plugins:]
 [  $PLUGINS]
 [-----------------------------------------]
 )
 
=== added file 'debian/NEWS'
--- debian/NEWS	1970-01-01 00:00:00 +0000
+++ debian/NEWS	2011-12-27 00:36:23 +0000
@@ -0,0 +1,10 @@
+lcd4linux (0.11.0~svn1165-1) unstable; urgency=low
+
+  As of 0.11.0~svn1165-1, direct raw parallel port access has been disabled
+  by default. The generic_parport driver depended on sys/io.h which is not
+  available on all architectures. This change means that lcd4linux is now
+  available on the mipsel, powerpc, s390x and sparc architectures. If you
+  still require raw I/O, you can uncomment the --with-outb argument in
+  debian/rules and rebuild the package.
+
+ -- Jonathan McCrohan <[e-mail]>  Tue, 27 Dec 2011 00:27:15 +0000
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-08-30 13:18:14 +0000
+++ debian/changelog	2011-12-27 00:36:23 +0000
@@ -1,3 +1,16 @@
+lcd4linux (0.11.0~svn1165-1) unstable; urgency=low
+
+  * New upstream snapshot
+     - raw port I/O in generic_parport driver disabled. Fixes FTBFS 
+       issues on mipsel, powerpc, s390x and sparc.
+     - includes updates for D4D driver.
+     - fixes compilation warnings.
+  * debian/NEWS added to announce change in generic_parport driver
+  * Update libmysqlclient-dev virtual package in build-depends,
+    thanks to Clint Byrum (Closes: #652132)
+
+ -- Jonathan McCrohan <[e-mail]>  Tue, 27 Dec 2011 00:27:15 +0000
+
 lcd4linux (0.11.0~svn1158-1) unstable; urgency=low
 
   * New upstream snapshot
 
=== modified file 'debian/control'
--- debian/control	2011-08-20 19:52:48 +0000
+++ debian/control	2011-12-27 00:36:23 +0000
@@ -9,7 +9,7 @@
  dh-autoreconf,
  libdbus-1-dev,
  libgd2-noxpm-dev,
- libmysqlclient15-dev,
+ libmysqlclient-dev,
  libncurses5-dev,
  libsqlite3-dev,
  libusb-dev,
 
=== modified file 'debian/rules'
--- debian/rules	2011-08-28 13:31:13 +0000
+++ debian/rules	2011-12-27 00:36:23 +0000
@@ -34,6 +34,8 @@
 		--infodir=\$${prefix}/share/info \
 		--bindir=/usr/sbin \
 		--disable-rpath
+# Enable raw parallel port I/O
+#		--with-outb
 
 # call this target to update config.sub and config.guess
 # need autotools-dev installed
 
=== modified file 'drivers.m4'
--- drivers.m4	2011-08-26 07:26:25 +0000
+++ drivers.m4	2011-12-27 00:36:23 +0000
@@ -1,4 +1,4 @@
-dnl $Id: drivers.m4 1158 2011-07-28 02:09:16Z michael $
+dnl $Id: drivers.m4 1165 2011-12-26 06:28:05Z michael $
 dnl $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/drivers.m4 $
 
 
@@ -565,7 +565,6 @@
 
 if test "$NEWHAVEN" = "yes"; then
    TEXT="yes"
-   #SERIAL="yes"
    I2C="yes"
    DRIVERS="$DRIVERS drv_Newhaven.o"
    AC_DEFINE(WITH_NEWHAVEN,1,[Newhaven driver])
@@ -590,9 +589,7 @@
 fi
 
 if test "$PERTELIAN" = "yes"; then
-   # select either text or graphics mode
    TEXT="yes"
-   # select bus: serial (including USB), parallel or i2c
    SERIAL="yes"
    DRIVERS="$DRIVERS drv_Pertelian.o"
    AC_DEFINE(WITH_PERTELIAN,1,[Pertelian driver])
 
=== modified file 'drv_D4D.c'
--- drv_D4D.c	2011-08-26 07:24:25 +0000
+++ drv_D4D.c	2011-12-27 00:36:23 +0000
@@ -1,9 +1,9 @@
-/* $Id: drv_D4D.c 1153 2011-07-27 05:12:30Z michael $
+/* $Id: drv_D4D.c 1163 2011-12-09 03:16:17Z sonic74 $
  * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/drv_D4D.c $
  *
  * LCD4Linux driver for 4D Systems Display Graphics Modules
  *
- * Copyright (C) 2008 Sven Killig <[e-mail]>
+ * Copyright (C) 2008, 2011 Sven Killig <[e-mail]>
  * Modified from sample code by:
  * Copyright (C) 2005 Michael Reinelt <[e-mail]>
  * Copyright (C) 2005, 2006, 2007 The LCD4Linux Team <[e-mail]>
@@ -61,9 +61,12 @@
 #include "drv_generic_graphic.h"
 #include "drv_generic_serial.h"
 
+#include <sys/ioctl.h>
+#include <linux/serial.h>
+
 static char Name[] = "D4D";
 char NAME_[20];
-int FONT = 1, MODE = 0, EXTRA = 0, SECTOR = 0, SECTOR_SIZE, NOPOWERCYCLE = 0;
+int FONT = 1, MODE = 0, EXTRA = 0, SECTOR = 0, SECTOR_SIZE, POWERCYCLE = 0;
 /* int CONTRAST_; */
 
 #define address_mmsb(variable) ((variable >> 24) & 0xFF)
@@ -98,24 +101,6 @@
 /****************************************/
 
 
-static int drv_D4D_open(const char *section)
-{
-    int fd;
-    fd = drv_generic_serial_open(section, Name, 0);
-    if (fd < 0)
-	return -1;
-    fcntl(fd, F_SETFL, 0);	/* blocking read */
-    return 0;
-}
-
-
-static int drv_D4D_close(void)
-{
-    drv_generic_serial_close();
-    return 0;
-}
-
-
 static void drv_D4D_receive_ACK()
 {
     char ret[1];
@@ -128,8 +113,11 @@
     }
 }
 
+
 static void drv_D4D_send_nowait(const char *data, const unsigned int len)
 {
+    if (len > 1 && data[0] >= 32 && data[0] < 127)
+	debug("drv_D4D_send_nowait('%c'", data[0]);
     drv_generic_serial_write(data, len);
 }
 
@@ -139,32 +127,156 @@
     drv_D4D_receive_ACK();
 }
 
-static void drv_D4D_send_nowait_extra(const char *data, const unsigned int len, unsigned char pos1, unsigned char pos2)
+static void drv_D4D_send_extra_nowait(const char *data, const unsigned int len, unsigned char pos1, unsigned char pos2,
+				      unsigned char pos3, unsigned char pos4)
 {
-    /* possibly leave out bytes at pos1 and pos2 for older protocol format */
+    /* possibly leave out bytes at posn for GOLDELOX protocol format */
     if (EXTRA) {
 	drv_D4D_send_nowait(data, len);
     } else {
-	unsigned int i;
-	char send[1];
+	unsigned int i, j = 0, lenNew = len;
+	char send[len];
 	for (i = 0; i < len; i++) {
-	    if (!pos1 || i != pos1) {
-		if (!pos2 || i != pos2) {
-		    send[0] = data[i];
-		    drv_generic_serial_write(send, 1);
-		}
+	    if (i != pos1 && i != pos2 && i != pos3 && i != pos4) {
+		send[j++] = data[i];
+	    } else {
+		lenNew--;
 	    }
 	}
+	drv_D4D_send_nowait(send, lenNew);
     }
 }
 
-static void drv_D4D_send_extra(const char *data, const unsigned int len, char pos1, char pos2)
+static void drv_D4D_send_extra(const char *data, const unsigned int len, unsigned char pos1, unsigned char pos2,
+			       unsigned char pos3, unsigned char pos4)
 {
-    drv_D4D_send_nowait_extra(data, len, pos1, pos2);
+    drv_D4D_send_extra_nowait(data, len, pos1, pos2, pos3, pos4);
     drv_D4D_receive_ACK();
 }
 
 
+static int drv_D4D_open(const char *section)
+{
+    info("drv_D4D_open()");
+    int fd, picaso = 0;
+    struct termios portset;
+    static speed_t Speed = 0;
+    fd = drv_generic_serial_open(section, Name, 0);
+    if (fd < 0)
+	return -1;
+    int flags;
+    flags = fcntl(fd, F_GETFL);
+    flags &= ~FNDELAY;
+    fcntl(fd, F_SETFL, flags);
+
+    cfg_number(section, "PICASO", 0, 1200, 4000000, &picaso);
+    if (picaso) {
+	info("switching to 9600 baud");
+	if (tcgetattr(fd, &portset) == -1) {
+	    error("%s: tcgetattr failed: %s", Name, strerror(errno));
+	    return -1;
+	}
+	cfsetispeed(&portset, B9600);
+	cfsetospeed(&portset, B9600);
+	if (tcsetattr(fd, TCSANOW, &portset) == -1) {
+	    error("%s: tcsetattr failed: %s", Name, strerror(errno));
+	    return -1;
+	}
+    }
+
+    char cmd[] = { 'U' };
+    drv_D4D_send(cmd, sizeof(cmd));
+    debug("2");
+
+    if (picaso) {
+	char baud[] = { 'Q', 0 };
+	switch (picaso) {
+	case 1200:
+	    Speed = B1200;
+	    baud[1] = 0x03;
+	    break;
+	case 2400:
+	    Speed = B2400;
+	    baud[1] = 0x04;
+	    break;
+	case 4800:
+	    Speed = B4800;
+	    baud[1] = 0x05;
+	    break;
+	case 9600:
+	    Speed = B9600;
+	    baud[1] = 0x06;
+	    break;
+	case 19200:
+	    Speed = B19200;
+	    baud[1] = 0x08;
+	    break;
+	case 38400:
+	    Speed = B38400;
+	    baud[1] = 0x0A;
+	    break;
+	case 57600:
+	    Speed = B57600;
+	    baud[1] = 0x0B;
+	    break;
+	case 115200:
+	    Speed = B115200;
+	    baud[1] = 0x0D;
+	    break;
+	default:
+	    if (picaso >= 128000 && picaso < 256000) {	/* FTDI: 129032 */
+		Speed = B38400;
+		baud[1] = 0x0E;
+		break;
+	    } else if (picaso >= 256000) {	/* FTDI: 282353 */
+		Speed = B38400;
+		baud[1] = 0x0F;
+		break;
+	    }
+	    error("%s: unsupported speed '%d' from %s", Name, picaso, cfg_source());
+	    return -1;
+	}
+	drv_D4D_send_nowait(baud, sizeof(baud));
+	sleep(1);
+	debug("3");
+	cfsetispeed(&portset, Speed);
+	cfsetospeed(&portset, Speed);
+	if (picaso >= 128000) {
+	    struct serial_struct sstruct;
+	    if (ioctl(fd, TIOCGSERIAL, &sstruct) < 0) {
+		error("Error: could not get comm ioctl\n");
+		return -1;
+	    }
+	    sstruct.custom_divisor = sstruct.baud_base / picaso;
+	    info("baud_base=%d; custom_divisor=%d -> effective baud:%d", sstruct.baud_base, sstruct.custom_divisor,
+		 sstruct.baud_base / sstruct.custom_divisor);
+	    sstruct.flags |= ASYNC_SPD_CUST;
+	    if (ioctl(fd, TIOCSSERIAL, &sstruct) < 0) {
+		error("Error: could not set custom comm baud divisor\n");
+		return -1;
+	    }
+	}
+	debug("4");
+	info("switching to %d baud", picaso);
+	if (tcsetattr(fd, /*TCSANOW*/ TCSAFLUSH /*TCSADRAIN*/, &portset) == -1) {
+	    error("%s: tcsetattr failed: %s", Name, strerror(errno));
+	    return -1;
+	}
+	debug("5");
+
+    }
+
+    return 0;
+}
+
+
+static int drv_D4D_close(void)
+{
+    drv_generic_serial_close();
+    return 0;
+}
+
+
 static void drv_D4D_clear(void)
 {
     char cmd[] = { 'E' };
@@ -213,24 +325,33 @@
 	cmdNull[0] = 0;
 	drv_D4D_send(cmdNull, 1);
 
-	char cmd_user[] = { 'D', 0, 0, 0, 0, 0, msb(FG_COLOR), lsb(FG_COLOR) };	/* user defined symbols */
+	/*                       1, 2, 3, 4, 5, 6
+	   g, c,mx,lx,my,ly */
+	char cmd_user[] = { 'D', 0, 0, 0, 0, 0, 0, msb(FG_COLOR), lsb(FG_COLOR) };	/* user defined symbols */
 	for (i = 0; i < k; i++) {
 	    cmd_user[2] = user_char[i];
-	    cmd_user[3] = user_x[i];
-	    cmd_user[4] = msb(user_y[i]);
-	    cmd_user[5] = lsb(user_y[i]);
-	    drv_D4D_send_extra(cmd_user, sizeof(cmd_user), 1, 4);
+	    cmd_user[3] = msb(user_x[i]);
+	    cmd_user[4] = lsb(user_x[i]);
+	    cmd_user[5] = msb(user_y[i]);
+	    cmd_user[6] = lsb(user_y[i]);
+	    drv_D4D_send_extra(cmd_user, sizeof(cmd_user), 1, 3, 5, -1);
 	}
     } else {			/* font on SD card */
 	int sec;
-	char cmd_sd[] = { '@', 'I', 0, msb(row * YRES), lsb(row * YRES), XRES, msb(YRES), lsb(YRES), 16, 0, 0, 0 };
+	/*                          2, 3, 4              , 5              , 6        , 7        , 8        , 9        , 10,11,12,13
+	   mx,lx, my             , ly             , mw       , lw       , mh       , lh       , cm,hs,ms,ls */
+	char cmd_sd[] =
+	    { '@', 'I', 0, 0, msb(row * YRES), lsb(row * YRES), msb(XRES), lsb(XRES), msb(YRES), lsb(YRES), 16, 0, 0,
+	    0
+	};
 	for (i = 0; i < len; i++) {
-	    cmd_sd[2] = (col + i) * XRES;
+	    cmd_sd[2] = msb((col + i) * XRES);
+	    cmd_sd[3] = lsb((col + i) * XRES);
 	    sec = SECTOR + (unsigned char) data[i] * SECTOR_SIZE;
-	    cmd_sd[9] = address_hi(sec);
-	    cmd_sd[10] = address_mid(sec);
-	    cmd_sd[11] = address_lo(sec);
-	    drv_D4D_send_extra(cmd_sd, sizeof(cmd_sd), 3, 6);
+	    cmd_sd[11] = address_hi(sec);
+	    cmd_sd[12] = address_mid(sec);
+	    cmd_sd[13] = address_lo(sec);
+	    drv_D4D_send_extra(cmd_sd, sizeof(cmd_sd), 2, 4, 6, 8);
 	}
     }
 }
@@ -238,7 +359,7 @@
 
 static void drv_D4D_defchar(const int ascii, const unsigned char *matrix)
 {
-    /* error("drv_D4D_defchar"); */
+    info("drv_D4D_defchar");
     char cmd[11];
     int i;
 
@@ -249,62 +370,61 @@
     for (i = 0; i < 8; i++) {
 	cmd[i + 3] = *matrix++;
     }
-    drv_D4D_send_extra(cmd, sizeof(cmd), 1, 0);
+    drv_D4D_send_extra(cmd, sizeof(cmd), 1, -1, -1, -1);
 }
 
 
 static void drv_D4D_blit(const int row, const int col, const int height, const int width)
 {
-    /* error("drv_D4D_blit(%i, %i, %i, %i)",row, col, height, width); */
+    debug("drv_D4D_blit(%i, %i, %i, %i)", row, col, height, width);
     int r, c;
-    RGBA rgb, pixel0_0, pixel;
+    RGBA rgb;
     short int color;
-    char colorArray[2];
-
+    char colorArray[width * height * MODE / 8];
 
     /* optimization: single colour rectangle? */
-    pixel0_0 = drv_generic_graphic_rgb(0, 0);
-    char unicolor = 1;
+    /* commented out because obviously seldom used and expensive */
+    /*RGBA pixel0_0, pixel;
+       pixel0_0 = drv_generic_graphic_rgb(row, col);
+       char unicolor = 1;
+       for (r = row; (r < row + height) && unicolor; r++) {
+       for (c = col; (c < col + width) && unicolor; c++) {
+       pixel = drv_generic_graphic_rgb(r, c);
+       if (pixel0_0.R != pixel.R || pixel0_0.G != pixel.G || pixel0_0.B != pixel.B || pixel0_0.A != pixel.A)
+       unicolor = 0;
+       }
+       }
+
+       if (unicolor) {
+       color = RGB_24to16(pixel0_0.R, pixel0_0.G, pixel0_0.B);
+       unsigned char col2 = col + width - 1;
+       unsigned char row2 = row + height - 1;
+       char cmdRect[] =
+       { 'r', msb(col), lsb(col), msb(row), lsb(row), msb(col2), lsb(col2), msb(row2), lsb(row2), msb(color),
+       lsb(color)
+       };
+       debug("Rectangle(%i, %i, %i, %i, %i", col, row, col2, row2, color);
+       drv_D4D_send_extra(cmdRect, sizeof(cmdRect), 1, 3, 5, 7);
+       } else { */
+    char cmd[] =
+	{ 'I', msb(col), lsb(col), msb(row), lsb(row), msb(width), lsb(width), msb(height), lsb(height), MODE };
+    int p = 0;
+    drv_D4D_send_extra_nowait(cmd, sizeof(cmd), 1, 3, 5, 7);
     for (r = row; r < row + height; r++) {
-	if (!unicolor)
-	    break;
 	for (c = col; c < col + width; c++) {
-	    if (!unicolor)
-		break;
-	    pixel = drv_generic_graphic_rgb(r, c);
-	    if (pixel0_0.R != pixel.R || pixel0_0.G != pixel.G || pixel0_0.B != pixel.B || pixel0_0.A != pixel.A)
-		unicolor = 0;
-	}
-    }
-
-    if (unicolor) {
-	color = RGB_24to16(pixel0_0.R, pixel0_0.G, pixel0_0.B);
-	char row2 = row + height - 1;
-	char cmdRect[] =
-	    { 'r', col, msb(row), lsb(row), col + width - 1, msb(row2), lsb(row2), msb(color), lsb(color) };
-	drv_D4D_send_extra(cmdRect, sizeof(cmdRect), 2, 5);
-    } else {
-	char cmd[] = { 'I', col, msb(row), lsb(row), width, msb(height), lsb(height), MODE };
-	drv_D4D_send_nowait_extra(cmd, sizeof(cmd), 2, 5);
-	for (r = row; r < row + height; r++) {
-	    for (c = col; c < col + width; c++) {
-		rgb = drv_generic_graphic_rgb(r, c);
-		if (MODE == 8) {
-		    colorArray[0] = RGB_24to8(rgb.R, rgb.G, rgb.B);
-		    drv_D4D_send_nowait(colorArray, 1);
-		} else {
-		    color = RGB_24to16(rgb.R, rgb.G, rgb.B);
-		    colorArray[0] = msb(color);
-		    drv_D4D_send_nowait(colorArray, 1);	/* doesn't werk if sent together (error: "partial write(/dev/tts/1): len=2 ret=1") */
-		    /* colorArray[1]=lsb(color); */
-		    colorArray[0] = lsb(color);
-		    drv_D4D_send_nowait(colorArray, 1);
-		}
-		/* drv_D4D_send_nowait(colorArray, MODE/8); */
+	    rgb = drv_generic_graphic_rgb(r, c);
+	    if (MODE == 8) {
+		colorArray[p++] = RGB_24to8(rgb.R, rgb.G, rgb.B);
+	    } else {
+		color = RGB_24to16(rgb.R, rgb.G, rgb.B);
+		colorArray[p++] = msb(color);
+		colorArray[p++] = lsb(color);
 	    }
 	}
-	drv_D4D_receive_ACK();
     }
+    drv_D4D_send_nowait(colorArray, width * height * MODE / 8);	/* doesn't werk if sent together (error: "partial write(/dev/tts/1): len=2 ret=1") */
+    drv_D4D_receive_ACK();
+    /*} */
 }
 
 
@@ -325,7 +445,7 @@
 
 static int drv_D4D_start(const char *section)
 {
-    /* error("drv_D4D_start()"); */
+    info("drv_D4D_start()");
     int contrast;
     int xres_cfg = -1, yres_cfg = -1;
     char *s;
@@ -335,14 +455,19 @@
 	return -1;
     }
 
-    char cmd[] = { 'U' };
-    drv_D4D_send(cmd, sizeof(cmd));
-
-
-    char getVersion[] = { 'V', 0 };
+    char getVersion[] = { 'V', 0 /*1 */  };
     drv_D4D_send_nowait(getVersion, sizeof(getVersion));
     char answer[5];
-    drv_generic_serial_read(answer, sizeof(answer));
+    debug("reading answer[0]");
+    drv_generic_serial_read(answer + 0, 1);	/* ,5: PICASO 0/1, Speed 9600: error: "partial read(/dev/ttyUSB0): len=5 ret=1" */
+    debug("reading answer[1]");
+    drv_generic_serial_read(answer + 1, 1);
+    debug("reading answer[2]");
+    drv_generic_serial_read(answer + 2, 1);
+    debug("reading answer[3]");
+    drv_generic_serial_read(answer + 3, 1);
+    debug("reading answer[4]");
+    drv_generic_serial_read(answer + 4, 1);
     char *ids[] = { "uOLED", "uLCD", "uVGA" };
     char *id;
     if (answer[0] <= 2)
@@ -380,7 +505,8 @@
 	    res[i] = 240;
 	    break;
 	default:
-	    error("Can't detect display dimensions!");
+	    error("Can't detect display dimensions! answer: {%d, %d, %d, %d, %d}", answer[0], answer[1], answer[2],
+		  answer[3], answer[4]);
 	    return -1;
 	}
     }
@@ -390,38 +516,38 @@
 
     cfg_number(section, "Mode", 0, 0, 16, &MODE);
 
-    s = cfg_get(section, "Font", NULL);
-    if (s == NULL || *s == '\0') {
-	error("%s: no '%s.Font' entry from %s", Name, section, cfg_source());
-	return -1;
-    }
-    if (sscanf(s, "%dx%d", &xres_cfg, &yres_cfg) < 1 || xres_cfg < 0) {
-	error("%s: bad %s.Font '%s' from %s", Name, section, s, cfg_source());
-	free(s);
-	return -1;
-    }
-
-    if (yres_cfg == -1) {	/* font on SD card */
-	SECTOR = xres_cfg * 512;
-	char setAddress[] =
-	    { '@', 'A', address_mmsb(SECTOR), address_mlsb(SECTOR), address_lmsb(SECTOR), address_llsb(SECTOR) };
-	drv_D4D_send(setAddress, sizeof(setAddress));
-	char answer1[1];
-	char readByte[] = { '@', 'r' };
-	drv_D4D_send_nowait(readByte, sizeof(readByte));
-	drv_generic_serial_read(answer1, sizeof(answer1));
-	XRES = answer1[0];
-	drv_D4D_send_nowait(readByte, sizeof(readByte));
-	drv_generic_serial_read(answer1, sizeof(answer1));
-	YRES = answer1[0];
-	SECTOR = xres_cfg + 1;
-	SECTOR_SIZE = ceil((double) XRES * (double) YRES * 2.0 / 512.0);
-    } else {
-	XRES = xres_cfg;
-	YRES = yres_cfg;
-    }
-
     if (MODE == 0) {
+	s = cfg_get(section, "Font", NULL);
+	if (s == NULL || *s == '\0') {
+	    error("%s: no '%s.Font' entry from %s", Name, section, cfg_source());
+	    return -1;
+	}
+	if (sscanf(s, "%dx%d", &xres_cfg, &yres_cfg) < 1 || xres_cfg < 0) {
+	    error("%s: bad %s.Font '%s' from %s", Name, section, s, cfg_source());
+	    free(s);
+	    return -1;
+	}
+
+	if (yres_cfg == -1) {	/* font on SD card */
+	    SECTOR = xres_cfg * 512;
+	    char setAddress[] =
+		{ '@', 'A', address_mmsb(SECTOR), address_mlsb(SECTOR), address_lmsb(SECTOR), address_llsb(SECTOR) };
+	    drv_D4D_send(setAddress, sizeof(setAddress));
+	    char answer1[1];
+	    char readByte[] = { '@', 'r' };
+	    drv_D4D_send_nowait(readByte, sizeof(readByte));
+	    drv_generic_serial_read(answer1, sizeof(answer1));
+	    XRES = answer1[0];
+	    drv_D4D_send_nowait(readByte, sizeof(readByte));
+	    drv_generic_serial_read(answer1, sizeof(answer1));
+	    YRES = answer1[0];
+	    SECTOR = xres_cfg + 1;
+	    SECTOR_SIZE = ceil((double) XRES * (double) YRES * 2.0 / 512.0);
+	} else {
+	    XRES = xres_cfg;
+	    YRES = yres_cfg;
+	}
+
 
 	color = cfg_get(section, "foreground", "ffffff");
 	if (color2RGBA(color, &FG_COL_) < 0) {
@@ -474,8 +600,8 @@
 
 
 
-    cfg_number(section, "NoPowerCycle", 0, 1, 65536, &NOPOWERCYCLE);
-    if (!NOPOWERCYCLE) {
+    cfg_number(section, "PowerCycle", 0, 0, 1, &POWERCYCLE);
+    if (POWERCYCLE) {
 	char powerOn[] = { 'Y', 3, 1 };
 	drv_D4D_send(powerOn, sizeof(powerOn));
 
@@ -523,7 +649,7 @@
 }
 
 
-int lastVal[40 * 40 * 2];	/* ToDo: MAX_WIDGETS*2 */
+int lastVal[40 * 40 * 2];	/* Fixme: MAX_WIDGETS*2 */
 int drv_D4D_bar_draw(WIDGET * W)
 {
     /* optimizations:
@@ -534,14 +660,14 @@
     int row, col, len, res, max, val1, val2;
     DIRECTION dir;
 #if 0
-    STYLE style;		/* Fixme: unused variable */
+    STYLE style;		/* Fixme: missing style support */
 #endif
 
     row = W->row;
     col = W->col;
     dir = Bar->direction;
 #if 0
-    style = Bar->style;		/* Fixme: unused variable */
+    style = Bar->style;		/* Fixme: missing style support */
 #endif
     len = Bar->length;
 
@@ -567,12 +693,12 @@
     FG_COLOR = RGB_24to16(fg.R, fg.G, fg.B);
     BG_COLOR = RGB_24to16(bg.R, bg.G, bg.B);
 
-    char cmd[9];
+    char cmd[11];
     cmd[0] = 'r';
     int val[2];
     val[0] = val1;
     val[1] = val2;
-    int i, vals;
+    int i, vals, x1, x2;
     int lastValIndex0 = row * DCOLS + col;
     int cells = DROWS * DCOLS;
     if (val1 == val2 && lastVal[lastValIndex0] == lastVal[lastValIndex0 + cells])
@@ -582,23 +708,33 @@
     for (i = 0; i < vals; i++) {
 	int lastValIndex = lastValIndex0 + cells * (i /*+1 */ );
 	int y1 = row * YRES + (YRES / 2) * i;
-	cmd[2] = msb(y1);
-	cmd[3] = lsb(y1);
-	int y2 = y1 + (YRES) / vals - 1;
-	cmd[5] = msb(y2);
-	cmd[6] = lsb(y2);
+	cmd[3] = msb(y1);
+	cmd[4] = lsb(y1);
+	int y2 = y1 + YRES / vals - 1;
+	cmd[7] = msb(y2);
+	cmd[8] = lsb(y2);
 	if (val[i] > lastVal[lastValIndex]) {
-	    cmd[1] = col * XRES + lastVal[lastValIndex];
-	    cmd[4] = cmd[1] + val[i] - lastVal[lastValIndex] - 1;
-	    cmd[7] = msb(FG_COLOR);
-	    cmd[8] = lsb(FG_COLOR);
-	    drv_D4D_send_extra(cmd, sizeof(cmd), 2, 5);
+	    x1 = col * XRES + lastVal[lastValIndex];
+	    cmd[1] = msb(x1);
+	    cmd[2] = lsb(x1);
+	    x2 = x1 + val[i] - lastVal[lastValIndex] - 1;
+	    cmd[5] = msb(x2);
+	    cmd[6] = lsb(x2);
+	    cmd[9] = msb(FG_COLOR);
+	    cmd[10] = lsb(FG_COLOR);
+	    drv_D4D_send_extra(cmd, sizeof(cmd), 1, 3, 5, 7);
 	} else if (val[i] < lastVal[lastValIndex]) {
-	    cmd[1] = col * XRES + val[i] - 1 + 1;
-	    cmd[4] = cmd[1] + lastVal[lastValIndex] - val[i];
-	    cmd[7] = msb(BG_COLOR);
-	    cmd[8] = lsb(BG_COLOR);
-	    drv_D4D_send_extra(cmd, sizeof(cmd), 2, 5);
+	    x1 = col * XRES + val[i] - 1 + 1;
+	    cmd[1] = msb(x1);
+	    cmd[2] = lsb(x1);
+	    x2 = x1 + lastVal[lastValIndex] - val[i];
+	    cmd[5] = msb(x2);
+	    cmd[6] = lsb(x2);
+	    cmd[9] = msb(BG_COLOR);
+	    cmd[10] = lsb(BG_COLOR);
+	    drv_D4D_send_extra(cmd, sizeof(cmd), 1, 3, 5, 7);
+	} else {
+	    /* do nothing */
 	}
 	lastVal[lastValIndex] = val[i];
     }
@@ -650,11 +786,11 @@
 
 int drv_D4D_init(const char *section, const int quiet)
 {
-    /* error("drv_D4D_init()"); */
+    info("drv_D4D_init()");
     WIDGET_CLASS wc;
     int ret;
 
-    info("%s: %s", Name, "$Rev: 1153 $");
+    info("%s: %s", Name, "$Rev: 1163 $");
 
     if ((ret = drv_D4D_start(section)) != 0)
 	return ret;
@@ -732,7 +868,7 @@
 
 int drv_D4D_quit(const int quiet)
 {
-    /* error("drv_D4D_quit()"); */
+    info("drv_D4D_quit()");
 
     info("%s: shutting down.", Name);
 
@@ -740,7 +876,7 @@
 	drv_generic_text_quit();
 
 
-    if (!NOPOWERCYCLE) {
+    if (POWERCYCLE) {
 	drv_D4D_clear();
     }
 
@@ -761,12 +897,18 @@
     if (MODE)
 	drv_generic_graphic_quit();
 
-    if (!NOPOWERCYCLE) {
+    if (POWERCYCLE) {
 	char powerDown[] = { 'Y', 3, 0 };
 	drv_D4D_send(powerDown, sizeof(powerDown));
     }
 
-    debug("closing connection");
+    if (EXTRA) {
+	info("switching to 9600 baud");
+	char baud[] = { 'Q', 0x06 };
+	drv_D4D_send_nowait(baud, sizeof(baud));
+    }
+
+    info("closing connection");
     drv_D4D_close();
 
     return (0);
 
=== modified file 'drv_EFN.c'
--- drv_EFN.c	2011-08-26 07:24:25 +0000
+++ drv_EFN.c	2011-12-27 00:36:23 +0000
@@ -318,7 +318,7 @@
 /* list models */
 int drv_EFN_list(void)
 {
-    printf("EFN LED modules + EUG100 Ethernet to serial convertor");
+    printf("EFN LED modules + EUG100 Ethernet to serial converter");
     return 0;
 }
 
 
=== modified file 'drv_generic_parport.c'
--- drv_generic_parport.c	2011-04-27 17:28:49 +0000
+++ drv_generic_parport.c	2011-12-27 00:36:23 +0000
@@ -1,4 +1,4 @@
-/* $Id: drv_generic_parport.c 905 2008-12-23 13:37:07Z michael $
+/* $Id: drv_generic_parport.c 1165 2011-12-26 06:28:05Z michael $
  * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/drv_generic_parport.c $
  *
  * generic driver helper for serial and parport access
@@ -39,13 +39,17 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 
+#ifdef WITH_OUTB
 #ifdef HAVE_SYS_IO_H
 #include <sys/io.h>
-#define WITH_OUTB
 #else
 #ifdef HAVE_ASM_IO_H
 #include <asm/io.h>
-#define WITH_OUTB
+#else
+#warning neither sys/io.h nor asm/io.h exists.
+#warning raw port I/O will be disabled.
+#undef WITH_OUTB
+#endif
 #endif
 #endif
 
@@ -88,8 +92,10 @@
 /* Any bits set here will have their logic inverted at the parallel port */
 static unsigned char inverted_control_bits = 0;
 
+#ifdef WITH_OUTB
 /* initial value taken from linux/parport_pc.c */
 static unsigned char ctr = 0xc;
+#endif
 
 #ifdef WITH_PPDEV
 static int PPfd = -1;
@@ -130,7 +136,6 @@
 #endif
     }
 #ifdef WITH_PPDEV
-
     if (PPdev) {
 	info("%s: using ppdev %s", Driver, PPdev);
 	PPfd = open(PPdev, O_RDWR);
@@ -147,15 +152,15 @@
 	    info("%s: got exclusive access to %s.", Driver, PPdev);
 	}
 #endif
-
 	if (ioctl(PPfd, PPCLAIM)) {
 	    error("%s: ioctl(%s, PPCLAIM) failed: %d %s", Driver, PPdev, errno, strerror(errno));
 	    return -1;
 	}
-    } else
+    }
 #endif
 
-    {
+#ifdef WITH_OUTB
+    if (Port) {
 	error("using raw port 0x%x (deprecated!)", Port);
 	error("You *really* should change your setup and use ppdev!");
 	if ((Port + 3) <= 0x3ff) {
@@ -170,6 +175,7 @@
 	    }
 	}
     }
+#endif
     return 0;
 }
 
@@ -187,9 +193,11 @@
 	    return -1;
 	}
 	free(PPdev);
-    } else
+    }
 #endif
-    {
+
+#ifdef WITH_OUTB
+    if (Port) {
 	debug("closing raw port 0x%x", Port);
 	if ((Port + 3) <= 0x3ff) {
 	    if (ioperm(Port, 3, 0) != 0) {
@@ -203,6 +211,7 @@
 	    }
 	}
     }
+#endif
 
     return 0;
 }
@@ -374,13 +383,16 @@
 #ifdef WITH_PPDEV
     if (PPdev) {
 	ioctl(PPfd, PPDATADIR, &direction);
-    } else
+    }
 #endif
-    {
+
+#ifdef WITH_OUTB
+    if (Port) {
 	/* code stolen from linux/parport_pc.h */
 	ctr = (ctr & ~0x20) ^ (direction ? 0x20 : 0x00);
 	outb(ctr, Port + 2);
     }
+#endif
 }
 
 
@@ -395,11 +407,14 @@
 #ifdef WITH_PPDEV
     if (PPdev) {
 	ioctl(PPfd, PPRSTATUS, &data);
-    } else
+    }
 #endif
-    {
+
+#ifdef WITH_OUTB
+    if (Port) {
 	data = inb(Port + 1);
     }
+#endif
 
     /* clear unused bits */
     data &= mask;
@@ -426,13 +441,16 @@
 	frob.mask = mask;
 	frob.val = val;
 	ioctl(PPfd, PPFCONTROL, &frob);
-    } else
+    }
 #endif
-    {
+
+#ifdef WITH_OUTB
+    if (Port) {
 	/* code stolen from linux/parport_pc.h */
 	ctr = (ctr & ~mask) ^ val;
 	outb(ctr, Port + 2);
     }
+#endif
 }
 
 
@@ -469,9 +487,11 @@
 	frob.val = value2;
 	ioctl(PPfd, PPFCONTROL, &frob);
 
-    } else
+    }
 #endif
-    {
+
+#ifdef WITH_OUTB
+    if (Port) {
 	/* rise */
 	ctr = (ctr & ~bits) ^ value1;
 	outb(ctr, Port + 2);
@@ -483,6 +503,7 @@
 	ctr = (ctr & ~bits) ^ value2;
 	outb(ctr, Port + 2);
     }
+#endif
 }
 
 
@@ -491,41 +512,51 @@
 #ifdef WITH_PPDEV
     if (PPdev) {
 	ioctl(PPfd, PPWDATA, &data);
-    } else
+    }
 #endif
-    {
+
+#ifdef WITH_OUTB
+    if (Port) {
 	outb(data, Port);
     }
+#endif
 }
 
 unsigned char drv_generic_parport_read(void)
 {
-    unsigned char data;
+    unsigned char data = 0;
 
 #ifdef WITH_PPDEV
     if (PPdev) {
 	ioctl(PPfd, PPRDATA, &data);
-    } else
+    }
 #endif
-    {
+
+#ifdef WITH_OUTB
+    if (Port) {
 	data = inb(Port);
     }
+#endif
+
     return data;
 }
 
 
 void drv_generic_parport_debug(void)
 {
-    unsigned char control;
+    unsigned char control = 0;
 
 #ifdef WITH_PPDEV
     if (PPdev) {
 	ioctl(PPfd, PPRCONTROL, &control);
-    } else
+    }
 #endif
-    {
+
+#ifdef WITH_OUTB
+    if (Port) {
 	control = ctr;
     }
+#endif
 
     debug("%cSTROBE %cAUTOFD %cINIT %cSLCTIN",
 	  control & PARPORT_CONTROL_STROBE ? '-' : '+',
 
=== modified file 'drv_generic_text.h'
--- drv_generic_text.h	2011-04-27 17:28:49 +0000
+++ drv_generic_text.h	2011-12-27 00:36:23 +0000
@@ -1,4 +1,4 @@
-/* $Id: drv_generic_text.h 840 2007-09-09 12:17:42Z michael $
+/* $Id: drv_generic_text.h 1164 2011-12-22 10:48:01Z mjona $
  * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/drv_generic_text.h $
  *
  * generic driver helper for text-based displays
@@ -31,6 +31,7 @@
 
 #include "drv_generic.h"
 #include "widget.h"
+#include "widget_bar.h"
 
 extern int CHARS, CHAR0;	/* number of user-defineable characters, ASCII of first char */
 extern int ICONS;		/* number of user-defineable characters reserved for icons */
 
=== modified file 'lcd4linux_i2c.h'
--- lcd4linux_i2c.h	2011-04-27 17:28:49 +0000
+++ lcd4linux_i2c.h	2011-12-27 00:36:23 +0000
@@ -1,4 +1,4 @@
-/* $Id: lcd4linux_i2c.h 728 2007-01-14 11:14:38Z michael $
+/* $Id: lcd4linux_i2c.h 1164 2011-12-22 10:48:01Z mjona $
  * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/lcd4linux_i2c.h $
  *
  * user space i2c sturctures and defines, taken from the official kernel i2c 
@@ -459,6 +459,7 @@
 
 #define  I2C_RDRW_IOCTL_MAX_MSGS        42
 
+#include <stdlib.h>
 #include <sys/ioctl.h>
 
 static inline __s32 i2c_smbus_access(int file, char read_write, __u8 command, int size, union i2c_smbus_data *data)
 
=== modified file 'plugin_huawei.c'
--- plugin_huawei.c	2011-08-26 07:24:25 +0000
+++ plugin_huawei.c	2011-12-27 00:36:23 +0000
@@ -563,7 +563,7 @@
 
 	if (strncmp(buf, "OK", 2) == 0) {
 	    configured = 1;
-	    info("%s: Modem user inerface succesfully initialized to: \'%s\'", name, INIT_STRING);
+	    info("%s: Modem user inerface successfully initialized to: \'%s\'", name, INIT_STRING);
 	} else {
 	    configured = 0;
 	    error("%s: ERROR: Invalid or empty response: \'%s\' received for: \'%s\'", name, buf, INIT_STRING);
 
=== modified file 'plugin_pop3.c'
--- plugin_pop3.c	2011-04-27 17:28:49 +0000
+++ plugin_pop3.c	2011-12-27 00:36:23 +0000
@@ -1,4 +1,4 @@
-/* $Id: plugin_pop3.c 728 2007-01-14 11:14:38Z michael $
+/* $Id: plugin_pop3.c 1159 2011-08-31 22:00:29Z jmccrohan $
  * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/plugin_pop3.c $
  *
  * Plugin to check POP3 mail accounts
@@ -299,7 +299,7 @@
     n = getConfig();
     /* by now, head should point to a list of all our accounts */
     if (head) {
-	info("[POP3] %d POP3 accounts have been succesfully defined", n);
+	info("[POP3] %d POP3 accounts have been successfully defined", n);
 	configured = 1;
     } else {
 	configured = -1;
 
=== modified file 'plugins.m4'
--- plugins.m4	2011-08-26 07:26:25 +0000
+++ plugins.m4	2011-12-27 00:36:23 +0000
@@ -1,4 +1,4 @@
-dnl $Id: plugins.m4 1149 2011-07-27 02:36:25Z michael $
+dnl $Id: plugins.m4 1165 2011-12-26 06:28:05Z michael $
 dnl $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/plugins.m4 $
 
 
@@ -101,6 +101,47 @@
          PLUGIN_WIRELESS="yes"
          PLUGIN_XMMS="yes"   
          ;;
+      none)
+         PLUGIN_APM="no"
+       	 PLUGIN_ASTERISK="no"
+	 PLUGIN_BUTTON_EXEC="no"
+         PLUGIN_CPUINFO="no"
+         PLUGIN_DBUS="no"
+         PLUGIN_DISKSTATS="no"
+         PLUGIN_DVB="no"
+         PLUGIN_EXEC="no"
+         PLUGIN_EVENT="no"
+         PLUGIN_FIFO="no"
+         PLUGIN_FILE="no"
+         PLUGIN_GPS="no"
+         PLUGIN_HDDTEMP="no"
+         PLUGIN_HUAWEI="no"
+         PLUGIN_I2C_SENSORS="no"
+         PLUGIN_ICONV="no"
+         PLUGIN_IMON="no"
+         PLUGIN_ISDN="no"
+         PLUGIN_KVV="no"
+         PLUGIN_LOADAVG="no"
+         PLUGIN_MEMINFO="no"
+         PLUGIN_MPD="no"
+	 PLUGIN_MPRIS_DBUS="no"
+         PLUGIN_MYSQL="no"
+         PLUGIN_NETDEV="no"
+         PLUGIN_NETINFO="no"
+         PLUGIN_POP3="no"
+         PLUGIN_PPP="no"
+         PLUGIN_PROC_STAT="no"
+         PLUGIN_PYTHON="no"
+         PLUGIN_QNAPLOG="no"
+         PLUGIN_SAMPLE="no"
+         PLUGIN_SETI="no"
+         PLUGIN_STATFS="no"
+         PLUGIN_UNAME="no"
+         PLUGIN_UPTIME="no"
+         PLUGIN_W1RETAP="no"    	 
+         PLUGIN_WIRELESS="no"
+         PLUGIN_XMMS="no"   
+         ;;
       apm)
          PLUGIN_APM=$val
          ;;
@@ -583,9 +624,5 @@
    AC_DEFINE(PLUGIN_XMMS,1,[xmms plugin])
 fi
 
-if test "$PLUGINS" = ""; then
-   AC_MSG_ERROR([You should include at least one plugin...])
-fi
-   
 AC_SUBST(PLUGINS)
 AC_SUBST(PLUGINLIBS)
 
=== modified file 'svn_version.h'
--- svn_version.h	2011-04-27 17:28:49 +0000
+++ svn_version.h	2011-12-27 00:36:23 +0000
@@ -1,1 +1,1 @@
-#define SVN_VERSION "1092"
+#define SVN_VERSION "1158"
 
=== modified file 'timer.h'
--- timer.h	2011-04-27 17:28:49 +0000
+++ timer.h	2011-12-27 00:36:23 +0000
@@ -1,4 +1,4 @@
-/* $Id: timer.h 1136 2010-11-28 16:07:16Z mzuther $
+/* $Id: timer.h 1164 2011-12-22 10:48:01Z mjona $
  * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/timer.h $
  *
  * generic timer handling
@@ -28,6 +28,7 @@
 #ifndef _TIMER_H_
 #define _TIMER_H_
 
+#include <time.h>
 
 int timer_add(void (*callback) (void *data), void *data, const int interval, const int one_shot);
 
 
=== modified file 'widget_bar.h'
--- widget_bar.h	2011-04-27 17:28:49 +0000
+++ widget_bar.h	2011-12-27 00:36:23 +0000
@@ -1,4 +1,4 @@
-/* $Id: widget_bar.h 840 2007-09-09 12:17:42Z michael $
+/* $Id: widget_bar.h 1164 2011-12-22 10:48:01Z mjona $
  * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/widget_bar.h $
  *
  * bar widget handling
@@ -29,6 +29,8 @@
 #define _WIDGET_BAR_H_
 
 #include "property.h"
+#include "widget.h"
+#include "rgb.h"
 
 typedef enum { DIR_EAST = 1, DIR_WEST = 2, DIR_NORTH = 4, DIR_SOUTH = 8 } DIRECTION;
 typedef enum { STYLE_HOLLOW = 1, STYLE_FIRST = 2, STYLE_LAST = 4 } STYLE;
 
=== modified file 'widget_gpo.h'
--- widget_gpo.h	2011-04-27 17:28:49 +0000
+++ widget_gpo.h	2011-12-27 00:36:23 +0000
@@ -1,4 +1,4 @@
-/* $Id: widget_gpo.h 840 2007-09-09 12:17:42Z michael $
+/* $Id: widget_gpo.h 1164 2011-12-22 10:48:01Z mjona $
  * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/widget_gpo.h $
  *
  * GPO widget handling
@@ -29,6 +29,7 @@
 #define _WIDGET_GPO_H_
 
 #include "property.h"
+#include "widget.h"
 
 typedef struct WIDGET_GPO {
     PROPERTY expression;	/* main GPO expression */
 
=== modified file 'widget_icon.h'
--- widget_icon.h	2011-04-27 17:28:49 +0000
+++ widget_icon.h	2011-12-27 00:36:23 +0000
@@ -1,4 +1,4 @@
-/* $Id: widget_icon.h 1035 2009-05-19 10:42:01Z michael $
+/* $Id: widget_icon.h 1164 2011-12-22 10:48:01Z mjona $
  * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/widget_icon.h $
  *
  * icon widget handling
@@ -29,6 +29,7 @@
 #define _WIDGET_ICON_H_
 
 #include "property.h"
+#include "widget.h"
 
 typedef struct WIDGET_ICON {
     PROPERTY speed;		/* update interval (msec) */
 
=== modified file 'widget_image.h'
--- widget_image.h	2011-04-27 17:28:49 +0000
+++ widget_image.h	2011-12-27 00:36:23 +0000
@@ -1,4 +1,4 @@
-/* $Id: widget_image.h 840 2007-09-09 12:17:42Z michael $
+/* $Id: widget_image.h 1164 2011-12-22 10:48:01Z mjona $
  * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/widget_image.h $
  *
  * image widget handling
@@ -29,6 +29,7 @@
 #define _WIDGET_IMAGE_H_
 
 #include "property.h"
+#include "widget.h"
 #include "rgb.h"
 
 typedef struct WIDGET_IMAGE {
 
=== modified file 'widget_keypad.h'
--- widget_keypad.h	2011-04-27 17:28:49 +0000
+++ widget_keypad.h	2011-12-27 00:36:23 +0000
@@ -1,4 +1,4 @@
-/* $Id: widget_keypad.h 748 2007-01-20 05:00:06Z michael $
+/* $Id: widget_keypad.h 1164 2011-12-22 10:48:01Z mjona $
  * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/widget_keypad.h $
  *
  * keypad widget handling
@@ -29,6 +29,7 @@
 #define _WIDGET_KEYPAD_H_
 
 #include "property.h"
+#include "widget.h"
 
 typedef enum {
     WIDGET_KEY_UP = 1,
 
=== modified file 'widget_text.h'
--- widget_text.h	2011-04-27 17:28:49 +0000
+++ widget_text.h	2011-12-27 00:36:23 +0000
@@ -1,4 +1,4 @@
-/* $Id: widget_text.h 1083 2010-01-18 13:12:25Z michael $
+/* $Id: widget_text.h 1164 2011-12-22 10:48:01Z mjona $
  * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/widget_text.h $
  *
  * simple text widget handling
@@ -29,6 +29,7 @@
 #define _WIDGET_TEXT_H_
 
 #include "property.h"
+#include "widget.h"
 
 typedef enum { ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT, ALIGN_MARQUEE, ALIGN_AUTOMATIC, ALIGN_PINGPONG_LEFT,
     ALIGN_PINGPONG_CENTER, ALIGN_PINGPONG_RIGHT
 
=== modified file 'widget_timer.h'
--- widget_timer.h	2011-04-27 17:28:49 +0000
+++ widget_timer.h	2011-12-27 00:36:23 +0000
@@ -1,4 +1,4 @@
-/* $Id: widget_timer.h 840 2007-09-09 12:17:42Z michael $
+/* $Id: widget_timer.h 1164 2011-12-22 10:48:01Z mjona $
  * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/widget_timer.h $
  *
  * timer widget handling
@@ -29,6 +29,7 @@
 #define _WIDGET_TIMER_H_
 
 #include "property.h"
+#include "widget.h"
 
 typedef struct WIDGET_TIMER {
     PROPERTY expression;	/* main timer expression */