* gpsd patches: cleanup

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10450 33e552b5-05e3-0310-8538-816dae2090ed

5 files changed, 9 insertions, 1888 deletions

diff --git a/patches/gpsd-2.39/generic/fix-autotool-bug_generated_files.patch b/patches/gpsd-2.39/generic/fix-autotool-bug_generated_files.patch
deleted file mode 100644
index a0cf49771..000000000
--- a/patches/gpsd-2.39/generic/fix-autotool-bug_generated_files.patch
+++ /dev/null
@@ -1,1879 +0,0 @@
-From 19a753108139e43c50dcc4eefad68f4d5149b1b8 Mon Sep 17 00:00:00 2001
-From: Luotao Fu <l.fu@pengutronix.de>
-Date: Thu, 23 Apr 2009 15:15:21 +0200
-Subject: [PATCH] Fix autotool bug
-
-Original by Richard Hansen:
-Autoconf has a longstanding bug in AC_REQUIRE that causes out-of-order
-macro expansion problems.  This patch works around the Autoconf bug.
-
-lfu:
-This one fixes the configure script fails if run with --disable-python.
-Some macro needed by dependency tracker is errorneously expanded inside the
-python check condition, which cause that these will be failed to be set if
-python is not enabled.
-
-this patch contains generated files by autotools.
-
-Signed-off-by: FIXME
----
- Makefile.in      |   13 +-
- aclocal.m4       | 8798 ++++++++++++----------------
- autogen.sh       |    5 +-
- configure        |17097 +++++++++++++++++++++++++++++++++---------------------
- Makefile.in      |   13 
- aclocal.m4       |10260 +++++++---------
- autogen.sh       |    5 
- configure        |34833 ++++++++++++++++++++++++++++++-------------------------
- gpsd_config.h.in |    4 
- ltmain.sh        |12750 +++++++++-----------
- Makefile.in      |   26 -
- aclocal.m4       |   17 
- autogen.sh       |    5 
- configure        | 1337 ++++++++++++++++++++++---------------------------------
- gpsd_config.h.in |    3 
- 5 files changed, 574 insertions(+), 814 deletions(-)
- mode change 100755 => 100644 ltmain.sh
-
-Index: Makefile.in
-===================================================================
---- Makefile.in.orig
-+++ Makefile.in
-@@ -55,8 +55,8 @@ DIST_COMMON = README $(am__configure_dep
- 	$(srcdir)/Makefile.in $(srcdir)/gpsd_config.h.in \
- 	$(srcdir)/libgps.pc.in $(srcdir)/libgpsd.pc.in \
- 	$(top_srcdir)/configure $(top_srcdir)/packaging/gpsd.spec.in \
--	AUTHORS COPYING INSTALL NEWS TODO config.guess config.sub \
--	depcomp install-sh ltmain.sh missing py-compile
-+	AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \
-+	config.sub depcomp install-sh ltmain.sh missing py-compile
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-@@ -311,9 +311,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PYTHON = @PYTHON@
--PYTHON_CFLAGS = @PYTHON_CFLAGS@
- PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
--PYTHON_LIBS = @PYTHON_LIBS@
- PYTHON_PLATFORM = @PYTHON_PLATFORM@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
-@@ -683,15 +681,15 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
--	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
-+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
- 		&& exit 0; \
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --foreign  Makefile
-+	  $(AUTOMAKE) --gnu  Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- 	@case '$?' in \
-@@ -1516,6 +1514,7 @@ maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
- 	@echo "it deletes files that may require special tools to rebuild."
- 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-+@HAVE_PYTHON_FALSE@clean-local:
- clean: clean-am
- 
- clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
-@@ -1629,11 +1628,16 @@ gpsd.h: gpsd.h-head gpsd.h-tail gpsd_con
- 	grep ENABLE gpsd_config.h >>gpsd.h
- 	cat $(srcdir)/gpsd.h-tail >>gpsd.h
- 
--@HAVE_PYTHON_TRUE@gpspacket.so gpslib.so: gpspacket.c gpslib.c libgps.la
-+@HAVE_PYTHON_TRUE@.PHONY: build_python_ext
-+@HAVE_PYTHON_TRUE@build_python_ext: gpspacket.c gpslib.c libgps.la
- @HAVE_PYTHON_TRUE@	(pwd="`pwd`"; cd $(srcdir) && $(PYTHON) setup.py build_ext --build-lib "$$pwd" --build-temp "$$pwd/build" --include-dirs "$$pwd")
-+
-+@HAVE_PYTHON_TRUE@gpspacket.so: build_python_ext
-+@HAVE_PYTHON_TRUE@gpslib.so: build_python_ext
-+
- # Clean up after Python
--clean-local:
--	rm -rf build
-+@HAVE_PYTHON_TRUE@clean-local:
-+@HAVE_PYTHON_TRUE@	rm -rf build
- 
- @HAVE_XSLT_PROCESSOR_TRUE@.xml.1:
- @HAVE_XSLT_PROCESSOR_TRUE@	$(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $<
-Index: aclocal.m4
-===================================================================
---- aclocal.m4.orig
-+++ aclocal.m4
-@@ -8768,6 +8768,23 @@ for i in xrange(0, 4): minverhex = (minv
- sys.exit(sys.hexversion < minverhex)"
-   AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
- 
-+# Copyright (C) 2001, 2003, 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_RUN_LOG(COMMAND)
-+# -------------------
-+# Run COMMAND, save the exit status in ac_status, and log it.
-+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-+AC_DEFUN([AM_RUN_LOG],
-+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-+   ac_status=$?
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   (exit $ac_status); }])
-+
- # Check to make sure that the build environment is sane.    -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-Index: autogen.sh
-===================================================================
---- autogen.sh.orig
-+++ autogen.sh
-@@ -104,7 +104,4 @@ aclocal \
-   && ${LIBTOOLIZE} --force --copy \
-   && autoheader --force \
-   && automake --add-missing --foreign --copy  --include-deps \
--  && autoconf --force \
--  && echo Now running configure to configure gpsd \
--  && echo "./configure $@" \
--  && ./configure $@
-+  && autoconf --force
-Index: gpsd_config.h.in
-===================================================================
---- gpsd_config.h.in.orig
-+++ gpsd_config.h.in
-@@ -100,9 +100,6 @@
- /* Define to 1 if you have the <netinet/tcp.h> header file. */
- #undef HAVE_NETINET_TCP_H
- 
--/* Define to 1 if you have the <Python.h> header file. */
--#undef HAVE_PYTHON_H
--
- /* Define to 1 if you have the `round' function. */
- #undef HAVE_ROUND
- 
-Index: configure
-===================================================================
---- configure.orig
-+++ configure
-@@ -820,15 +820,6 @@ am__leading_dot
- AMTAR
- am__tar
- am__untar
--PYTHON
--PYTHON_VERSION
--PYTHON_PREFIX
--PYTHON_EXEC_PREFIX
--PYTHON_PLATFORM
--pythondir
--pkgpythondir
--pyexecdir
--pkgpyexecdir
- CC
- CFLAGS
- LDFLAGS
-@@ -848,8 +839,15 @@ am__fastdepCC_FALSE
- CPP
- GREP
- EGREP
--PYTHON_CFLAGS
--PYTHON_LIBS
-+PYTHON
-+PYTHON_VERSION
-+PYTHON_PREFIX
-+PYTHON_EXEC_PREFIX
-+PYTHON_PLATFORM
-+pythondir
-+pkgpythondir
-+pyexecdir
-+pkgpyexecdir
- HAVE_PYTHON_TRUE
- HAVE_PYTHON_FALSE
- LN_S
-@@ -1525,9 +1523,9 @@ if test -n "$ac_init_help"; then
- Optional Features:
-   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
--  --disable-python        disable python scripts and library bindings
-   --disable-dependency-tracking  speeds up one-time build
-   --enable-dependency-tracking   do not reject slow dependency extractors
-+  --disable-python        disable python scripts and library bindings
-   --enable-shared[=PKGS]  build shared libraries [default=yes]
-   --enable-static[=PKGS]  build static libraries [default=yes]
-   --enable-fast-install[=PKGS]
-@@ -2508,230 +2506,20 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
--# Check whether --enable-python was given.
--if test "${enable_python+set}" = set; then
--  enableval=$enable_python; try_python="$enableval"
--else
--  try_python="yes"
--fi
--
--if test "x$try_python" = "xyes"; then
--
--
--
--
--        # Find any Python interpreter.
--    if test -z "$PYTHON"; then
--      for ac_prog in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_PYTHON+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $PYTHON in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--  ;;
--esac
--fi
--PYTHON=$ac_cv_path_PYTHON
--if test -n "$PYTHON"; then
--  { echo "$as_me:$LINENO: result: $PYTHON" >&5
--echo "${ECHO_T}$PYTHON" >&6; }
--else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--  test -n "$PYTHON" && break
--done
--test -n "$PYTHON" || PYTHON=":"
--
--    fi
--    am_display_PYTHON=python
--
--
--  if test "$PYTHON" = :; then
--      { { echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5
--echo "$as_me: error: no suitable Python interpreter found" >&2;}
--   { (exit 1); exit 1; }; }
--  else
--
--
--  { echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
--echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6; }
--if test "${am_cv_python_version+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
--fi
--{ echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
--echo "${ECHO_T}$am_cv_python_version" >&6; }
--  PYTHON_VERSION=$am_cv_python_version
--
--
--
--  PYTHON_PREFIX='${prefix}'
--
--  PYTHON_EXEC_PREFIX='${exec_prefix}'
--
--
--
--  { echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
--echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6; }
--if test "${am_cv_python_platform+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
--fi
--{ echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
--echo "${ECHO_T}$am_cv_python_platform" >&6; }
--  PYTHON_PLATFORM=$am_cv_python_platform
--
--
--
--
--                { echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
--echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6; }
--if test "${am_cv_python_pythondir+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  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"`
--fi
--{ echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
--echo "${ECHO_T}$am_cv_python_pythondir" >&6; }
--  pythondir=$am_cv_python_pythondir
--
--
--
--  pkgpythondir=\${pythondir}/$PACKAGE
--
--
--            { echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
--echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6; }
--if test "${am_cv_python_pyexecdir+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  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"`
--fi
--{ echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
--echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }
--  pyexecdir=$am_cv_python_pyexecdir
--
--
--
--  pkgpyexecdir=\${pyexecdir}/$PACKAGE
--
--
--
--  fi
--
--
--	ac_python=yes
--	if test "x$PYTHON" = "x"; then
--		# Extract the first word of "python", so it can be a program name with args.
--set dummy python; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_PYTHON+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $PYTHON in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="none"
--  ;;
--esac
--fi
--PYTHON=$ac_cv_path_PYTHON
--if test -n "$PYTHON"; then
--  { echo "$as_me:$LINENO: result: $PYTHON" >&5
--echo "${ECHO_T}$PYTHON" >&6; }
--else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--	fi
--
--	if test "x$PYTHON" = "xnone"; then
--	{ echo "$as_me:$LINENO: WARNING: *** Python interpreter not found, Python support disabled." >&5
--echo "$as_me: WARNING: *** Python interpreter not found, Python support disabled." >&2;}
--		ac_python=no
--	fi
--
--	if test "x$ac_python" = "xyes"; then
--		{ echo "$as_me:$LINENO: checking Python version and location" >&5
--echo $ECHO_N "checking Python version and location... $ECHO_C" >&6; }
--		PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
--		PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print '%d' % (sys.version_info[0]);"`
--		PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print '%d' % (sys.version_info[1]);"`
--		PYTHON_VERSION="${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}"
--		{ echo "$as_me:$LINENO: result: $PYTHON, $PYTHON_VERSION, $PYTHON_PREFIX" >&5
--echo "${ECHO_T}$PYTHON, $PYTHON_VERSION, $PYTHON_PREFIX" >&6; }
--
--		{ echo "$as_me:$LINENO: checking whether Python is at least 2.4" >&5
--echo $ECHO_N "checking whether Python is at least 2.4... $ECHO_C" >&6; }
--		if test $PYTHON_VERSION_MAJOR -lt 2 -o $PYTHON_VERSION_MAJOR -eq 2 -a $PYTHON_VERSION_MINOR -lt 3; then
--			{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--			{ echo "$as_me:$LINENO: WARNING: *** GPSD requires at least Python 2.3, Python support disabled." >&5
--echo "$as_me: WARNING: *** GPSD requires at least Python 2.3, Python support disabled." >&2;}
--			ac_python=no
--		fi
--		if test "x$ac_python" = "xyes"; then
--			{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--
--			PYTHON_CFLAGS="-DHAVE_PYTHON -I$PYTHON_PREFIX/include/python$PYTHON_VERSION"
-+# ACREQUIRE_BUGFIX
-+# ----------------
-+# Due to a longstanding Autoconf bug (Autoconf 2.50 to at least 2.63),
-+# any macro that is AC_REQUIREd at any point must be AC_REQUIREd
-+# *before* it is directly expanded.  The macros below were being
-+# directly expanded before being AC_REQUIREd, so we AC_REQUIRE them
-+# early to prevent out-of-order expansion problems.  See the threads
-+# at:
-+# http://lists.gnu.org/archive/html/bug-autoconf/2008-12/msg00039.html
-+# http://lists.gnu.org/archive/html/autoconf-patches/2008-12/msg00058.html
-+# http://lists.gnu.org/archive/html/bug-autoconf/2009-01/msg00019.html
-+# http://lists.gnu.org/archive/html/bug-gnulib/2009-01/msg00247.html
- 
--			OLD_CPPFLAGS="$CPPFLAGS"
--			OLD_CXXFLAGS="$CXXFLAGS"
--			CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
--			CXXFLAGS="$CXXFLAGS $PYTHON_CFLAGS"
--
--			DEPDIR="${am__leading_dot}deps"
-+DEPDIR="${am__leading_dot}deps"
- 
- ac_config_commands="$ac_config_commands depfiles"
- 
-@@ -3820,7 +3608,6 @@ else
- fi
- 
- 
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4051,7 +3838,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--
- { echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
- echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
- if test "${ac_cv_path_GREP+set}" = set; then
-@@ -4214,493 +4000,209 @@ echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-  EGREP="$ac_cv_path_EGREP"
- 
- 
--{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
--if test "${ac_cv_header_stdc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <stdlib.h>
--#include <stdarg.h>
--#include <string.h>
--#include <float.h>
- 
--int
--main ()
--{
- 
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_header_stdc=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_header_stdc=no
--fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--if test $ac_cv_header_stdc = yes; then
--  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <string.h>
-+# ACREQUIRE_BUGFIX done
- 
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "memchr" >/dev/null 2>&1; then
--  :
-+# Check whether --enable-python was given.
-+if test "${enable_python+set}" = set; then
-+  enableval=$enable_python; try_python="$enableval"
- else
--  ac_cv_header_stdc=no
-+  try_python="yes"
- fi
--rm -f conftest*
- 
--fi
- 
--if test $ac_cv_header_stdc = yes; then
--  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <stdlib.h>
-+if test "x$try_python" = "xyes"; then
- 
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "free" >/dev/null 2>&1; then
--  :
--else
--  ac_cv_header_stdc=no
--fi
--rm -f conftest*
- 
--fi
- 
--if test $ac_cv_header_stdc = yes; then
--  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
--  if test "$cross_compiling" = yes; then
--  :
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <ctype.h>
--#include <stdlib.h>
--#if ((' ' & 0x0FF) == 0x020)
--# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
--#else
--# define ISLOWER(c) \
--		   (('a' <= (c) && (c) <= 'i') \
--		     || ('j' <= (c) && (c) <= 'r') \
--		     || ('s' <= (c) && (c) <= 'z'))
--# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
--#endif
- 
--#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
--int
--main ()
--{
--  int i;
--  for (i = 0; i < 256; i++)
--    if (XOR (islower (i), ISLOWER (i))
--	|| toupper (i) != TOUPPER (i))
--      return 2;
--  return 0;
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
-+        if test -n "$PYTHON"; then
-+      # If the user set $PYTHON, use it and don't search something else.
-+      { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.4" >&5
-+echo $ECHO_N "checking whether $PYTHON version >= 2.4... $ECHO_C" >&6; }
-+      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.4', '.')) + [0, 0, 0]
-+minverhex = 0
-+for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
-+sys.exit(sys.hexversion < minverhex)"
-+  if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
-+   ($PYTHON -c "$prog") >&5 2>&5
-+   ac_status=$?
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--ac_cv_header_stdc=no
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+  { { echo "$as_me:$LINENO: error: too old" >&5
-+echo "$as_me: error: too old" >&2;}
-+   { (exit 1); exit 1; }; }
- fi
- 
-+      am_display_PYTHON=$PYTHON
-+    else
-+      # Otherwise, try each interpreter until we find one that satisfies
-+      # VERSION.
-+      { echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.4" >&5
-+echo $ECHO_N "checking for a Python interpreter with version >= 2.4... $ECHO_C" >&6; }
-+if test "${am_cv_pathless_PYTHON+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- 
-+	for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
-+	  test "$am_cv_pathless_PYTHON" = none && break
-+	  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.4', '.')) + [0, 0, 0]
-+minverhex = 0
-+for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
-+sys.exit(sys.hexversion < minverhex)"
-+  if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
-+   ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
-+   ac_status=$?
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then
-+  break
- fi
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
--if test $ac_cv_header_stdc = yes; then
--
--cat >>confdefs.h <<\_ACEOF
--#define STDC_HEADERS 1
--_ACEOF
- 
-+	done
- fi
--
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--
--
--
--
--
--
--
--
--
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
--		  inttypes.h stdint.h unistd.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
-+echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6; }
-+      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
-+      if test "$am_cv_pathless_PYTHON" = none; then
-+	PYTHON=:
-+      else
-+        # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
-+set dummy $am_cv_pathless_PYTHON; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_PYTHON+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
-+  case $PYTHON in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
- 
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
-+  ;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  eval "$as_ac_Header=yes"
-+fi
-+PYTHON=$ac_cv_path_PYTHON
-+if test -n "$PYTHON"; then
-+  { echo "$as_me:$LINENO: result: $PYTHON" >&5
-+echo "${ECHO_T}$PYTHON" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_Header=no"
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
- 
--fi
-+      fi
-+      am_display_PYTHON=$am_cv_pathless_PYTHON
-+    fi
- 
--done
- 
-+  if test "$PYTHON" = :; then
-+      have_python=np
-+  else
- 
- 
--for ac_header in Python.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
-+echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6; }
-+if test "${am_cv_python_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--else
--  # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_header_compiler=no
-+  am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
- fi
-+{ echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
-+echo "${ECHO_T}$am_cv_python_version" >&6; }
-+  PYTHON_VERSION=$am_cv_python_version
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
--# Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <$ac_header>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  ac_header_preproc=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--  ac_header_preproc=no
--fi
-+  PYTHON_PREFIX='${prefix}'
- 
--rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+  PYTHON_EXEC_PREFIX='${exec_prefix}'
- 
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- 
--    ;;
--esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+
-+  { echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
-+echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6; }
-+if test "${am_cv_python_platform+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  eval "$as_ac_Header=\$ac_header_preproc"
-+  am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
-+echo "${ECHO_T}$am_cv_python_platform" >&6; }
-+  PYTHON_PLATFORM=$am_cv_python_platform
-+
-+
- 
--fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
- 
-+                { echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
-+echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6; }
-+if test "${am_cv_python_pythondir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  { echo "$as_me:$LINENO: WARNING: *** Python include files not found! You should install the Python development package. Python support disabled" >&5
--echo "$as_me: WARNING: *** Python include files not found! You should install the Python development package. Python support disabled" >&2;}; ac_python=no
-+  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"`
- fi
-+{ echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
-+echo "${ECHO_T}$am_cv_python_pythondir" >&6; }
-+  pythondir=$am_cv_python_pythondir
- 
--done
--
--			CPPFLAGS="$OLD_CPPFLAGS"
--			CXXFLAGS="$OLD_CXXFLAGS"
- 
--			if test "x$ac_python" = "xyes"; then
- 
-+  pkgpythondir=\${pythondir}/$PACKAGE
- 
--				ac_python=no
--				for pylibpath in '/usr/lib' $PYTHON_PREFIX/lib $PYTHON_PREFIX/lib/python$PYTHON_VERSION/config; do
--					eval `echo unset ac_cv_lib_python$PYTHON_VERSION'___'Py_Finalize | tr '.' '_'`
- 
--					save_LIBS=$LIBS
--					LIBS="$LIBS -L$pylibpath $PYTHON_LIBS"
--					as_ac_Lib=`echo "ac_cv_lib_python$PYTHON_VERSION''_Py_Finalize" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for Py_Finalize in -lpython$PYTHON_VERSION" >&5
--echo $ECHO_N "checking for Py_Finalize in -lpython$PYTHON_VERSION... $ECHO_C" >&6; }
--if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-+            { echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
-+echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6; }
-+if test "${am_cv_python_pyexecdir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpython$PYTHON_VERSION $PYTHON_DEPS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char Py_Finalize ();
--int
--main ()
--{
--return Py_Finalize ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  eval "$as_ac_Lib=yes"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_Lib=no"
-+  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"`
- fi
-+{ echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
-+echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }
-+  pyexecdir=$am_cv_python_pyexecdir
- 
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--ac_res=`eval echo '${'$as_ac_Lib'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_Lib'}'` = yes; then
--  PYTHON_LIBS="-L$pylibpath -lpython$PYTHON_VERSION $PYTHON_DEPS"; ac_python=yes
--fi
- 
--					LIBS=$save_LIBS
--					if test "x$ac_python" = "xyes"; then
--						break
--					fi
--				done
- 
--				if test "x$ac_python" != "xyes"; then
--					{ echo "$as_me:$LINENO: WARNING: *** Python development libraries required" >&5
--echo "$as_me: WARNING: *** Python development libraries required" >&2;}
--				fi
-+  pkgpyexecdir=\${pyexecdir}/$PACKAGE
- 
- 
-+    have_python=yes
-+  fi
- 
--				if test "x$python_install" = "xyes"; then
--					pkgpythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION"/site-packages/gpsd"
--				fi
- 
--			fi
--		fi
--	fi
- fi
-- if test x"$ac_python" = xyes; then
-+
-+ if test "${have_python}" = "yes"; then
-   HAVE_PYTHON_TRUE=
-   HAVE_PYTHON_FALSE='#'
- else
-@@ -5429,13 +4931,13 @@ if test "${lt_cv_nm_interface+set}" = se
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:5432: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:4934: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:5435: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:4937: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:5438: output\"" >&5)
-+  (eval echo "\"\$as_me:4940: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -6503,6 +6005,7 @@ fi
- 
- 
- 
-+
- # Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then
-   enableval=$enable_libtool_lock;
-@@ -6534,7 +6037,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 6537 "configure"' > conftest.$ac_ext
-+  echo '#line 6040 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -7230,67 +6733,339 @@ fi
- 
- 
- 
--    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
--echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
--if test "${lt_cv_apple_cc_single_mod+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  lt_cv_apple_cc_single_mod=no
--      if test -z "${LT_MULTI_MODULE}"; then
--	# By default we will add the -single_module flag. You can override
--	# by either setting the environment variable LT_MULTI_MODULE
--	# non-empty at configure time, or by adding -multi_module to the
--	# link flags.
--	rm -rf libconftest.dylib*
--	echo "int foo(void){return 1;}" > conftest.c
--	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
---dynamiclib -Wl,-single_module conftest.c" >&5
--	$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
--	  lt_cv_apple_cc_single_mod=yes
--	else
--	  cat conftest.err >&5
--	fi
--	rm -rf libconftest.dylib*
--	rm -f conftest.*
--      fi
--fi
--{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
--echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
--    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
--echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
--if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-+    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
-+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_apple_cc_single_mod=no
-+      if test -z "${LT_MULTI_MODULE}"; then
-+	# By default we will add the -single_module flag. You can override
-+	# by either setting the environment variable LT_MULTI_MODULE
-+	# non-empty at configure time, or by adding -multi_module to the
-+	# link flags.
-+	rm -rf libconftest.dylib*
-+	echo "int foo(void){return 1;}" > conftest.c
-+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+-dynamiclib -Wl,-single_module conftest.c" >&5
-+	$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
-+	  lt_cv_apple_cc_single_mod=yes
-+	else
-+	  cat conftest.err >&5
-+	fi
-+	rm -rf libconftest.dylib*
-+	rm -f conftest.*
-+      fi
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-+    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
-+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_ld_exported_symbols_list=no
-+      save_LDFLAGS=$LDFLAGS
-+      echo "_main" > conftest.sym
-+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  lt_cv_ld_exported_symbols_list=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	lt_cv_ld_exported_symbols_list=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+	LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
-+    case $host_os in
-+    rhapsody* | darwin1.[012])
-+      _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
-+      # 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?
-+      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' ;;
-+	10.[012]*)
-+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+	10.*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+      esac
-+    ;;
-+  esac
-+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+      _lt_dar_single_mod='$single_module'
-+    fi
-+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+    else
-+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    fi
-+    if test "$DSYMUTIL" != ":"; then
-+      _lt_dsymutil='~$DSYMUTIL $lib || :'
-+    else
-+      _lt_dsymutil=
-+    fi
-+    ;;
-+  esac
-+
-+
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-+if test "${ac_cv_header_stdc+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_cv_header_stdc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_header_stdc=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <string.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "memchr" >/dev/null 2>&1; then
-+  :
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "free" >/dev/null 2>&1; then
-+  :
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+  if test "$cross_compiling" = yes; then
-+  :
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <ctype.h>
-+#include <stdlib.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+		   (('a' <= (c) && (c) <= 'i') \
-+		     || ('j' <= (c) && (c) <= 'r') \
-+		     || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+  int i;
-+  for (i = 0; i < 256; i++)
-+    if (XOR (islower (i), ISLOWER (i))
-+	|| toupper (i) != TOUPPER (i))
-+      return 2;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  :
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_header_stdc=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+
-+fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-+if test $ac_cv_header_stdc = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define STDC_HEADERS 1
-+_ACEOF
-+
-+fi
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+		  inttypes.h stdint.h unistd.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_cv_ld_exported_symbols_list=no
--      save_LDFLAGS=$LDFLAGS
--      echo "_main" > conftest.sym
--      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
--      cat >conftest.$ac_ext <<_ACEOF
-+  cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+$ac_includes_default
- 
--int
--main ()
--{
--
--  ;
--  return 0;
--}
-+#include <$ac_header>
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -7299,57 +7074,29 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  lt_cv_ld_exported_symbols_list=yes
-+       } && test -s conftest.$ac_objext; then
-+  eval "$as_ac_Header=yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	lt_cv_ld_exported_symbols_list=no
-+	eval "$as_ac_Header=no"
- fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--	LDFLAGS="$save_LDFLAGS"
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
--echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
--    case $host_os in
--    rhapsody* | darwin1.[012])
--      _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
--      # 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?
--      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' ;;
--	10.[012]*)
--	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
--	10.*)
--	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
--      esac
--    ;;
--  esac
--    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
--      _lt_dar_single_mod='$single_module'
--    fi
--    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
--      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
--    else
--      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    fi
--    if test "$DSYMUTIL" != ":"; then
--      _lt_dsymutil='~$DSYMUTIL $lib || :'
--    else
--      _lt_dsymutil=
--    fi
--    ;;
--  esac
-+
-+done
-+
- 
- 
- for ac_header in dlfcn.h
-@@ -7907,11 +7654,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7910: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7657: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7914: \$? = $ac_status" >&5
-+   echo "$as_me:7661: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -8231,11 +7978,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8234: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7981: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:8238: \$? = $ac_status" >&5
-+   echo "$as_me:7985: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -8336,11 +8083,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8339: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8086: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:8343: \$? = $ac_status" >&5
-+   echo "$as_me:8090: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -8391,11 +8138,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8394: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8141: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:8398: \$? = $ac_status" >&5
-+   echo "$as_me:8145: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -8664,7 +8411,7 @@ _LT_EOF
- 
-         if test "x$supports_anon_versioning" = xyes; then
-           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
--	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	    cat $export_symbols | sed -e "s/\(.*\)/'"$ac_symprfx"'\1;/" >> $output_objdir/$libname.ver~
- 	    echo "local: *; };" >> $output_objdir/$libname.ver~
- 	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-         fi
-@@ -8678,7 +8425,7 @@ _LT_EOF
- 	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
- 	  if test "x$supports_anon_versioning" = xyes; then
- 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
--	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	      cat $export_symbols | sed -e "s/\(.*\)/'"$ac_symprfx"'\1;/" >> $output_objdir/$libname.ver~
- 	      echo "local: *; };" >> $output_objdir/$libname.ver~
- 	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- 	  fi
-@@ -9812,7 +9559,7 @@ version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
- need_lib_prefix=unknown
--hardcode_into_libs=no
-+hardcode_into_libs="no"
- 
- # when you set need_version to no, make sure it does not cause -set_version
- # flags to be left without arguments
-@@ -11152,7 +10899,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11155 "configure"
-+#line 10902 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11252,7 +10999,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11255 "configure"
-+#line 11002 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -13553,7 +13300,7 @@ if test -z "$aix_libpath"; then aix_libp
- 	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	    if test "x$supports_anon_versioning" = xyes; then
- 	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
--		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+		cat $export_symbols | sed -e "s/\(.*\)/'"$ac_symprfx"'\1;/" >> $output_objdir/$libname.ver~
- 		echo "local: *; };" >> $output_objdir/$libname.ver~
- 		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- 	    fi
-@@ -14451,11 +14198,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14454: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14201: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:14458: \$? = $ac_status" >&5
-+   echo "$as_me:14205: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -14550,11 +14297,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14553: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14300: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:14557: \$? = $ac_status" >&5
-+   echo "$as_me:14304: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -14602,11 +14349,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14605: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14352: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:14609: \$? = $ac_status" >&5
-+   echo "$as_me:14356: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -14841,7 +14588,7 @@ version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
- need_lib_prefix=unknown
--hardcode_into_libs=no
-+hardcode_into_libs="no"
- 
- # when you set need_version to no, make sure it does not cause -set_version
- # flags to be left without arguments
-@@ -25554,8 +25301,8 @@ module_expsym_cmds='`$ECHO "X$module_exp
- with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
- allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
- no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec=""
-+hardcode_libdir_flag_spec_ld=""
- hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
- hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
- hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-@@ -25585,7 +25332,7 @@ postinstall_cmds='`$ECHO "X$postinstall_
- postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_into_libs="no"
- sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
- sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
- hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-@@ -25954,15 +25701,6 @@ am__leading_dot!$am__leading_dot$ac_deli
- AMTAR!$AMTAR$ac_delim
- am__tar!$am__tar$ac_delim
- am__untar!$am__untar$ac_delim
--PYTHON!$PYTHON$ac_delim
--PYTHON_VERSION!$PYTHON_VERSION$ac_delim
--PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim
--PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim
--PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim
--pythondir!$pythondir$ac_delim
--pkgpythondir!$pkgpythondir$ac_delim
--pyexecdir!$pyexecdir$ac_delim
--pkgpyexecdir!$pkgpyexecdir$ac_delim
- CC!$CC$ac_delim
- CFLAGS!$CFLAGS$ac_delim
- LDFLAGS!$LDFLAGS$ac_delim
-@@ -25982,8 +25720,15 @@ am__fastdepCC_FALSE!$am__fastdepCC_FALSE
- CPP!$CPP$ac_delim
- GREP!$GREP$ac_delim
- EGREP!$EGREP$ac_delim
--PYTHON_CFLAGS!$PYTHON_CFLAGS$ac_delim
--PYTHON_LIBS!$PYTHON_LIBS$ac_delim
-+PYTHON!$PYTHON$ac_delim
-+PYTHON_VERSION!$PYTHON_VERSION$ac_delim
-+PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim
-+PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim
-+PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim
-+pythondir!$pythondir$ac_delim
-+pkgpythondir!$pkgpythondir$ac_delim
-+pyexecdir!$pyexecdir$ac_delim
-+pkgpyexecdir!$pkgpyexecdir$ac_delim
- HAVE_PYTHON_TRUE!$HAVE_PYTHON_TRUE$ac_delim
- HAVE_PYTHON_FALSE!$HAVE_PYTHON_FALSE$ac_delim
- LN_S!$LN_S$ac_delim
-@@ -25992,6 +25737,8 @@ build!$build$ac_delim
- build_cpu!$build_cpu$ac_delim
- build_vendor!$build_vendor$ac_delim
- build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -26033,8 +25780,6 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
--host!$host$ac_delim
--host_cpu!$host_cpu$ac_delim
- host_vendor!$host_vendor$ac_delim
- host_os!$host_os$ac_delim
- SED!$SED$ac_delim
-@@ -26106,7 +25851,7 @@ LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 69; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -26916,7 +26661,7 @@ finish_cmds=$lt_finish_cmds
- finish_eval=$lt_finish_eval
- 
- # Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
-+hardcode_into_libs="no"
- 
- # Compile-time system search path for libraries.
- sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-@@ -27006,11 +26751,11 @@ no_undefined_flag=$lt_no_undefined_flag
- 
- # Flag to hardcode \$libdir into a binary during linking.
- # This must work even if \$libdir does not exist
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-+hardcode_libdir_flag_spec=""
- 
- # If ld is used when linking, flag to hardcode \$libdir into a binary
- # during linking.  This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-+hardcode_libdir_flag_spec_ld=""
- 
- # Whether we need a single "-rpath" flag with a separated argument.
- hardcode_libdir_separator=$lt_hardcode_libdir_separator
-@@ -27391,11 +27136,11 @@ no_undefined_flag=$lt_no_undefined_flag_
- 
- # Flag to hardcode \$libdir into a binary during linking.
- # This must work even if \$libdir does not exist
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-+hardcode_libdir_flag_spec=""
- 
- # If ld is used when linking, flag to hardcode \$libdir into a binary
- # during linking.  This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-+hardcode_libdir_flag_spec_ld=""
- 
- # Whether we need a single "-rpath" flag with a separated argument.
- hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
diff --git a/patches/gpsd-2.39/generic/gpsd-2.39-fix-core-compiling-with-nmea-disabled.patch b/patches/gpsd-2.39/generic/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
index 087bdbe92..087bdbe92 100644
--- a/patches/gpsd-2.39/generic/gpsd-2.39-fix-core-compiling-with-nmea-disabled.patch
+++ b/patches/gpsd-2.39/generic/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
diff --git a/patches/gpsd-2.39/generic/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.patch b/patches/gpsd-2.39/generic/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
index 7f4c23492..04ffd462c 100644
--- a/patches/gpsd-2.39/generic/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.patch
+++ b/patches/gpsd-2.39/generic/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
@@ -15,10 +15,10 @@ Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
  gpsdecode.c |    6 ++++++
  1 file changed, 6 insertions(+)
 
-Index: gpsdecode.c
+Index: gpsd-2.39/gpsdecode.c
 ===================================================================
---- gpsdecode.c.orig
-+++ gpsdecode.c
+--- gpsd-2.39/gpsdecode.c.orig
++++ gpsd-2.39/gpsdecode.c
 @@ -57,19 +57,25 @@ static void decode(FILE *fpin, FILE *fpo
  	else if (lexer.type == COMMENT_PACKET)
  	    continue;
diff --git a/patches/gpsd-2.39/generic/gpsd-2.39-fix_build_error.patch b/patches/gpsd-2.39/generic/gpsd-2.39-fix_build_error.diff
index 4396be375..126d7396b 100644
--- a/patches/gpsd-2.39/generic/gpsd-2.39-fix_build_error.patch
+++ b/patches/gpsd-2.39/generic/gpsd-2.39-fix_build_error.diff
@@ -11,10 +11,10 @@ Signed-off-by: Juergen Beisert <jbeisert@pengutronix.de>
  drivers.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: drivers.c
+Index: gpsd-2.39/drivers.c
 ===================================================================
---- drivers.c.orig
-+++ drivers.c
+--- gpsd-2.39/drivers.c.orig
++++ gpsd-2.39/drivers.c
 @@ -935,7 +935,7 @@ static gps_mask_t garmintxt_parse_input(
  
  static const struct gps_type_t garmintxt = {
diff --git a/patches/gpsd-2.39/generic/series b/patches/gpsd-2.39/generic/series
index 26b9489b4..d4df58c6c 100644
--- a/patches/gpsd-2.39/generic/series
+++ b/patches/gpsd-2.39/generic/series
@@ -1,6 +1,6 @@
-gpsd-2.39-fix-core-compiling-with-nmea-disabled.patch
-gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.patch -p0
-gpsd-2.39-fix_build_error.patch -p0
+gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
+gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
+gpsd-2.39-fix_build_error.diff
 gpsd-2.39-fix-autotool-bug.diff
 gpsd-2.39-configure_ac-fix-python.diff
 gpsd-2.39-fixup-parallel-build-for-python.diff