|
 |
d687ee3 |
diff -up psi4public-0c7ea92851e44ea5df8ac181200c6a277651a8fa/configure.ac.systemboost psi4public-0c7ea92851e44ea5df8ac181200c6a277651a8fa/configure.ac
|
|
|
d687ee3 |
--- psi4public-0c7ea92851e44ea5df8ac181200c6a277651a8fa/configure.ac.systemboost 2014-05-13 01:23:09.168802182 +0300
|
|
|
d687ee3 |
+++ psi4public-0c7ea92851e44ea5df8ac181200c6a277651a8fa/configure.ac 2014-05-13 01:24:03.023429871 +0300
|
|
|
d687ee3 |
@@ -615,28 +615,8 @@ BOOST_LDFLAGS=''
|
|
|
ff0bf58 |
AC_SEARCH_LIBS(clock_gettime, rt, BOOST_LDFLAGS='-lrt')
|
|
|
ff0bf58 |
|
|
|
ff0bf58 |
if test "x${have_boost}" == "x0"; then
|
|
|
ff0bf58 |
- HAVE_BOOST=0
|
|
|
ff0bf58 |
- AC_SUBST(HAVE_BOOST)
|
|
|
ff0bf58 |
-
|
|
|
d687ee3 |
- BOOSTVER='boost_1_55_0'
|
|
|
ff0bf58 |
- AC_SUBST(BOOSTVER)
|
|
|
ff0bf58 |
-
|
|
|
ff0bf58 |
- BOOST_CPPFLAGS='-I$(top_objdir)/boost/$(BOOSTVER)'
|
|
|
ff0bf58 |
-
|
|
|
ff0bf58 |
- BOOST_FILESYSTEM_LIB='../../../boost/$(BOOSTVER)/bin.v2/libs/libboost_filesystem.a'
|
|
|
ff0bf58 |
- BOOST_PYTHON_LIB='../../../boost/$(BOOSTVER)/bin.v2/libs/libboost_python.a'
|
|
|
ff0bf58 |
- BOOST_REGEX_LIB='../../../boost/$(BOOSTVER)/bin.v2/libs/libboost_regex.a'
|
|
|
ff0bf58 |
- BOOST_SERIALIZATION_LIB='../../../boost/$(BOOSTVER)/bin.v2/libs/libboost_serialization.a'
|
|
|
ff0bf58 |
- BOOST_SYSTEM_LIB='../../../boost/$(BOOSTVER)/bin.v2/libs/libboost_system.a'
|
|
|
ff0bf58 |
- BOOST_THREAD_LIB='../../../boost/$(BOOSTVER)/bin.v2/libs/libboost_thread.a'
|
|
|
ff0bf58 |
-
|
|
|
ff0bf58 |
- AC_SUBST(BOOST_CPPFLAGS)
|
|
|
ff0bf58 |
- AC_SUBST(BOOST_LDFLAGS)
|
|
|
ff0bf58 |
- AC_SUBST(BOOST_FILESYSTEM_LIB)
|
|
|
ff0bf58 |
- AC_SUBST(BOOST_REGEX_LIB)
|
|
|
ff0bf58 |
- AC_SUBST(BOOST_SERIALIZATION_LIB)
|
|
|
ff0bf58 |
- AC_SUBST(BOOST_SYSTEM_LIB)
|
|
|
ff0bf58 |
- AC_SUBST(BOOST_THREAD_LIB)
|
|
|
ff0bf58 |
+ echo "Boost is too old."
|
|
|
ff0bf58 |
+ exit 1
|
|
|
ff0bf58 |
fi
|
|
|
ff0bf58 |
|
|
|
ff0bf58 |
PSICPPFLAGS='-I. $(BOOST_CPPFLAGS) -I$(top_objdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I$(top_objdir)/src/lib'
|
|
|
d687ee3 |
@@ -891,7 +871,6 @@ FFLAGS='$(FDBG) $(FOPT) $(FOTH) $(FSTATI
|
|
|
ff0bf58 |
########
|
|
|
ff0bf58 |
|
|
|
ff0bf58 |
AC_CONFIG_FILES([
|
|
|
ff0bf58 |
- boost/Makefile
|
|
|
ff0bf58 |
include/Makefile
|
|
|
ff0bf58 |
Makefile lib/Makefile src/Makefile
|
|
|
ff0bf58 |
src/lib/Makefile src/lib/MakeRules src/lib/MakeVars
|
|
|
d687ee3 |
diff -up psi4public-0c7ea92851e44ea5df8ac181200c6a277651a8fa/Makefile.in.systemboost psi4public-0c7ea92851e44ea5df8ac181200c6a277651a8fa/Makefile.in
|
|
|
d687ee3 |
--- psi4public-0c7ea92851e44ea5df8ac181200c6a277651a8fa/Makefile.in.systemboost 2014-05-13 01:23:09.171802105 +0300
|
|
|
d687ee3 |
+++ psi4public-0c7ea92851e44ea5df8ac181200c6a277651a8fa/Makefile.in 2014-05-13 01:24:27.363810219 +0300
|
|
|
d687ee3 |
@@ -4,7 +4,7 @@ SHELL = /bin/sh
|
|
|
d687ee3 |
|
|
|
ff0bf58 |
default: all
|
|
|
ff0bf58 |
|
|
|
d687ee3 |
-subdirs = boost lib include src
|
|
|
d687ee3 |
+subdirs = lib include src
|
|
|
ff0bf58 |
|
|
|
ff0bf58 |
top_srcdir = @top_srcdir@
|
|
|
d687ee3 |
srcdir = @srcdir@
|