Browse Source

Merge pull request #2546 from lighta/fix_configure

Add check in configure to ensure c++ compiler
Jittapan Pluemsumran 7 years ago
parent
commit
09519f3b37
2 changed files with 142 additions and 549 deletions
  1. 140 548
      configure
  2. 2 1
      configure.in

File diff suppressed because it is too large
+ 140 - 548
configure


+ 2 - 1
configure.in

@@ -4,6 +4,8 @@
 AC_INIT(rAthena)
 AC_INIT(rAthena)
 AC_REVISION($Revision$)
 AC_REVISION($Revision$)
 AC_PREREQ([2.59])
 AC_PREREQ([2.59])
+AC_LANG([C++])
+AC_LANG_COMPILER_REQUIRE
 AC_CONFIG_SRCDIR([src/common/cbasetypes.h])
 AC_CONFIG_SRCDIR([src/common/cbasetypes.h])
 AC_CONFIG_FILES([Makefile src/common/Makefile])
 AC_CONFIG_FILES([Makefile src/common/Makefile])
 AC_CONFIG_FILES([3rdparty/mt19937ar/Makefile 3rdparty/libconfig/Makefile 3rdparty/yaml-cpp/Makefile])
 AC_CONFIG_FILES([3rdparty/mt19937ar/Makefile 3rdparty/libconfig/Makefile 3rdparty/yaml-cpp/Makefile])
@@ -437,7 +439,6 @@ AC_PROG_CXX
 AC_PATH_PROG(AR, ar)
 AC_PATH_PROG(AR, ar)
 AC_LANG([C++])
 AC_LANG([C++])
 
 
-
 CFLAGS="$CFLAGS -pipe -ffast-math -Wall"
 CFLAGS="$CFLAGS -pipe -ffast-math -Wall"
 CPPFLAGS="$CPPFLAGS -I../common"
 CPPFLAGS="$CPPFLAGS -I../common"
 CXXFLAGS="$CXXFLAGS -std=c++11"
 CXXFLAGS="$CXXFLAGS -std=c++11"

Some files were not shown because too many files changed in this diff