Merge fd22b66 into 4c3b409

NOAA-GFDL · Feb 22, 2023 · 92b95a0 · 92b95a0
2 parents 4c3b409 + fd22b66
commit 92b95a0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/ac/Makefile.in b/ac/Makefile.in
@@ -6,6 +6,7 @@
 
 FC = @FC@
 LD = @FC@
+PYTHON = @PYTHON@
 MAKEDEP = @MAKEDEP@
 
 DEFS = @DEFS@
@@ -32,7 +33,7 @@ rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(su
 .PHONY: depend
 depend: Makefile.dep
 Makefile.dep: $(MAKEDEP) $(call rwildcard,$(SRC_DIRS),*.h *.c *.inc *.F90)
-	$(MAKEDEP) -o Makefile.dep -e $(SRC_DIRS)
+	$(PYTHON) $(MAKEDEP) -o Makefile.dep -e $(SRC_DIRS)
 
 
 # Delete any files associated with configuration (including the Makefile).

diff --git a/ac/configure.ac b/ac/configure.ac
@@ -221,6 +221,13 @@ AC_COMPILE_IFELSE(
 )
 
 
+# Verify that Python is available
+AC_PATH_PROGS([PYTHON], [python python3 python2], [
+  AC_MSG_ERROR([Could not find python.])
+])
+AC_ARG_VAR([PYTHON], [Python interpreter command])
+
+
 # Verify that makedep is available
 AC_PATH_PROG([MAKEDEP], [makedep], [${srcdir}/ac/makedep])
 AC_SUBST([MAKEDEP])

diff --git a/ac/deps/Makefile.fms.in b/ac/deps/Makefile.fms.in
@@ -8,6 +8,7 @@ CC = @CC@
 FC = @FC@
 LD = @FC@
 AR = @AR@
+PYTHON = @PYTHON@
 MAKEDEP = @MAKEDEP@
 
 DEFS = @DEFS@
@@ -22,4 +23,4 @@ ARFLAGS = @ARFLAGS@
 .PHONY: depend
 depend: Makefile.dep
 Makefile.dep:
-	$(MAKEDEP) -o Makefile.dep -e -x libFMS.a @srcdir@
+	$(PYTHON) $(MAKEDEP) -o Makefile.dep -e -x libFMS.a @srcdir@
diff --git a/ac/deps/configure.fms.ac b/ac/deps/configure.fms.ac
@@ -158,7 +158,14 @@ AX_FC_ALLOW_ARG_MISMATCH
 FCFLAGS="$FCFLAGS $ALLOW_ARG_MISMATCH_FCFLAGS"
 
 
-# Verify makedep
+# Verify that Python is available
+AC_PATH_PROGS([PYTHON], [python python3 python2], [
+  AC_MSG_ERROR([Could not find python.])
+])
+AC_ARG_VAR([PYTHON], [Python interpreter command])
+
+
+# Verify that makedep is available
 AC_PATH_PROGS([MAKEDEP], [makedep], [], ["${PATH}:${srcdir}/../../.."])
 AS_IF([test -n "${MAKEDEP}"], [
   AC_SUBST([MAKEDEP])