All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit d1bf7d11 authored by Timothy Stack's avatar Timothy Stack

Fix python detection so it works on linux. Detect ulsshxmlrpc so we

can avoid building robots/tbsetdest.
parent 0489a3a0
...@@ -75,3 +75,5 @@ GTK_CONFIG = @GTK_CONFIG@ ...@@ -75,3 +75,5 @@ GTK_CONFIG = @GTK_CONFIG@
BRAINSTEM_DIR = @BRAINSTEM_DIR@ BRAINSTEM_DIR = @BRAINSTEM_DIR@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
HAVE_ULXMLRPCPP = @HAVE_ULXMLRPCPP@
This diff is collapsed.
...@@ -21,6 +21,26 @@ fi ...@@ -21,6 +21,26 @@ fi
AC_SUBST(PATH) AC_SUBST(PATH)
CPPFLAGS="-I/usr/local/include"
# BEGIN Python detection.
AC_PATH_PROGS(PYTHON, python python2.4 python2.3 python2.2)
if test x"$PYTHON" = x""; then
AC_MSG_ERROR([python not detected])
fi
PYTHON_VERSION=`${PYTHON} -V 2>&1 | cut -d ' ' -f 2 | cut -d '.' -f 1,2`
PYTHON_PATH=`dirname ${PYTHON}`
PYTHON_PATH=`dirname ${PYTHON_PATH}`
PYTHON_INCLUDE="${PYTHON_PATH}/include/python${PYTHON_VERSION}"
CPPFLAGS="${CPPFLAGS} -I${PYTHON_INCLUDE}"
AC_CHECK_HEADERS([Python.h],
[],
[AC_MSG_ERROR("Cannot find Python.h in ${PYTHON_INCLUDE}")])
AC_SUBST(PYTHON_INCLUDE)
# END Python detection.
AC_CHECK_TOOL(CC,gcc) AC_CHECK_TOOL(CC,gcc)
AC_CHECK_TOOL(CXX,g++) AC_CHECK_TOOL(CXX,g++)
AC_CHECK_TOOL(AR,ar) AC_CHECK_TOOL(AR,ar)
...@@ -550,6 +570,15 @@ else ...@@ -550,6 +570,15 @@ else
fi fi
AC_SUBST(EXE_SUFFIX) AC_SUBST(EXE_SUFFIX)
#
# Check for ulsshxmlrpc header
#
AC_CHECK_HEADERS([ulxmlrpcpp/ulxr_config.h],
[AC_DEFINE(HAVE_ULXMLRPCPP)
HAVE_ULXMLRPCPP="yes"])
AC_SUBST(HAVE_ULXMLRPCPP)
# #
# Check for the robot vision system dependencies. # Check for the robot vision system dependencies.
# #
...@@ -585,19 +614,6 @@ else ...@@ -585,19 +614,6 @@ else
fi fi
AC_SUBST(TESTMODE) AC_SUBST(TESTMODE)
# Deal with Python mess.
changequote(START, END)dnl
PYTHON_VERSION=`python -V 2>&1 | sed -E -e 's/^[a-zA-Z\ ]*//' -e 's/([0-9].[0-9]).*$/\1/'`
changequote([, ])dnl
PYTHON_INCLUDE="/usr/local/include/python${PYTHON_VERSION}"
PYTHON_HEADER="${PYTHON_INCLUDE}/Python.h"
if test ! -f $PYTHON_HEADER; then
AC_MSG_ERROR([Cannot find the Python header file Python.h])
fi
AC_SUBST(PYTHON_INCLUDE)
# Make sure $INSTALL is valid at any depth in our tree, i.e. make it absoulte. # Make sure $INSTALL is valid at any depth in our tree, i.e. make it absoulte.
# This can be needed when no valid install is found and autoconf falls back on # This can be needed when no valid install is found and autoconf falls back on
# the supplied install.sh, but we called 'configure' with a relative path. # the supplied install.sh, but we called 'configure' with a relative path.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment