Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SWIFTsim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SWIFT
SWIFTsim
Commits
7bcc6455
Commit
7bcc6455
authored
7 years ago
by
lhausamm
Browse files
Options
Downloads
Patches
Plain Diff
Remove python in makefile
parent
533d9c09
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!469
Update cooling grackle
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure.ac
+31
-31
31 additions, 31 deletions
configure.ac
src/Makefile.am
+2
-2
2 additions, 2 deletions
src/Makefile.am
with
33 additions
and
33 deletions
configure.ac
+
31
−
31
View file @
7bcc6455
...
...
@@ -79,38 +79,38 @@ if test "$enable_ipo" = "yes"; then
fi
# Compiling with Python wrapper
AC_ARG_WITH([python],
[AS_HELP_STRING([--with-python=PATH],
[Root directory of python3]
)],
[],
[with_python="no"]
)
have_python="no"
if test "x$with_python" != "xno"; then
if test "x$with_python" != "xyes" -a "x$with_python" != "x"; then
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"
CPPFLAGS="$CPPFLAGS $PYTHON_INCS"
#
AC_ARG_WITH([python],
#
[AS_HELP_STRING([--with-python=PATH],
#
[Root directory of python3]
#
)],
#
[],
#
[with_python="no"]
#
)
#
have_python="no"
#
if test "x$with_python" != "xno"; then
#
if test "x$with_python" != "xyes" -a "x$with_python" != "x"; then
#
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"
#
CPPFLAGS="$CPPFLAGS $PYTHON_INCS"
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]),
AC_MSG_ERROR(something is wrong with the python library! PYTHON_INCS=$PYTHON_INCS)
)
CPPFLAGS="$OLD_CPPFLAGS"
fi
#
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]),
#
AC_MSG_ERROR(something is wrong with the python library! PYTHON_INCS=$PYTHON_INCS)
#
)
#
CPPFLAGS="$OLD_CPPFLAGS"
#
fi
# Check for MPI. Need to do this before characterising the compiler (C99 mode),
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.am
+
2
−
2
View file @
7bcc6455
...
...
@@ -16,10 +16,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Add the debug flag to the whole thing
AM_CFLAGS
=
$(
HDF5_CPPFLAGS
)
$(
PYTHON_INCS
)
AM_CFLAGS
=
$(
HDF5_CPPFLAGS
)
# Assign a "safe" version number
AM_LDFLAGS
=
$(
HDF5_LDFLAGS
)
$(
FFTW_LIBS
)
-version-info
0:0:0
$(
PYTHON_LIBS
)
AM_LDFLAGS
=
$(
HDF5_LDFLAGS
)
$(
FFTW_LIBS
)
-version-info
0:0:0
# The git command, if available.
GIT_CMD
=
@GIT_CMD@
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment