From 8c8b00176db39b4431254a44aa44fc273adc16c7 Mon Sep 17 00:00:00 2001
From: "Kurt A. O'Hearn" <ohearnku@msu.edu>
Date: Mon, 25 Jul 2016 12:31:03 -0700
Subject: [PATCH] Update autotools defaults.
---
PG-PuReMD/configure.ac | 5 +++--
PuReMD-GPU/configure.ac | 5 +++--
PuReMD/configure.ac | 9 +++++----
configure.ac | 6 ++----
sPuReMD/configure.ac | 5 +++--
5 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/PG-PuReMD/configure.ac b/PG-PuReMD/configure.ac
index 6f07b964..8b29f9ab 100644
--- a/PG-PuReMD/configure.ac
+++ b/PG-PuReMD/configure.ac
@@ -5,7 +5,8 @@ AC_PREREQ([2.69])
AC_INIT([PG-PuReMD], [1.0], [ohearnku@msu.edu hma@msu.edu])
AM_INIT_AUTOMAKE([1.15 subdir-objects -Wall -Werror foreign])
-AM_SILENT_RULES([yes])
+# Enable silent build rules by default.
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERBOSITY],[1])])
#LT_PREREQ([2.2])
#LT_INIT([dlopen])
@@ -23,7 +24,7 @@ AC_DEFUN([CONFIGURE_HEADLINE],
])
# Checks for programs.
-AC_PROG_CC
+AC_PROG_CC([icc gcc cc])
AC_PROG_CPP
# Checks for libraries.
diff --git a/PuReMD-GPU/configure.ac b/PuReMD-GPU/configure.ac
index ecd9a379..11ed3370 100644
--- a/PuReMD-GPU/configure.ac
+++ b/PuReMD-GPU/configure.ac
@@ -5,7 +5,8 @@ AC_PREREQ([2.69])
AC_INIT([PuReMD-GPU], [1.0], [ohearnku@msu.edu hma@msu.edu])
AM_INIT_AUTOMAKE([1.15 subdir-objects -Wall -Werror foreign])
-AM_SILENT_RULES([yes])
+# Enable silent build rules by default.
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERBOSITY],[1])])
#LT_PREREQ([2.2])
#LT_INIT([dlopen])
@@ -23,7 +24,7 @@ AC_DEFUN([CONFIGURE_HEADLINE],
])
# Checks for programs.
-AC_PROG_CC
+AC_PROG_CC([icc gcc cc])
AC_PROG_CPP
# Checks for libraries.
diff --git a/PuReMD/configure.ac b/PuReMD/configure.ac
index bbc3c142..213b239f 100644
--- a/PuReMD/configure.ac
+++ b/PuReMD/configure.ac
@@ -5,7 +5,8 @@ AC_PREREQ([2.69])
AC_INIT([PuReMD], [1.0], [ohearnku@msu.edu hma@msu.edu])
AM_INIT_AUTOMAKE([1.15 subdir-objects -Wall -Werror foreign])
-AM_SILENT_RULES([yes])
+# Enable silent build rules by default.
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERBOSITY],[1])])
#LT_PREREQ([2.2])
#LT_INIT([dlopen])
@@ -23,7 +24,7 @@ AC_DEFUN([CONFIGURE_HEADLINE],
])
# Checks for programs.
-AC_PROG_CC
+AC_PROG_CC([cc icc gcc])
AC_PROG_CPP
# Checks for libraries.
@@ -68,14 +69,14 @@ CFLAGS="$sav_CFLAGS"
#
MPI_CFLAGS=
MPI_LDFLAGS=
-if test "$mpi_vendor" = "OpenMPI"
+if test "x$mpi_vendor" = "xOpenMPI"
then
MPI_CFLAGS=`$MPICC --showme:compile`
MPI_LDFLAGS=`$MPICC --showme:link`
AC_MSG_NOTICE([OpenMPI found])
AC_MSG_NOTICE([MPI_CFLAGS=$MPI_CFLAGS])
AC_MSG_NOTICE([MPI_LDFLAGS=$MPI_LDFLAGS])
-elif test "$mpi_vendor" = "MPICH"
+elif test "x$mpi_vendor" = "xMPICH"
then
# build MPI_CFLAGS
tmp=`$MPICC -compile-info | awk '{$1=""; print $0 }'`
diff --git a/configure.ac b/configure.ac
index 5b828f47..457049c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,15 +5,13 @@ AC_PREREQ([2.69])
AC_INIT([Purdue Molecular Dynamics Suite], [1.0], [ohearnku@msu.edu hma@msu.edu])
AM_INIT_AUTOMAKE([1.15 -Wall -Werror])
-AM_SILENT_RULES([yes])
+# Enable silent build rules by default.
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERBOSITY],[1])])
LT_PREREQ([2.2])
LT_INIT([dlopen])
AC_CONFIG_MACRO_DIR([m4])
-# Enable silent build rules by default.
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERBOSITY],[1])])
-
AC_DEFUN([AC_PROG_PDFLATEX],
[AC_ARG_VAR([PDFLATEX], [LaTeX PDF generation program])dnl
AC_CHECK_PROGS([PDFLATEX], [pdflatex])
diff --git a/sPuReMD/configure.ac b/sPuReMD/configure.ac
index cd7e0eb1..078169a4 100644
--- a/sPuReMD/configure.ac
+++ b/sPuReMD/configure.ac
@@ -5,7 +5,8 @@ AC_PREREQ([2.69])
AC_INIT([sPuReMD], [1.0], [ohearnku@msu.edu hma@msu.edu])
AM_INIT_AUTOMAKE([1.15 subdir-objects -Wall -Werror foreign])
-AM_SILENT_RULES([yes])
+# Enable silent build rules by default.
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERBOSITY],[1])])
#LT_PREREQ([2.2])
#LT_INIT([dlopen])
@@ -15,7 +16,7 @@ AC_CONFIG_SRCDIR([src/traj.h])
AC_CONFIG_HEADERS([src/config.h])
# Checks for programs.
-AC_PROG_CC
+AC_PROG_CC([icc gcc cc])
AC_PROG_CPP
# Checks for libraries.
--
GitLab