Merge branch 'blaming-the-tools'

Build system overhaul: attoconf from python 2->3, add CMake

Merge request !280

1 files changed, 5 insertions, 5 deletions

diff --git a/configure b/configure
index aa1d0fd..468f029 100755
--- a/configure
+++ b/configure
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 #   Copyright 2013 Ben Longbons <b.r.longbons@gmail.com>
 #
@@ -17,8 +17,6 @@
 #   You should have received a copy of the GNU General Public License
 #   along with attoconf.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function, division, absolute_import
-
 import os
 import sys
 
@@ -90,7 +88,7 @@ class Configuration(Cxx, Install, ConfigHash, Templates):
         # 2) Modern distros ship gtest-1.13+. It requires C++14+, while
         #    TMWA is currently a C++0x codebase.
         self.add_option('GTEST_DIR',
-                init=os.path.join(os.getcwd(), 'deps/googletest/googletest'),
+                init=os.path.join(os.path.abspath(self.srcdir), 'deps/googletest/googletest'),
                 # http://code.google.com/p/googletest/wiki/FAQ#Why_is_it_not_recommended_to_install_a_pre-compiled_copy_of_Goog
                 type=filepath, check=lambda build, GTEST_DIR: None,
                 help='Location of Google Test sources, must contain src/gtest-all.cc (linking to a precompiled library is NOT supported)', hidden=False)
@@ -112,7 +110,9 @@ def main():
     srcdir = os.path.dirname(sys.argv[0])
     proj = Configuration(
             srcdir=srcdir,
-            template_files=['Makefile'],
+            # Note that src/conf/version.hpp is made later, by Makefile.
+            # See version.mk (included by Makefile).
+            template_files=['Makefile', 'src/conf/install.hpp'],
     )
     proj.set_package('tmwa', 'The Mana World (Athena server)');
     proj.jiggle()