python: use python path found during configure

Also look for Python under more names. For example, on OpenBSD
if you just install Python 2, you will only get a python2.7
executable.
pull/2786/head
Jason Ish 8 years ago committed by Victor Julien
parent 5162b58260
commit 6bddc4d3e0

@ -86,7 +86,7 @@
AC_ARG_ENABLE(python, AC_ARG_ENABLE(python,
AS_HELP_STRING([--enable-python], [Enable python]),,[enable_python=yes]) AS_HELP_STRING([--enable-python], [Enable python]),,[enable_python=yes])
AC_PATH_PROG(HAVE_PYTHON_CONFIG, python, "no") AC_PATH_PROGS(HAVE_PYTHON, python python2 python2.7, "no")
if test "x$enable_python" = "xno" ; then if test "x$enable_python" = "xno" ; then
echo echo
echo " Warning! python disabled, you will not be " echo " Warning! python disabled, you will not be "
@ -94,7 +94,7 @@
echo echo
enable_python="no" enable_python="no"
fi fi
if test "$HAVE_PYTHON_CONFIG" = "no"; then if test "$HAVE_PYTHON" = "no"; then
echo echo
echo " Warning! python not found, you will not be " echo " Warning! python not found, you will not be "
echo " able to install suricatasc unix socket client " echo " able to install suricatasc unix socket client "

@ -28,7 +28,7 @@ endif
all-local: all-local:
if HAVE_PYTHON if HAVE_PYTHON
cd $(top_srcdir)/rust && CARGO_TARGET_DIR=$(abs_builddir)/target \ cd $(top_srcdir)/rust && CARGO_TARGET_DIR=$(abs_builddir)/target \
python ./gen-c-headers.py && \ $(HAVE_PYTHON) ./gen-c-headers.py && \
cargo build $(RELEASE) $(FROZEN) --features "$(FEATURES)" cargo build $(RELEASE) $(FROZEN) --features "$(FEATURES)"
else else
cd $(top_srcdir)/rust && CARGO_TARGET_DIR=$(abs_builddir)/target \ cd $(top_srcdir)/rust && CARGO_TARGET_DIR=$(abs_builddir)/target \
@ -67,7 +67,7 @@ endif # HAVE_RUST
if HAVE_PYTHON if HAVE_PYTHON
EXTRA_DIST += gen/c-headers EXTRA_DIST += gen/c-headers
gen/c-headers: gen/c-headers:
cd $(top_srcdir)/rust && python ./gen-c-headers.py cd $(top_srcdir)/rust && $(HAVE_PYTHON) ./gen-c-headers.py
else else
gen/c-headers: gen/c-headers:
endif endif

@ -3,13 +3,13 @@ EXTRA_DIST = setup.py suricatasc.in src/__init__.py src/suricatasc.py
if HAVE_PYTHON if HAVE_PYTHON
all-local: all-local:
mkdir -p $(top_builddir)/scripts/suricatasc/src mkdir -p $(top_builddir)/scripts/suricatasc/src
$(PYTHON) $(srcdir)/setup.py build; $(HAVE_PYTHON) $(srcdir)/setup.py build;
install-exec-local: install-exec-local:
$(PYTHON) $(srcdir)/setup.py install --prefix $(DESTDIR)$(prefix) $(HAVE_PYTHON) $(srcdir)/setup.py install --prefix $(DESTDIR)$(prefix)
clean-local: clean-local:
$(PYTHON) $(srcdir)/setup.py clean; $(HAVE_PYTHON) $(srcdir)/setup.py clean;
rm -rf $(top_builddir)/scripts/suricatasc/build rm -rf $(top_builddir)/scripts/suricatasc/build
uninstall-local: uninstall-local:

Loading…
Cancel
Save