iucar / rpms / psi4

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