Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
533d9c09
Commit
533d9c09
authored
Nov 16, 2017
by
lhausamm
Browse files
Make install python version independant
parent
3d65b710
Changes
2
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
533d9c09
...
...
@@ -90,9 +90,11 @@ AC_ARG_WITH([python],
have_python="no"
if test "x$with_python" != "xno"; then
if test "x$with_python" != "xyes" -a "x$with_python" != "x"; then
PYTHON_INCS="-I$with_python/include/python3.6m/"
PYTHON_INCS=`$with_python/bin/python3-config --includes`
PYTHON_LIBS=`$with_python/bin/python3-config --ldflags`
else
PYTHON_INCS=""
PYTHON_LIBS=""
fi
OLD_CPPFLAGS="$CPPFLAGS"
...
...
@@ -101,6 +103,7 @@ if test "x$with_python" != "xno"; then
have_python="yes"
AC_SUBST([PYTHON_INCS])
AC_SUBST([PYTHON_LIBS])
AC_CHECK_HEADER(
Python.h,
AC_DEFINE([SWIFT_PYTHON_WRAPPER],1,[Enable the python wrapper]),
...
...
src/Makefile.am
View file @
533d9c09
...
...
@@ -19,7 +19,7 @@
AM_CFLAGS
=
$(HDF5_CPPFLAGS)
$(PYTHON_INCS)
# Assign a "safe" version number
AM_LDFLAGS
=
$(HDF5_LDFLAGS)
$(FFTW_LIBS)
-version-info
0:0:0
AM_LDFLAGS
=
$(HDF5_LDFLAGS)
$(FFTW_LIBS)
-version-info
0:0:0
$(PYTHON_LIBS)
# The git command, if available.
GIT_CMD
=
@GIT_CMD@
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment