From eb443d5b254293f18479b3e84043ebe3958ad545 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 28 Mar 2010 19:58:09 +0200
Subject: update to latest upstream to fix some compile problems

---
 package/gpsd/Makefile                          |    14 +-
 package/gpsd/patches/autotool.patch            | 56056 -----------------------
 package/gpsd/patches/patch-contrib_binlog_c    |    11 -
 package/gpsd/patches/patch-contrib_motosend_c  |    29 -
 package/gpsd/patches/patch-driver_garmin_txt_c |    20 -
 package/gpsd/patches/patch-driver_sirf_c       |    11 -
 package/gpsd/patches/patch-gpspipe_c           |    11 -
 package/gpsd/patches/patch-hex_c               |    11 -
 package/gpsd/patches/patch-sirfflash_c         |    11 -
 9 files changed, 9 insertions(+), 56165 deletions(-)
 delete mode 100644 package/gpsd/patches/autotool.patch
 delete mode 100644 package/gpsd/patches/patch-contrib_binlog_c
 delete mode 100644 package/gpsd/patches/patch-contrib_motosend_c
 delete mode 100644 package/gpsd/patches/patch-driver_garmin_txt_c
 delete mode 100644 package/gpsd/patches/patch-driver_sirf_c
 delete mode 100644 package/gpsd/patches/patch-gpspipe_c
 delete mode 100644 package/gpsd/patches/patch-hex_c
 delete mode 100644 package/gpsd/patches/patch-sirfflash_c

(limited to 'package/gpsd')

diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index f82cc9f2c..915c165b2 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -4,15 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gpsd
-PKG_VERSION:=		2.39
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		3db437196a6840c252fca99b6c19d4d0
+PKG_VERSION:=		2.92
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		50b60d9f6dd51e001f4dfbaeb825c988
 PKG_DESCR:=		An interface daemon for GPS receivers
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpthread
 PKG_BUILDDEP+=		ncurses
 PKG_CXX:=		GPSD
 PKG_SITES:=		http://download.berlios.de/gpsd/
+PKG_URL:=		http://gpsd.berlios.de/
 
 PKG_DESCR_1:=		GPS client utilities
 
@@ -23,18 +24,21 @@ $(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEAS
 
 CONFIGURE_ENV+=		EGREP="grep -E" \
 			CPP="$(TARGET_CC) -E" \
+			PYTHON="none" \
 			ac_cv_func_strlcpy=no \
 			ac_cv_func_strlcat=no \
 			ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--without-x \
 			--disable-dbus
 
+TCFLAGS+=		-fPIC
+
 ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y)
 TCXXFLAGS+=		-fno-builtin -fno-rtti -nostdinc++ \
 			-I${STAGING_DIR}/usr/include/uClibc++
-TLDFLAGS+=		-luClibc++ -lc -lm -nodefaultlibs
+TLDFLAGS+=		-luClibc++ -lc -lm -pthread -nodefaultlibs
 else
-TLDFLAGS+=		-shared
+TLDFLAGS+=		-shared -pthread
 endif
 
 post-extract:
diff --git a/package/gpsd/patches/autotool.patch b/package/gpsd/patches/autotool.patch
deleted file mode 100644
index 1e64bc483..000000000
--- a/package/gpsd/patches/autotool.patch
+++ /dev/null
@@ -1,56056 +0,0 @@
-diff -Nur gpsd-2.39.orig/aclocal.m4 gpsd-2.39/aclocal.m4
---- gpsd-2.39.orig/aclocal.m4	2009-03-18 22:10:27.000000000 +0100
-+++ gpsd-2.39/aclocal.m4	2010-02-18 21:41:59.068861441 +0100
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
- # 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.
-@@ -13,8 +13,8 @@
- 
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(AC_AUTOCONF_VERSION, [2.61],,
--[m4_warning([this file was generated for autoconf 2.61.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
- You have another version of autoconf.  It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -395,12 +395,12 @@
- # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
- # ---------------------------------------------------
- m4_define([lt_decl_varnames_tagged],
--[_$0(m4_quote(m4_default([$1], [[, ]])),
--     m4_quote(m4_if([$2], [],
--		     m4_quote(lt_decl_tag_varnames),
--		  m4_quote(m4_shift($@)))),
--     m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
--m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
-+[m4_assert([$# <= 2])dnl
-+_$0(m4_quote(m4_default([$1], [[, ]])),
-+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-+m4_define([_lt_decl_varnames_tagged],
-+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
- 
- 
- # lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-@@ -960,10 +960,10 @@
-       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-     darwin1.*)
-       _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
--    darwin*) # darwin 5.x on 
-+    darwin*) # darwin 5.x on
-       # if running on 10.5 or later, the deployment target defaults
-       # to the OS version, if on x86, and 10.4, the deployment
--      # target defaults to 10.4. Don't you love it? 
-+      # target defaults to 10.4. Don't you love it?
-       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-@@ -1005,7 +1005,11 @@
-   _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-   _LT_TAGVAR(link_all_deplibs, $1)=yes
-   _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
--  if test "$GCC" = "yes"; then
-+  case $cc_basename in
-+     ifort*) _lt_dar_can_shared=yes ;;
-+     *) _lt_dar_can_shared=$GCC ;;
-+  esac
-+  if test "$_lt_dar_can_shared" = "yes"; then
-     output_verbose_link_cmd=echo
-     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-@@ -1527,7 +1531,7 @@
-     lt_cv_sys_max_cmd_len=-1;
-     ;;
- 
--  cygwin* | mingw*)
-+  cygwin* | mingw* | cegcc*)
-     # On Win9x/ME, this test blows up -- it succeeds, but takes
-     # about 5 minutes as the teststring grows exponentially.
-     # Worse, since 9x/ME are not pre-emptively multitasking,
-@@ -1695,10 +1699,6 @@
- #  endif
- #endif
- 
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
--
- void fnord() { int i=42;}
- int main ()
- {
-@@ -1714,7 +1714,7 @@
-   else
-     puts (dlerror ());
- 
--    exit (status);
-+  return status;
- }]
- _LT_EOF
-   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-@@ -1753,7 +1753,7 @@
-     lt_cv_dlopen_self=yes
-     ;;
- 
--  mingw* | pw32*)
-+  mingw* | pw32* | cegcc*)
-     lt_cv_dlopen="LoadLibrary"
-     lt_cv_dlopen_libs=
-     ;;
-@@ -2050,6 +2050,7 @@
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- m4_require([_LT_DECL_EGREP])dnl
- m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_OBJDUMP])dnl
- m4_require([_LT_DECL_SED])dnl
- AC_MSG_CHECKING([dynamic linker characteristics])
- m4_if([$1],
-@@ -2214,14 +2215,14 @@
-   # libtool to hard-code these into programs
-   ;;
- 
--cygwin* | mingw* | pw32*)
-+cygwin* | mingw* | pw32* | cegcc*)
-   version_type=windows
-   shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
- 
-   case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32*)
-+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-     library_names_spec='$libname.dll.a'
-     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-     postinstall_cmds='base_file=`basename \${file}`~
-@@ -2244,7 +2245,7 @@
-       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-       ;;
--    mingw*)
-+    mingw* | cegcc*)
-       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-       sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-@@ -2459,7 +2460,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -2682,7 +2683,7 @@
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
--  library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-   hardcode_into_libs=yes
-@@ -2706,7 +2707,7 @@
- if test "$GCC" = yes; then
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
-- 
-+
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-   sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- fi
-@@ -2983,6 +2984,7 @@
- #  -- PORTME fill in with the dynamic library characteristics
- m4_defun([_LT_CHECK_MAGIC_METHOD],
- [m4_require([_LT_DECL_EGREP])
-+m4_require([_LT_DECL_OBJDUMP])
- AC_CACHE_CHECK([how to recognize dependent libraries],
- lt_cv_deplibs_check_method,
- [lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -3033,6 +3035,12 @@
-   fi
-   ;;
- 
-+cegcc)
-+  # use the weaker test based on 'objdump'. See mingw*.
-+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-+  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
-+
- darwin* | rhapsody*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
-@@ -3091,7 +3099,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-@@ -3344,7 +3352,7 @@
- aix*)
-   symcode='[[BCDT]]'
-   ;;
--cygwin* | mingw* | pw32*)
-+cygwin* | mingw* | pw32* | cegcc*)
-   symcode='[[ABCDGISTW]]'
-   ;;
- hpux*)
-@@ -3590,7 +3598,7 @@
-     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-       # PIC is the default for these OSes.
-       ;;
--    mingw* | cygwin* | os2* | pw32*)
-+    mingw* | cygwin* | os2* | pw32* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       # Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -3617,10 +3625,11 @@
-       fi
-       ;;
-     hpux*)
--      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
--      # not for PA HP-UX.
-+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-+      # sets the default TLS model and affects inlining.
-       case $host_cpu in
--      hppa*64*|ia64*)
-+      hppa*64*)
- 	;;
-       *)
- 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-@@ -3711,19 +3720,26 @@
- 	    ;;
- 	esac
- 	;;
--      linux* | k*bsd*-gnu)
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
- 	case $cc_basename in
- 	  KCC*)
- 	    # KAI C++ Compiler
- 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- 	    ;;
--	  icpc* | ecpc* )
--	    # Intel C++
-+	  ecpc* )
-+	    # old Intel C++ for x86_64 which still supported -KPIC.
- 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- 	    ;;
-+	  icpc* )
-+	    # Intel C++, used to be incompatible with GCC.
-+	    # ICC 10 doesn't accept -KPIC any more.
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+	    ;;
- 	  pgCC* | pgcpp*)
- 	    # Portland Group C++ compiler
- 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -3889,7 +3905,7 @@
-       # PIC is the default for these OSes.
-       ;;
- 
--    mingw* | cygwin* | pw32* | os2*)
-+    mingw* | cygwin* | pw32* | os2* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       # Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -3905,10 +3921,11 @@
-       ;;
- 
-     hpux*)
--      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
--      # not for PA HP-UX.
-+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-+      # sets the default TLS model and affects inlining.
-       case $host_cpu in
--      hppa*64*|ia64*)
-+      hppa*64*)
- 	# +Z the default
- 	;;
-       *)
-@@ -3958,7 +3975,7 @@
-       fi
-       ;;
- 
--    mingw* | cygwin* | pw32* | os2*)
-+    mingw* | cygwin* | pw32* | os2* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       m4_if([$1], [GCJ], [],
-@@ -3987,13 +4004,27 @@
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-       ;;
- 
--    linux* | k*bsd*-gnu)
-+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-       case $cc_basename in
--      icc* | ecc* | ifort*)
-+      # old Intel for x86_64 which still supported -KPIC.
-+      ecc*)
- 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-         ;;
-+      # icc used to be incompatible with GCC.
-+      # ICC 10 doesn't accept -KPIC any more.
-+      icc* | ifort*)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+        ;;
-+      # Lahey Fortran 8.1.
-+      lf95*)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-+	;;
-       pgcc* | pgf77* | pgf90* | pgf95*)
-         # Portland Group compilers (*not* the Pentium gcc compiler,
- 	# which looks to be a dead project)
-@@ -4175,7 +4206,7 @@
-   pw32*)
-     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-   ;;
--  cygwin* | mingw*)
-+  cygwin* | mingw* | cegcc*)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   linux* | k*bsd*-gnu)
-@@ -4230,7 +4261,7 @@
-   extract_expsyms_cmds=
- 
-   case $host_os in
--  cygwin* | mingw* | pw32*)
-+  cygwin* | mingw* | pw32* | cegcc*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-     # When not using gcc, we currently assume that we are using
-     # Microsoft Visual C++.
-@@ -4245,6 +4276,9 @@
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_TAGVAR(link_all_deplibs, $1)=no
-+    ;;
-   esac
- 
-   _LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4266,6 +4300,7 @@
-     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 ...
-@@ -4317,7 +4352,7 @@
-       fi
-       ;;
- 
--    cygwin* | mingw* | pw32*)
-+    cygwin* | mingw* | pw32* | cegcc*)
-       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-       # as there is no search path for DLLs.
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-@@ -4357,7 +4392,7 @@
-       _LT_TAGVAR(archive_expsym_cmds, $1)='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)
-+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-       tmp_diet=no
-       if test "$host_os" = linux-dietlibc; then
- 	case $cc_basename in
-@@ -4383,6 +4418,9 @@
- 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
- 	ifc* | ifort*)			# Intel Fortran compiler
- 	  tmp_addflag=' -nofor_main' ;;
-+	lf95*)				# Lahey Fortran 8.1
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+	  tmp_sharedflag='--shared' ;;
- 	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
- 	  tmp_sharedflag='-qmkshrobj'
- 	  tmp_addflag= ;;
-@@ -4615,6 +4653,7 @@
- 	fi
-       fi
- 
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-       # It seems that -bexpall does not export symbols beginning with
-       # underscore (_), so it is better to generate a list of symbols to export.
-       _LT_TAGVAR(always_export_symbols, $1)=yes
-@@ -4669,7 +4708,7 @@
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-       ;;
- 
--    cygwin* | mingw* | pw32*)
-+    cygwin* | mingw* | pw32* | cegcc*)
-       # When not using gcc, we currently assume that we are using
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -4773,7 +4812,7 @@
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	ia64*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-@@ -5554,6 +5593,7 @@
-           fi
-         fi
- 
-+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-         # It seems that -bexpall does not export symbols beginning with
-         # underscore (_), so it is better to generate a list of symbols to
- 	# export.
-@@ -5612,7 +5652,7 @@
-         esac
-         ;;
- 
--      cygwin* | mingw* | pw32*)
-+      cygwin* | mingw* | pw32* | cegcc*)
-         # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-         # as there is no search path for DLLs.
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-@@ -5832,7 +5872,7 @@
-         _LT_TAGVAR(inherit_rpath, $1)=yes
-         ;;
- 
--      linux* | k*bsd*-gnu)
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-         case $cc_basename in
-           KCC*)
- 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -6993,6 +7033,18 @@
- ])
- 
- 
-+# _LT_DECL_OBJDUMP
-+# --------------
-+# If we don't have a new enough Autoconf to choose the best objdump
-+# available, choose the one first in the user's PATH.
-+m4_defun([_LT_DECL_OBJDUMP],
-+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-+AC_SUBST([OBJDUMP])
-+])
-+
-+
- # _LT_DECL_SED
- # ------------
- # Check for a fully-functional sed program, that truncates
-@@ -7453,7 +7505,7 @@
- [enable_win32_dll=yes
- 
- case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-   AC_CHECK_TOOL(AS, as, false)
-   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-@@ -7694,14 +7746,14 @@
- 
- # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
- #
--#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
--#   Written by Gary V. Vaughan, 2004
-+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+# Written by Gary V. Vaughan, 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 5 ltsugar.m4
-+# serial 6 ltsugar.m4
- 
- # This is to help aclocal find these macros, as it can't see m4_define.
- AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-@@ -7757,14 +7809,14 @@
- # Produce a SEP delimited list of all paired combinations of elements of
- # PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
- # has the form PREFIXmINFIXSUFFIXn.
-+# Needed until we can rely on m4_combine added in Autoconf 2.62.
- m4_define([lt_combine],
--[m4_if([$2], [], [],
--  [m4_if([$4], [], [],
--    [lt_join(m4_quote(m4_default([$1], [[, ]])),
--      lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2],
--		   [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]),
--			       [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl
--])
-+[m4_if(m4_eval([$# > 3]), [1],
-+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-+[[m4_foreach([_Lt_prefix], [$2],
-+	     [m4_foreach([_Lt_suffix],
-+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
- 
- 
- # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-@@ -7827,15 +7879,15 @@
- 
- # Generated from ltversion.in.
- 
--# serial 2976 ltversion.m4
-+# serial 3017 ltversion.m4
- # This file is part of GNU Libtool
- 
--m4_define([LT_PACKAGE_VERSION], [2.2.4])
--m4_define([LT_PACKAGE_REVISION], [1.2976])
-+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-+m4_define([LT_PACKAGE_REVISION], [1.3017])
- 
- AC_DEFUN([LTVERSION_VERSION],
--[macro_version='2.2.4'
--macro_revision='1.2976'
-+[macro_version='2.2.6b'
-+macro_revision='1.3017'
- _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
- _LT_DECL(, macro_revision, 0)
- ])
-@@ -7933,7 +7985,7 @@
- m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
- m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
- 
--# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -7945,10 +7997,10 @@
- # generated from the m4 files accompanying Automake X.Y.
- # (This private macro should not be called outside this file.)
- AC_DEFUN([AM_AUTOMAKE_VERSION],
--[am__api_version='1.10'
-+[am__api_version='1.11'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version.  Point them to the right macro.
--m4_if([$1], [1.10.1], [],
-+m4_if([$1], [1.11.1], [],
-       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
- 
-@@ -7962,12 +8014,12 @@
- # AM_SET_CURRENT_AUTOMAKE_VERSION
- # -------------------------------
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
--# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.10.1])dnl
-+[AM_AUTOMAKE_VERSION([1.11.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
- 
- # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
-@@ -8024,14 +8076,14 @@
- 
- # AM_CONDITIONAL                                            -*- Autoconf -*-
- 
--# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
- # Free Software Foundation, Inc.
- #
- # 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 8
-+# serial 9
- 
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -8044,6 +8096,7 @@
- AC_SUBST([$1_FALSE])dnl
- _AM_SUBST_NOTMAKE([$1_TRUE])dnl
- _AM_SUBST_NOTMAKE([$1_FALSE])dnl
-+m4_define([_AM_COND_VALUE_$1], [$2])dnl
- if $2; then
-   $1_TRUE=
-   $1_FALSE='#'
-@@ -8057,14 +8110,14 @@
- Usually this means the macro was only invoked conditionally.]])
- fi])])
- 
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
- # Free Software Foundation, Inc.
- #
- # 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 9
-+# serial 10
- 
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
-@@ -8121,6 +8174,16 @@
-   if test "$am_compiler_list" = ""; then
-      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-   fi
-+  am__universal=false
-+  m4_case([$1], [CC],
-+    [case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac],
-+    [CXX],
-+    [case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac])
-+
-   for depmode in $am_compiler_list; do
-     # Setup a source with many dependencies, because some compilers
-     # like to wrap large dependency lists on column 80 (with \), and
-@@ -8138,7 +8201,17 @@
-     done
-     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs
-+    am__obj=sub/conftest.${OBJEXT-o}
-+    am__minus_obj="-o $am__obj"
-     case $depmode in
-+    gcc)
-+      # This depmode causes a compiler race in universal mode.
-+      test "$am__universal" = false || continue
-+      ;;
-     nosideeffect)
-       # after this tag, mechanisms are not by side-effect, so they'll
-       # only be used when explicitly requested
-@@ -8148,19 +8221,23 @@
- 	break
-       fi
-       ;;
-+    msvisualcpp | msvcmsys)
-+      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # not run yet.  These depmodes are late enough in the game, and
-+      # so weak that their functioning should not be impacted.
-+      am__obj=conftest.${OBJEXT-o}
-+      am__minus_obj=
-+      ;;
-     none) break ;;
-     esac
--    # We check with `-c' and `-o' for the sake of the "dashmstdout"
--    # mode.  It turns out that the SunPro C++ compiler does not properly
--    # handle `-M -o', and we need to detect this.
-     if depmode=$depmode \
--       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       source=sub/conftest.c object=$am__obj \
-        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
--       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-          >/dev/null 2>conftest.err &&
-        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
--       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-       # icc doesn't choke on unknown options, it will just issue warnings
-       # or remarks (even with -Werror).  So we grep stderr for any message
-@@ -8217,57 +8294,68 @@
- 
- # Generate code to set up dependency tracking.              -*- Autoconf -*-
- 
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
- # Free Software Foundation, Inc.
- #
- # 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 3
-+#serial 5
- 
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[for mf in $CONFIG_FILES; do
--  # Strip MF so we end up with the name of the file.
--  mf=`echo "$mf" | sed -e 's/:.*$//'`
--  # Check whether this is an Automake generated Makefile or not.
--  # We used to match only the files named `Makefile.in', but
--  # some people rename them; so instead we look at the file content.
--  # Grep'ing the first line is not enough: some people post-process
--  # each Makefile.in and add a new line on top of each file to say so.
--  # Grep'ing the whole file is not good either: AIX grep has a line
--  # limit of 2048, but all sed's we know have understand at least 4000.
--  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
--    dirpart=`AS_DIRNAME("$mf")`
--  else
--    continue
--  fi
--  # Extract the definition of DEPDIR, am__include, and am__quote
--  # from the Makefile without running `make'.
--  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
--  test -z "$DEPDIR" && continue
--  am__include=`sed -n 's/^am__include = //p' < "$mf"`
--  test -z "am__include" && continue
--  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
--  # When using ansi2knr, U may be empty or an underscore; expand it
--  U=`sed -n 's/^U = //p' < "$mf"`
--  # Find all dependency output files, they are included files with
--  # $(DEPDIR) in their names.  We invoke sed twice because it is the
--  # simplest approach to changing $(DEPDIR) to its actual value in the
--  # expansion.
--  for file in `sed -n "
--    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
--       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
--    # Make sure the directory exists.
--    test -f "$dirpart/$file" && continue
--    fdir=`AS_DIRNAME(["$file"])`
--    AS_MKDIR_P([$dirpart/$fdir])
--    # echo "creating $dirpart/$file"
--    echo '# dummy' > "$dirpart/$file"
-+[{
-+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-+  # are listed without --file.  Let's play safe and only enable the eval
-+  # if we detect the quoting.
-+  case $CONFIG_FILES in
-+  *\'*) eval set x "$CONFIG_FILES" ;;
-+  *)   set x $CONFIG_FILES ;;
-+  esac
-+  shift
-+  for mf
-+  do
-+    # Strip MF so we end up with the name of the file.
-+    mf=`echo "$mf" | sed -e 's/:.*$//'`
-+    # Check whether this is an Automake generated Makefile or not.
-+    # We used to match only the files named `Makefile.in', but
-+    # some people rename them; so instead we look at the file content.
-+    # Grep'ing the first line is not enough: some people post-process
-+    # each Makefile.in and add a new line on top of each file to say so.
-+    # Grep'ing the whole file is not good either: AIX grep has a line
-+    # limit of 2048, but all sed's we know have understand at least 4000.
-+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+      dirpart=`AS_DIRNAME("$mf")`
-+    else
-+      continue
-+    fi
-+    # Extract the definition of DEPDIR, am__include, and am__quote
-+    # from the Makefile without running `make'.
-+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+    test -z "$DEPDIR" && continue
-+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+    test -z "am__include" && continue
-+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+    # When using ansi2knr, U may be empty or an underscore; expand it
-+    U=`sed -n 's/^U = //p' < "$mf"`
-+    # Find all dependency output files, they are included files with
-+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+    # simplest approach to changing $(DEPDIR) to its actual value in the
-+    # expansion.
-+    for file in `sed -n "
-+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+      # Make sure the directory exists.
-+      test -f "$dirpart/$file" && continue
-+      fdir=`AS_DIRNAME(["$file"])`
-+      AS_MKDIR_P([$dirpart/$fdir])
-+      # echo "creating $dirpart/$file"
-+      echo '# dummy' > "$dirpart/$file"
-+    done
-   done
--done
-+}
- ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
- 
- 
-@@ -8299,13 +8387,13 @@
- # Do all the work for Automake.                             -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2008 Free Software Foundation, Inc.
-+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
- #
- # 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 13
-+# serial 16
- 
- # This macro actually does too much.  Some checks are only needed if
- # your package does certain things.  But this isn't really a big deal.
-@@ -8322,7 +8410,7 @@
- # arguments mandatory, and then we can depend on a new Autoconf
- # release and drop the old call support.
- AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.60])dnl
-+[AC_PREREQ([2.62])dnl
- dnl Autoconf wants to disallow AM_ names.  We explicitly allow
- dnl the ones we care about.
- m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-@@ -8373,8 +8461,8 @@
- AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
- AM_MISSING_PROG(AUTOHEADER, autoheader)
- AM_MISSING_PROG(MAKEINFO, makeinfo)
--AM_PROG_INSTALL_SH
--AM_PROG_INSTALL_STRIP
-+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
- AC_REQUIRE([AM_PROG_MKDIR_P])dnl
- # We need awk for the "check" target.  The system "awk" is bad on
- # some platforms.
-@@ -8382,23 +8470,36 @@
- AC_REQUIRE([AC_PROG_MAKE_SET])dnl
- AC_REQUIRE([AM_SET_LEADING_DOT])dnl
- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
--              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
--	      		     [_AM_PROG_TAR([v7])])])
-+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+			     [_AM_PROG_TAR([v7])])])
- _AM_IF_OPTION([no-dependencies],,
- [AC_PROVIDE_IFELSE([AC_PROG_CC],
--                  [_AM_DEPENDENCIES(CC)],
--                  [define([AC_PROG_CC],
--                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+		  [_AM_DEPENDENCIES(CC)],
-+		  [define([AC_PROG_CC],
-+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
- AC_PROVIDE_IFELSE([AC_PROG_CXX],
--                  [_AM_DEPENDENCIES(CXX)],
--                  [define([AC_PROG_CXX],
--                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+		  [_AM_DEPENDENCIES(CXX)],
-+		  [define([AC_PROG_CXX],
-+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
- AC_PROVIDE_IFELSE([AC_PROG_OBJC],
--                  [_AM_DEPENDENCIES(OBJC)],
--                  [define([AC_PROG_OBJC],
--                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
--])
--])
-+		  [_AM_DEPENDENCIES(OBJC)],
-+		  [define([AC_PROG_OBJC],
-+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-+])
-+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-+AC_CONFIG_COMMANDS_PRE(dnl
-+[m4_provide_if([_AM_COMPILER_EXEEXT],
-+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-+])
-+
-+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-+dnl mangled by Autoconf and run in a shell conditional statement.
-+m4_define([_AC_COMPILER_EXEEXT],
-+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
- 
- 
- # When config.status generates a header, we must update the stamp-h file.
-@@ -8422,7 +8523,7 @@
- done
- echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
- 
--# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -8433,7 +8534,14 @@
- # Define $install_sh.
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-+if test x"${install_sh}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-+  *)
-+    install_sh="\${SHELL} $am_aux_dir/install-sh"
-+  esac
-+fi
- AC_SUBST(install_sh)])
- 
- # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-@@ -8459,13 +8567,13 @@
- 
- # Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
--# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
- #
- # 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 3
-+# serial 4
- 
- # AM_MAKE_INCLUDE()
- # -----------------
-@@ -8474,7 +8582,7 @@
- [am_make=${MAKE-make}
- cat > confinc << 'END'
- am__doit:
--	@echo done
-+	@echo this is the am__doit target
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
-@@ -8484,24 +8592,24 @@
- _am_result=none
- # First try GNU make style include.
- echo "include confinc" > confmf
--# We grep out `Entering directory' and `Leaving directory'
--# messages which can occur if `w' ends up in MAKEFLAGS.
--# In particular we don't look at `^make:' because GNU make might
--# be invoked under some other name (usually "gmake"), in which
--# case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
--   am__include=include
--   am__quote=
--   _am_result=GNU
--fi
-+# Ignore all kinds of additional output from `make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+  am__include=include
-+  am__quote=
-+  _am_result=GNU
-+  ;;
-+esac
- # Now try BSD make style include.
- if test "$am__include" = "#"; then
-    echo '.include "confinc"' > confmf
--   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
--      am__include=.include
--      am__quote="\""
--      _am_result=BSD
--   fi
-+   case `$am_make -s -f confmf 2> /dev/null` in #(
-+   *the\ am__doit\ target*)
-+     am__include=.include
-+     am__quote="\""
-+     _am_result=BSD
-+     ;;
-+   esac
- fi
- AC_SUBST([am__include])
- AC_SUBST([am__quote])
-@@ -8511,14 +8619,14 @@
- 
- # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
- 
--# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
- # Free Software Foundation, Inc.
- #
- # 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 5
-+# serial 6
- 
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -8535,7 +8643,14 @@
- AC_DEFUN([AM_MISSING_HAS_RUN],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- AC_REQUIRE_AUX_FILE([missing])dnl
--test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+if test x"${MISSING+set}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-+  *)
-+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-+  esac
-+fi
- # Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
-   am_missing_run="$MISSING --run "
-@@ -8573,13 +8688,13 @@
- 
- # Helper functions for option handling.                     -*- Autoconf -*-
- 
--# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
- #
- # 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 3
-+# serial 4
- 
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
-@@ -8596,7 +8711,7 @@
- # ----------------------------------
- # OPTIONS is a space-separated list of Automake options.
- AC_DEFUN([_AM_SET_OPTIONS],
--[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
- 
- # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
- # -------------------------------------------
-@@ -8604,180 +8719,16 @@
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
- 
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
--#
--# 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.
--
--# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
--# ---------------------------------------------------------------------------
--# Adds support for distributing Python modules and packages.  To
--# install modules, copy them to $(pythondir), using the python_PYTHON
--# automake variable.  To install a package with the same name as the
--# automake package, install to $(pkgpythondir), or use the
--# pkgpython_PYTHON automake variable.
--#
--# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
--# locations to install python extension modules (shared libraries).
--# Another macro is required to find the appropriate flags to compile
--# extension modules.
--#
--# If your package is configured with a different prefix to python,
--# users will have to add the install directory to the PYTHONPATH
--# environment variable, or create a .pth file (see the python
--# documentation for details).
--#
--# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
--# cause an error if the version of python installed on the system
--# doesn't meet the requirement.  MINIMUM-VERSION should consist of
--# numbers and dots only.
--AC_DEFUN([AM_PATH_PYTHON],
-- [
--  dnl Find a Python interpreter.  Python versions prior to 1.5 are not
--  dnl supported because the default installation locations changed from
--  dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
--  dnl in 1.5.
--  m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
--                    [python python2 python2.5 python2.4 python2.3 python2.2 dnl
--python2.1 python2.0 python1.6 python1.5])
--
--  m4_if([$1],[],[
--    dnl No version check is needed.
--    # Find any Python interpreter.
--    if test -z "$PYTHON"; then
--      AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
--    fi
--    am_display_PYTHON=python
--  ], [
--    dnl A version check is needed.
--    if test -n "$PYTHON"; then
--      # If the user set $PYTHON, use it and don't search something else.
--      AC_MSG_CHECKING([whether $PYTHON version >= $1])
--      AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
--			      [AC_MSG_RESULT(yes)],
--			      [AC_MSG_ERROR(too old)])
--      am_display_PYTHON=$PYTHON
--    else
--      # Otherwise, try each interpreter until we find one that satisfies
--      # VERSION.
--      AC_CACHE_CHECK([for a Python interpreter with version >= $1],
--	[am_cv_pathless_PYTHON],[
--	for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
--	  test "$am_cv_pathless_PYTHON" = none && break
--	  AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
--	done])
--      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
--      if test "$am_cv_pathless_PYTHON" = none; then
--	PYTHON=:
--      else
--        AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
--      fi
--      am_display_PYTHON=$am_cv_pathless_PYTHON
--    fi
--  ])
--
--  if test "$PYTHON" = :; then
--  dnl Run any user-specified action, or abort.
--    m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
--  else
--
--  dnl Query Python for its version number.  Getting [:3] seems to be
--  dnl the best way to do this; it's what "site.py" does in the standard
--  dnl library.
--
--  AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
--    [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])
--  AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
--
--  dnl Use the values of $prefix and $exec_prefix for the corresponding
--  dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX.  These are made
--  dnl distinct variables so they can be overridden if need be.  However,
--  dnl general consensus is that you shouldn't need this ability.
--
--  AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
--  AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
--
--  dnl At times (like when building shared libraries) you may want
--  dnl to know which OS platform Python thinks this is.
--
--  AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
--    [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])
--  AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
--
--
--  dnl Set up 4 directories:
--
--  dnl pythondir -- where to install python scripts.  This is the
--  dnl   site-packages directory, not the python standard library
--  dnl   directory like in previous automake betas.  This behavior
--  dnl   is more consistent with lispdir.m4 for example.
--  dnl Query distutils for this directory.  distutils does not exist in
--  dnl Python 1.5, so we fall back to the hardcoded directory if it
--  dnl doesn't work.
--  AC_CACHE_CHECK([for $am_display_PYTHON script directory],
--    [am_cv_python_pythondir],
--    [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
--     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
--  AC_SUBST([pythondir], [$am_cv_python_pythondir])
--
--  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
--  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
--  dnl   more consistent with the rest of automake.
--
--  AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
--
--  dnl pyexecdir -- directory for installing python extension modules
--  dnl   (shared libraries)
--  dnl Query distutils for this directory.  distutils does not exist in
--  dnl Python 1.5, so we fall back to the hardcoded directory if it
--  dnl doesn't work.
--  AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
--    [am_cv_python_pyexecdir],
--    [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
--     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
--  AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
--
--  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
--
--  AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
--
--  dnl Run any user-specified action.
--  $2
--  fi
--
--])
--
--
--# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
--# ---------------------------------------------------------------------------
--# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
--# Run ACTION-IF-FALSE otherwise.
--# This test uses sys.hexversion instead of the string equivalent (first
--# word of sys.version), in order to cope with versions such as 2.2c1.
--# hexversion has been introduced in Python 1.5.2; it's probably not
--# worth to support older versions (1.5.1 was released on October 31, 1998).
--AC_DEFUN([AM_PYTHON_CHECK_VERSION],
-- [prog="import sys, string
--# split strings by '.' and convert to numeric.  Append some zeros
--# because we need at least 4 digits for the hex conversion.
--minver = map(int, string.split('$2', '.')) + [[0, 0, 0]]
--minverhex = 0
--for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]]
--sys.exit(sys.hexversion < minverhex)"
--  AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
--
- # Check to make sure that the build environment is sane.    -*- Autoconf -*-
- 
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
- # Free Software Foundation, Inc.
- #
- # 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
-+# serial 5
- 
- # AM_SANITY_CHECK
- # ---------------
-@@ -8786,16 +8737,29 @@
- # Just in case
- sleep 1
- echo timestamp > conftest.file
-+# Reject unsafe characters in $srcdir or the absolute working directory
-+# name.  Accept space and tab only in the latter.
-+am_lf='
-+'
-+case `pwd` in
-+  *[[\\\"\#\$\&\'\`$am_lf]]*)
-+    AC_MSG_ERROR([unsafe absolute working directory name]);;
-+esac
-+case $srcdir in
-+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-+esac
-+
- # Do `set' in a subshell so we don't clobber the current shell's
- # arguments.  Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
--   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-    if test "$[*]" = "X"; then
-       # -L didn't work.
--      set X `ls -t $srcdir/configure conftest.file`
-+      set X `ls -t "$srcdir/configure" conftest.file`
-    fi
-    rm -f conftest.file
-    if test "$[*]" != "X $srcdir/configure conftest.file" \
-@@ -8848,18 +8812,25 @@
- INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
- AC_SUBST([INSTALL_STRIP_PROGRAM])])
- 
--# Copyright (C) 2006  Free Software Foundation, Inc.
-+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
- #
- # 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 2
-+
- # _AM_SUBST_NOTMAKE(VARIABLE)
- # ---------------------------
- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
- # This macro is traced by Automake.
- AC_DEFUN([_AM_SUBST_NOTMAKE])
- 
-+# AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Public sister of _AM_SUBST_NOTMAKE.
-+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-+
- # Check how to create a tarball.                            -*- Autoconf -*-
- 
- # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-diff -Nur gpsd-2.39.orig/cgps.1 gpsd-2.39/cgps.1
---- gpsd-2.39.orig/cgps.1	2009-03-18 17:50:54.000000000 +0100
-+++ gpsd-2.39/cgps.1	1970-01-01 01:00:00.000000000 +0100
-@@ -1 +0,0 @@
--.so man1/gps.1
-diff -Nur gpsd-2.39.orig/cgpxlogger.1 gpsd-2.39/cgpxlogger.1
---- gpsd-2.39.orig/cgpxlogger.1	2009-03-18 17:50:54.000000000 +0100
-+++ gpsd-2.39/cgpxlogger.1	1970-01-01 01:00:00.000000000 +0100
-@@ -1 +0,0 @@
--.so man1/gps.1
-diff -Nur gpsd-2.39.orig/config.log gpsd-2.39/config.log
---- gpsd-2.39.orig/config.log	1970-01-01 01:00:00.000000000 +0100
-+++ gpsd-2.39/config.log	2010-02-18 21:44:19.552855777 +0100
-@@ -0,0 +1,2768 @@
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+
-+It was created by configure, which was
-+generated by GNU Autoconf 2.65.  Invocation command line was
-+
-+  $ ./configure 
-+
-+## --------- ##
-+## Platform. ##
-+## --------- ##
-+
-+hostname = hydrogenium
-+uname -m = i686
-+uname -r = 2.6.32-13-generic
-+uname -s = Linux
-+uname -v = #18-Ubuntu SMP Wed Feb 10 21:24:20 UTC 2010
-+
-+/usr/bin/uname -p = unknown
-+/bin/uname -X     = unknown
-+
-+/bin/arch              = unknown
-+/usr/bin/arch -k       = unknown
-+/usr/convex/getsysinfo = unknown
-+/usr/bin/hostinfo      = unknown
-+/bin/machine           = unknown
-+/usr/bin/oslevel       = unknown
-+/bin/universe          = unknown
-+
-+PATH: /home/wbx/bin
-+PATH: /usr/local/sbin
-+PATH: /usr/local/bin
-+PATH: /usr/sbin
-+PATH: /usr/bin
-+PATH: /sbin
-+PATH: /bin
-+PATH: /usr/games
-+PATH: /home/wbx/bin
-+
-+
-+## ----------- ##
-+## Core tests. ##
-+## ----------- ##
-+
-+configure:2863: checking for a BSD-compatible install
-+configure:2931: result: /usr/bin/install -c
-+configure:2942: checking whether build environment is sane
-+configure:2992: result: yes
-+configure:3133: checking for a thread-safe mkdir -p
-+configure:3172: result: /bin/mkdir -p
-+configure:3185: checking for gawk
-+configure:3201: found /usr/bin/gawk
-+configure:3212: result: gawk
-+configure:3223: checking whether make sets $(MAKE)
-+configure:3245: result: yes
-+configure:3334: checking whether ln -s works
-+configure:3338: result: yes
-+configure:3345: checking whether make sets $(MAKE)
-+configure:3367: result: yes
-+configure:3406: checking build system type
-+configure:3420: result: i686-pc-linux-gnu
-+configure:3440: checking host system type
-+configure:3453: result: i686-pc-linux-gnu
-+configure:3485: checking for style of include used by make
-+configure:3513: result: GNU
-+configure:3583: checking for gcc
-+configure:3599: found /usr/bin/gcc
-+configure:3610: result: gcc
-+configure:3839: checking for C compiler version
-+configure:3848: gcc --version >&5
-+gcc (Ubuntu 4.4.3-2ubuntu1) 4.4.3
-+Copyright (C) 2010 Free Software Foundation, Inc.
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+
-+configure:3859: $? = 0
-+configure:3848: gcc -v >&5
-+Using built-in specs.
-+Target: i486-linux-gnu
-+Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.4.3-2ubuntu1' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --program-suffix=-4.4 --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-targets=all --disable-werror --with-arch-32=i486 --with-tune=generic --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu
-+Thread model: posix
-+gcc version 4.4.3 (Ubuntu 4.4.3-2ubuntu1) 
-+configure:3859: $? = 0
-+configure:3848: gcc -V >&5
-+gcc: '-V' option must have argument
-+configure:3859: $? = 1
-+configure:3848: gcc -qversion >&5
-+gcc: unrecognized option '-qversion'
-+gcc: no input files
-+configure:3859: $? = 1
-+configure:3879: checking whether the C compiler works
-+configure:3901: gcc    conftest.c  >&5
-+configure:3905: $? = 0
-+configure:3954: result: yes
-+configure:3957: checking for C compiler default output file name
-+configure:3959: result: a.out
-+configure:3965: checking for suffix of executables
-+configure:3972: gcc -o conftest    conftest.c  >&5
-+configure:3976: $? = 0
-+configure:3998: result: 
-+configure:4020: checking whether we are cross compiling
-+configure:4028: gcc -o conftest    conftest.c  >&5
-+configure:4032: $? = 0
-+configure:4039: ./conftest
-+configure:4043: $? = 0
-+configure:4058: result: no
-+configure:4063: checking for suffix of object files
-+configure:4085: gcc -c   conftest.c >&5
-+configure:4089: $? = 0
-+configure:4110: result: o
-+configure:4114: checking whether we are using the GNU C compiler
-+configure:4133: gcc -c   conftest.c >&5
-+configure:4133: $? = 0
-+configure:4142: result: yes
-+configure:4151: checking whether gcc accepts -g
-+configure:4171: gcc -c -g  conftest.c >&5
-+configure:4171: $? = 0
-+configure:4212: result: yes
-+configure:4229: checking for gcc option to accept ISO C89
-+configure:4293: gcc  -c -g -O2  conftest.c >&5
-+configure:4293: $? = 0
-+configure:4306: result: none needed
-+configure:4328: checking dependency style of gcc
-+configure:4438: result: gcc3
-+configure:4453: checking for a sed that does not truncate output
-+configure:4517: result: /bin/sed
-+configure:4535: checking for grep that handles long lines and -e
-+configure:4593: result: /bin/grep
-+configure:4598: checking for egrep
-+configure:4660: result: /bin/grep -E
-+configure:4665: checking for fgrep
-+configure:4727: result: /bin/grep -F
-+configure:4762: checking for ld used by gcc
-+configure:4829: result: /usr/bin/ld
-+configure:4836: checking if the linker (/usr/bin/ld) is GNU ld
-+configure:4851: result: yes
-+configure:4863: checking for BSD- or MS-compatible name lister (nm)
-+configure:4912: result: /usr/bin/nm -B
-+configure:5030: checking the name lister (/usr/bin/nm -B) interface
-+configure:5037: gcc -c -g -O2  conftest.c >&5
-+configure:5040: /usr/bin/nm -B "conftest.o"
-+configure:5043: output
-+00000000 B some_variable
-+configure:5050: result: BSD nm
-+configure:5054: checking the maximum length of command line arguments
-+configure:5174: result: 1572864
-+configure:5191: checking whether the shell understands some XSI constructs
-+configure:5201: result: yes
-+configure:5205: checking whether the shell understands "+="
-+configure:5211: result: yes
-+configure:5246: checking for /usr/bin/ld option to reload object files
-+configure:5253: result: -r
-+configure:5322: checking for objdump
-+configure:5338: found /usr/bin/objdump
-+configure:5349: result: objdump
-+configure:5381: checking how to recognize dependent libraries
-+configure:5577: result: pass_all
-+configure:5637: checking for ar
-+configure:5653: found /usr/bin/ar
-+configure:5664: result: ar
-+configure:5742: checking for strip
-+configure:5758: found /usr/bin/strip
-+configure:5769: result: strip
-+configure:5841: checking for ranlib
-+configure:5857: found /usr/bin/ranlib
-+configure:5868: result: ranlib
-+configure:5958: checking command to parse /usr/bin/nm -B output from gcc object
-+configure:6076: gcc -c -g -O2  conftest.c >&5
-+configure:6079: $? = 0
-+configure:6083: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[	 ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[	 ][	 ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm
-+configure:6086: $? = 0
-+configure:6140: gcc -o conftest -g -O2   conftest.c conftstm.o >&5
-+configure:6143: $? = 0
-+configure:6181: result: ok
-+configure:6990: checking how to run the C preprocessor
-+configure:7021: gcc -E  conftest.c
-+configure:7021: $? = 0
-+configure:7035: gcc -E  conftest.c
-+conftest.c:11:28: error: ac_nonexistent.h: No such file or directory
-+configure:7035: $? = 1
-+configure: failed program was:
-+| /* confdefs.h */
-+| #define PACKAGE_NAME ""
-+| #define PACKAGE_TARNAME ""
-+| #define PACKAGE_VERSION ""
-+| #define PACKAGE_STRING ""
-+| #define PACKAGE_BUGREPORT ""
-+| #define PACKAGE_URL ""
-+| #define PACKAGE "gpsd"
-+| #define VERSION "2.39"
-+| /* end confdefs.h.  */
-+| #include <ac_nonexistent.h>
-+configure:7060: result: gcc -E
-+configure:7080: gcc -E  conftest.c
-+configure:7080: $? = 0
-+configure:7094: gcc -E  conftest.c
-+conftest.c:11:28: error: ac_nonexistent.h: No such file or directory
-+configure:7094: $? = 1
-+configure: failed program was:
-+| /* confdefs.h */
-+| #define PACKAGE_NAME ""
-+| #define PACKAGE_TARNAME ""
-+| #define PACKAGE_VERSION ""
-+| #define PACKAGE_STRING ""
-+| #define PACKAGE_BUGREPORT ""
-+| #define PACKAGE_URL ""
-+| #define PACKAGE "gpsd"
-+| #define VERSION "2.39"
-+| /* end confdefs.h.  */
-+| #include <ac_nonexistent.h>
-+configure:7123: checking for ANSI C header files
-+configure:7143: gcc -c -g -O2  conftest.c >&5
-+configure:7143: $? = 0
-+configure:7216: gcc -o conftest -g -O2   conftest.c  >&5
-+configure:7216: $? = 0
-+configure:7216: ./conftest
-+configure:7216: $? = 0
-+configure:7227: result: yes
-+configure:7240: checking for sys/types.h
-+configure:7240: gcc -c -g -O2  conftest.c >&5
-+configure:7240: $? = 0
-+configure:7240: result: yes
-+configure:7240: checking for sys/stat.h
-+configure:7240: gcc -c -g -O2  conftest.c >&5
-+configure:7240: $? = 0
-+configure:7240: result: yes
-+configure:7240: checking for stdlib.h
-+configure:7240: gcc -c -g -O2  conftest.c >&5
-+configure:7240: $? = 0
-+configure:7240: result: yes
-+configure:7240: checking for string.h
-+configure:7240: gcc -c -g -O2  conftest.c >&5
-+configure:7240: $? = 0
-+configure:7240: result: yes
-+configure:7240: checking for memory.h
-+configure:7240: gcc -c -g -O2  conftest.c >&5
-+configure:7240: $? = 0
-+configure:7240: result: yes
-+configure:7240: checking for strings.h
-+configure:7240: gcc -c -g -O2  conftest.c >&5
-+configure:7240: $? = 0
-+configure:7240: result: yes
-+configure:7240: checking for inttypes.h
-+configure:7240: gcc -c -g -O2  conftest.c >&5
-+configure:7240: $? = 0
-+configure:7240: result: yes
-+configure:7240: checking for stdint.h
-+configure:7240: gcc -c -g -O2  conftest.c >&5
-+configure:7240: $? = 0
-+configure:7240: result: yes
-+configure:7240: checking for unistd.h
-+configure:7240: gcc -c -g -O2  conftest.c >&5
-+configure:7240: $? = 0
-+configure:7240: result: yes
-+configure:7255: checking for dlfcn.h
-+configure:7255: gcc -c -g -O2  conftest.c >&5
-+configure:7255: $? = 0
-+configure:7255: result: yes
-+configure:7439: checking for objdir
-+configure:7454: result: .libs
-+configure:7746: checking if gcc supports -fno-rtti -fno-exceptions
-+configure:7764: gcc -c -g -O2  -fno-rtti -fno-exceptions conftest.c >&5
-+cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C
-+configure:7768: $? = 0
-+configure:7781: result: no
-+configure:7801: checking for gcc option to produce PIC
-+configure:8073: result: -fPIC -DPIC
-+configure:8085: checking if gcc PIC flag -fPIC -DPIC works
-+configure:8103: gcc -c -g -O2  -fPIC -DPIC -DPIC conftest.c >&5
-+configure:8107: $? = 0
-+configure:8120: result: yes
-+configure:8144: checking if gcc static flag -static works
-+configure:8172: result: yes
-+configure:8187: checking if gcc supports -c -o file.o
-+configure:8208: gcc -c -g -O2  -o out/conftest2.o conftest.c >&5
-+configure:8212: $? = 0
-+configure:8234: result: yes
-+configure:8242: checking if gcc supports -c -o file.o
-+configure:8289: result: yes
-+configure:8322: checking whether the gcc linker (/usr/bin/ld) supports shared libraries
-+configure:9313: result: yes
-+configure:9350: checking whether -lc should be explicitly linked in
-+configure:9355: gcc -c -g -O2  conftest.c >&5
-+configure:9358: $? = 0
-+configure:9373: gcc -shared conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /bin/grep  -lc  \>/dev/null 2\>\&1
-+configure:9376: $? = 0
-+configure:9388: result: no
-+configure:9552: checking dynamic linker characteristics
-+configure:9985: gcc -o conftest -g -O2   -Wl,-rpath -Wl,/foo conftest.c  >&5
-+configure:9985: $? = 0
-+configure:10215: result: GNU/Linux ld.so
-+configure:10317: checking how to hardcode library paths into programs
-+configure:10342: result: immediate
-+configure:10862: checking whether stripping libraries is possible
-+configure:10867: result: yes
-+configure:10902: checking if libtool supports shared libraries
-+configure:10904: result: yes
-+configure:10907: checking whether to build shared libraries
-+configure:10928: result: yes
-+configure:10931: checking whether to build static libraries
-+configure:10935: result: yes
-+configure:11028: checking for g++
-+configure:11044: found /usr/bin/g++
-+configure:11055: result: g++
-+configure:11082: checking for C++ compiler version
-+configure:11091: g++ --version >&5
-+g++ (Ubuntu 4.4.3-2ubuntu1) 4.4.3
-+Copyright (C) 2010 Free Software Foundation, Inc.
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+
-+configure:11102: $? = 0
-+configure:11091: g++ -v >&5
-+Using built-in specs.
-+Target: i486-linux-gnu
-+Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.4.3-2ubuntu1' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-s