diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-21 18:51:50 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-21 18:51:50 +0100 |
commit | 18430215845a1ba4adab10062d33204fd26bd8fb (patch) | |
tree | 33aa3ec2a66f0c7a170837135a74059359b42a4e /package/gpsd/patches/patch-configure_ac | |
parent | f799b95adfe39ddee1324e2901a823ecdf2fe44d (diff) | |
parent | 08c3724108f33060956438bff670ee1135f473b1 (diff) |
Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk
Diffstat (limited to 'package/gpsd/patches/patch-configure_ac')
-rw-r--r-- | package/gpsd/patches/patch-configure_ac | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/package/gpsd/patches/patch-configure_ac b/package/gpsd/patches/patch-configure_ac deleted file mode 100644 index c6b538e08..000000000 --- a/package/gpsd/patches/patch-configure_ac +++ /dev/null @@ -1,95 +0,0 @@ ---- gpsd-2.39.orig/configure.ac Wed Mar 18 22:09:27 2009 -+++ gpsd-2.39/configure.ac Tue Feb 16 21:44:35 2010 -@@ -5,84 +5,6 @@ dnl AC_PREFIX_PROGRAM(gcc) - AM_CONFIG_HEADER(gpsd_config.h) - AC_LANG([C]) - --AC_ARG_ENABLE(python, -- AC_HELP_STRING([--disable-python], -- [disable python scripts and library bindings]), -- [try_python="$enableval"], [try_python="yes"]) --if test "x$try_python" = "xyes"; then -- AM_PATH_PYTHON -- ac_python=yes -- if test "x$PYTHON" = "x"; then -- AC_PATH_PROG(PYTHON, python, none) -- fi -- -- if test "x$PYTHON" = "xnone"; then -- AC_MSG_WARN([*** Python interpreter not found, Python support disabled.]) -- ac_python=no -- fi -- -- if test "x$ac_python" = "xyes"; then -- AC_MSG_CHECKING(Python version and location) -- 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}" -- AC_MSG_RESULT([$PYTHON, $PYTHON_VERSION, $PYTHON_PREFIX]) -- -- AC_MSG_CHECKING(whether Python is at least 2.4) -- if test $PYTHON_VERSION_MAJOR -lt 2 -o $PYTHON_VERSION_MAJOR -eq 2 -a $PYTHON_VERSION_MINOR -lt 3; then -- AC_MSG_RESULT(no) -- AC_MSG_WARN([*** GPSD requires at least Python 2.3, Python support disabled.]) -- ac_python=no -- fi -- if test "x$ac_python" = "xyes"; then -- AC_MSG_RESULT(yes) -- -- PYTHON_CFLAGS="-DHAVE_PYTHON -I$PYTHON_PREFIX/include/python$PYTHON_VERSION" -- -- OLD_CPPFLAGS="$CPPFLAGS" -- OLD_CXXFLAGS="$CXXFLAGS" -- CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS" -- CXXFLAGS="$CXXFLAGS $PYTHON_CFLAGS" -- -- AC_CHECK_HEADERS([Python.h], -- [], -- [AC_MSG_WARN([*** Python include files not found! You should install the Python development package. Python support disabled]); ac_python=no]) -- CPPFLAGS="$OLD_CPPFLAGS" -- CXXFLAGS="$OLD_CXXFLAGS" -- -- if test "x$ac_python" = "xyes"; then -- AC_SUBST([PYTHON_CFLAGS]) -- -- 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" -- AC_CHECK_LIB(python$PYTHON_VERSION, Py_Finalize, PYTHON_LIBS="-L$pylibpath -lpython$PYTHON_VERSION $PYTHON_DEPS"; ac_python=yes,,$PYTHON_DEPS) -- LIBS=$save_LIBS -- if test "x$ac_python" = "xyes"; then -- break -- fi -- done -- -- if test "x$ac_python" != "xyes"; then -- AC_MSG_WARN(*** Python development libraries required, Python support disabled) -- fi -- AC_SUBST([PYTHON_LIBS]) -- -- AC_SUBST(pkgpythondir) -- if test "x$python_install" = "xyes"; then -- pkgpythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION"/site-packages/gpsd" -- fi -- -- fi -- fi -- fi --fi --AM_CONDITIONAL([HAVE_PYTHON], [test x"$ac_python" = xyes]) -- - AC_PROG_LN_S - AC_PROG_MAKE_SET - AC_PROG_INSTALL -@@ -943,7 +865,6 @@ echo " Client Features" - echo " ---------------" - echo "Build ncurses programs : $ac_ncurses" - echo "Enable X11 support : $ac_x" --echo "Enable Python support : $ac_python" - echo "------------------------------------------" - - if test "xdummy" = "xdummy" -a \ |