Changeset bbc982 for ThirdParty/mpqc_open/configure.ac

Timestamp:

Mar 2, 2017, 12:28:37 PM (8 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, Subpackage_levmar, Subpackage_vmg, ThirdParty_MPQC_rebuilt_buildsystem, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

c2debc

Parents:

0035ea

git-author:

Frederik Heber <heber@…> (02/11/17 08:17:10)

git-committer:

Frederik Heber <heber@…> (03/02/17 12:28:37)

Message:

Various fixes to mpqc_open's configure.ac.

• using AC_CANONICAL_SYSTEM to set host and target.
• adding missing DEFINES to config header.
• adding more conditionals for mpi, armci, ...
• consolidating rename of several conditionals as COND_...
• src/lib/Makefile.am: conditionals are now generally prefixed with COND_.

File:

• ThirdParty/mpqc_open/configure.ac (modified) (18 diffs)

ThirdParty/mpqc_open/configure.ac ¶

@@ -6 +6 @@
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/bin/mpqc/mpqc.cc])
-AC_CONFIG_HEADER([src/lib/scconfig.h])
+AC_CONFIG_HEADERS([src/lib/scconfig.h])
 AC_CONFIG_MACRO_DIR([m4])
-
-# parallel-tests: use parallel test druver
-# color-tests: us coloring to indicate success/failure when available
-# tar-pax: use newer tar implementation with longer filename (>99 chars)
-AM_INIT_AUTOMAKE([dist-bzip2 1.5 tar-pax subdir-objects])
-
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_INSTALL
-
-# use doxygen
-DX_HTML_FEATURE(ON)
-DX_PS_FEATURE(OFF)
-DX_PDF_FEATURE(OFF)
-DX_INIT_DOXYGEN(MPQC, doxygen.cfg, ${docdir})
 
 # Define these substitions here to keep all version information in one place.
@@ -39 +24 @@
 define([AC_CACHE_SAVE], )dnl for debugging configure.in
 
-dnl AC_CANONICAL_SYSTEM
+AC_CANONICAL_SYSTEM
 
 AC_DEFINE_UNQUOTED(HOST_ARCH, "$host", ["host"])
@@ -63 +48 @@
 
 EXCLUDED_DIRS=
+
+# Checks for programs.
+AC_PROG_CXX
+AC_PROG_INSTALL
+
+# use doxygen
+DX_HTML_FEATURE(ON)
+DX_PS_FEATURE(OFF)
+DX_PDF_FEATURE(OFF)
+DX_INIT_DOXYGEN(MPQC, doxygen.cfg, ${docdir})
+
+# parallel-tests: use parallel test druver
+# color-tests: us coloring to indicate success/failure when available
+# tar-pax: use newer tar implementation with longer filename (>99 chars)
+AM_INIT_AUTOMAKE([dist-bzip2 1.5 tar-pax subdir-objects])
 
 dnl --------- Features ---------
@@ -1148 +1148 @@
 AC_LANG_RESTORE
 fi
+AM_CONDITIONAL(COND_PTHREAD, [test X$HAVE_PTHREAD = Xyes])
 
 AC_MSG_RESULT($HAVE_PTHREAD)
@@ -1154 +1155 @@
   AC_DEFINE(HAVE_PTHREAD, 1, ["use pthreads"])
   EXTRADEFINES="-D_REENTRANT $EXTRADEFINES"
-  AC_CHECK_FUNC(pthread_attr_getstacksize)
-  AC_CHECK_FUNC(pthread_attr_setstacksize)
-  AC_CHECK_FUNC(pthread_attr_setscope)
-  AC_CHECK_FUNC(pthread_attr_getscope)
-  AC_CHECK_FUNC(pthread_attr_setinheritsched)
-  AC_CHECK_FUNC(pthread_attr_getinheritsched)
-  AC_CHECK_FUNC(pthread_attr_setschedpolicy)
-  AC_CHECK_FUNC(pthread_attr_getschedpolicy)
-  AC_CHECK_FUNC(pthread_attr_setschedparam)
-  AC_CHECK_FUNC(pthread_attr_getschedparam)
-  AC_CHECK_FUNC(sched_get_priority_max)
-  AC_CHECK_FUNC(sched_get_priority_min)
-fi
+  AC_CHECK_FUNC(pthread_attr_getstacksize, [HAVE_PTHREAD_ATTR_GETINHERITSCHED=yes], [HAVE_PTHREAD_ATTR_GETINHERITSCHED=no])
+  AC_CHECK_FUNC(pthread_attr_setstacksize, [HAVE_PTHREAD_ATTR_GETSCHEDPARAM=yes], [HAVE_PTHREAD_ATTR_GETSCHEDPARAM=no])
+  AC_CHECK_FUNC(pthread_attr_setscope, [HAVE_PTHREAD_ATTR_GETSCHEDPOLICY=yes], [HAVE_PTHREAD_ATTR_GETSCHEDPOLICY=no])
+  AC_CHECK_FUNC(pthread_attr_getscope, [HAVE_PTHREAD_ATTR_GETSCOPE=yes], [HAVE_PTHREAD_ATTR_GETSCOPE=no])
+  AC_CHECK_FUNC(pthread_attr_setinheritsched, [HAVE_PTHREAD_ATTR_GETSTACKSIZE=yes], [HAVE_PTHREAD_ATTR_GETSTACKSIZE=no])
+  AC_CHECK_FUNC(pthread_attr_getinheritsched, [HAVE_PTHREAD_ATTR_SETINHERITSCHED=yes], [HAVE_PTHREAD_ATTR_SETINHERITSCHED=no])
+  AC_CHECK_FUNC(pthread_attr_setschedpolicy, [HAVE_PTHREAD_ATTR_SETSCHEDPARAM=yes], [HAVE_PTHREAD_ATTR_SETSCHEDPARAM=no])
+  AC_CHECK_FUNC(pthread_attr_getschedpolicy, [HAVE_PTHREAD_ATTR_SETSCHEDPOLICY=yes], [HAVE_PTHREAD_ATTR_SETSCHEDPOLICY=no])
+  AC_CHECK_FUNC(pthread_attr_setschedparam, [HAVE_PTHREAD_ATTR_SETSCOPE=yes], [HAVE_PTHREAD_ATTR_SETSCOPE=no])
+  AC_CHECK_FUNC(pthread_attr_getschedparam, [HAVE_PTHREAD_ATTR_SETSTACKSIZE=yes], [HAVE_PTHREAD_ATTR_SETSTACKSIZE=no])
+  AC_CHECK_FUNC(sched_get_priority_max, [HAVE_SCHED_GET_PRIORITY_MAX=yes], [HAVE_SCHED_GET_PRIORITY_MAX=no])
+  AC_CHECK_FUNC(sched_get_priority_min, [HAVE_SCHED_GET_PRIORITY_MIN=yes], [HAVE_SCHED_GET_PRIORITY_MIN=no])
+fi
+AC_DEFINE(HAVE_PTHREAD_ATTR_GETINHERITSCHED, [$HAVE_PTHREAD_ATTR_GETINHERITSCHED], ["use pthread_attr_getstacksize"])
+AC_DEFINE(HAVE_PTHREAD_ATTR_GETSCHEDPARAM, [$HAVE_PTHREAD_ATTR_GETSCHEDPARAM], ["use pthread_attr_setstacksize"])
+AC_DEFINE(HAVE_PTHREAD_ATTR_GETSCHEDPOLICY, [$HAVE_PTHREAD_ATTR_GETSCHEDPOLICY], ["use pthread_attr_setscope"])
+AC_DEFINE(HAVE_PTHREAD_ATTR_GETSCOPE, [$HAVE_PTHREAD_ATTR_GETSCOPE], ["use pthread_attr_getscope"])
+AC_DEFINE(HAVE_PTHREAD_ATTR_GETSTACKSIZE, [$HAVE_PTHREAD_ATTR_GETSTACKSIZE], ["use pthread_attr_setinheritsched"])
+AC_DEFINE(HAVE_PTHREAD_ATTR_SETINHERITSCHED, [$HAVE_PTHREAD_ATTR_SETINHERITSCHED], ["use pthread_attr_getinheritsched"])
+AC_DEFINE(HAVE_PTHREAD_ATTR_SETSCHEDPARAM, [$HAVE_PTHREAD_ATTR_SETSCHEDPARAM], ["use pthread_attr_setschedpolicy"])
+AC_DEFINE(HAVE_PTHREAD_ATTR_SETSCHEDPOLICY, [$HAVE_PTHREAD_ATTR_SETSCHEDPOLICY], ["use pthread_attr_getschedpolicy"])
+AC_DEFINE(HAVE_PTHREAD_ATTR_SETSCOPE, [$HAVE_PTHREAD_ATTR_SETSCOPE], ["use pthread_attr_setschedparam"])
+AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE, [$HAVE_PTHREAD_ATTR_SETSTACKSIZE], ["use pthread_attr_getschedparam"])
+AC_DEFINE(HAVE_SCHED_GET_PRIORITY_MAX, [$HAVE_SCHED_GET_PRIORITY_MAX], ["use sched_get_priority_max"])
+AC_DEFINE(HAVE_SCHED_GET_PRIORITY_MIN, [$HAVE_SCHED_GET_PRIORITY_MIN], ["use sched_get_priority_max"])
 
 AC_CHECK_LIB(dl,main)
@@ -1223 +1236 @@
   AC_LANG_RESTORE
 fi
+AM_CONDITIONAL(COND_MPI, [test X$HAVE_MPI = Xyes])
 
 if test X$HAVE_MPI != Xyes -a $ALWAYS_USE_MPI = yes; then
@@ -1243 +1257 @@
     AC_DEFINE(HAVE_ARMCI, 1, ["use ARMCI"])
   fi
+AM_CONDITIONAL(COND_ARMCI, [test X$HAVE_ARMCI = Xyes])
 
 if test $DEFAULT_PARALLEL = mtmpi -a X$HAVE_MPI != Xyes; then
@@ -1259 +1274 @@
 AC_SUBST(HAVE_ARMCI)
 AC_SUBST(HAVE_MPIIO)
-AC_SUBST(HAVE_PTHREAD)
 AC_SUBST(EXTRADEFINES)
 
@@ -1288 +1302 @@
 AC_LINK_IFELSE([AC_LANG_PROGRAM([
   #include <iostream>
-  #include <math.h>
-  int main(int,char**) { isnan(1.0); return 0; }
+  #include <math.h>],[isnan(1.0); return 0;
   ])],
   AC_DEFINE(HAVE_ISNAN,1, ["isnan available"])
@@ -1447 +1460 @@
   AC_SUBST(HAVE_SYSV_IPC)
 fi
+AM_CONDITIONAL(COND_SYSV_IPC, [test "X$HAVE_SYSV_IPC" = Xyes])
 
 AC_LANG_SAVE
@@ -1557 +1571 @@
   )]
 )
-AC_SUBST(HAVE_LAPACK)
+AC_DEFINE(HAVE_LAPACK, [$HAVE_LAPACK], ["use lapack"])
 if test X$HAVE_LAPACK != Xyes; then
   echo "Could not link to the LAPACK library.  It can be obtained at"
@@ -1615 +1629 @@
 AC_LANG_CPLUSPLUS
 AC_CHECK_HEADERS(libint/libint.h,
+  HAVE_LIBINT_LIBINT_H=yes
   AC_CHECK_LIB(int,init_libint_base,
     HAVE_LIBINT=yes
@@ -1620 +1635 @@
     AC_SUBST(HAVE_LIBINT)
     LIBS="-lint $LIBS"
-    )
+    ),
+  HAVE_LIBINT_LIBINT_H=no
   )
 AC_LANG_RESTORE
-AM_CONDITIONAL([CONDLIBINT], [test x"$HAVE_LIBINT" = x"1"])
+AC_DEFINE(HAVE_LIBINT_LIBINT_H, [$HAVE_LIBINT_LIBINT_H], ["use libint.h"])
+AM_CONDITIONAL([COND_LIBINT], [test x"$HAVE_LIBINT" = x"1"])
 
 dnl ----------- libr12 library checks --------------
@@ -1630 +1647 @@
 AC_LANG_CPLUSPLUS
 AC_CHECK_HEADERS(libr12/libr12.h,
+  HAVE_LIBR12_LIBR12_H=yes
   AC_CHECK_LIB(r12,init_libr12_base,
     HAVE_LIBR12=yes
@@ -1635 +1653 @@
     AC_SUBST(HAVE_LIBR12)
     LIBS="-lr12 $LIBS"
-    )
+    ),
+  HAVE_LIBR12_LIBR12_H=no
   )
 AC_LANG_RESTORE
-AM_CONDITIONAL([CONDLIBR12], [test x"$HAVE_LIBR12" = x"1"])
+AC_DEFINE(HAVE_LIBR12_LIBR12_H, [$HAVE_LIBR12_LIBR12_H], ["use libr12.h"])
+AM_CONDITIONAL([COND_LIBR12], [test x"$HAVE_LIBR12" = x"1"])
 
 dnl ----------- libderiv library checks --------------
@@ -1645 +1665 @@
 AC_LANG_CPLUSPLUS
 AC_CHECK_HEADERS(libderiv/libderiv.h,
+  HAVE_LIBDERIV_LIBDERIV_H=yes
   AC_CHECK_LIB(deriv,init_libderiv_base,
     HAVE_LIBDERIV=yes
@@ -1650 +1671 @@
     AC_SUBST(HAVE_LIBDERIV)
     LIBS="-lderiv $LIBS"
-    )
+    ),
+  HAVE_LIBDERIV_LIBDERIV_H=no
   )
 AC_LANG_RESTORE
-AM_CONDITIONAL([CONDLIBDERIV], [test x"$HAVE_LIBDERIV" = x"1"])
+AC_DEFINE(HAVE_LIBDERIV_LIBDERIV_H, [$HAVE_LIBDERIV_LIBDERIV_H], ["use libderiv.h"])
+AM_CONDITIONAL([COND_LIBDERIV], [test x"$HAVE_LIBDERIV" = x"1"])
 
 dnl ----------- make sure we have everything for cints and mbptr12 ----------
@@ -1858 +1881 @@
   EXCLUDED_DIRS="-x LIB_CCA -x SRC_LIB_CHEMISTRY_CCA -x SRC_LIB_CHEMISTRY_QC_INTCCA $EXCLUDED_DIRS"
 fi
-AM_CONDITIONAL(CONDCCA, [test x"$have_condcca" = x"true"])
+AM_CONDITIONAL(COND_CCA, [test x"$have_condcca" = x"true"])
 
 dnl --------- Find the list of all sc libraries. ---------