scnc
/
quantum-espresso
mirror of https://gitlab.com/QEF/q-e.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'newautotools' into 'master' 

configure.ac now compatible with autoconf 2.69

See merge request QEF/q-e!7
This commit is contained in:
giannozz 2018-01-24 16:49:00 +00:00
parent 23893921e1 fb0dc5b032
commit 09b40c5c46
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install/configure.ac
View File

@ -8,7 +8,6 @@
AC_INIT(ESPRESSO, 6.1, , espresso)
# Do not use Autoconf 2.69
AC_PREREQ(2.60)
AC_CONFIG_MACRO_DIR([m4/])
@ -28,7 +27,7 @@ X_AC_QE_ARCH()
try_dflags=""
# "-I../include" is required by IOTK ...
try_iflags="-I\$(TOPDIR)/include -I\$(TOPDIR)/FoX/finclude -I\$(TOPDIR)/S3
try_iflags="-I\$(TOPDIR)/include -I\$(TOPDIR)/FoX/finclude -I\$(TOPDIR)/S3DE/iotk/include/"
# Checking archiver...
X_AC_QE_AR()

2
install/m4/x_ac_qe_mpif90.m4
View File

@ -1,7 +1,7 @@
# Copyright (C) 2001-2016 Quantum ESPRESSO Foundation
AC_DEFUN([X_AC_QE_MPIF90], [
AC_REQUIRE([AC_PROG_FC])
AC_ARG_ENABLE(parallel,
[AS_HELP_STRING([--enable-parallel],
[compile for parallel execution if possible (default: yes)])],