OSDN Git Service
(root)
/
hengbandforosx
/
hengbandosx.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Fix] ピット/ネストが生成されない #1189
[hengbandforosx/hengbandosx.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
5a65785
..
fac2d96
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,8
+1,8
@@
dnl Process this file with autoconf to produce a configure script.
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(hengband,
2.1.5
)
+AC_INIT(hengband,
3.0.0.0
)
AC_CONFIG_HEADERS(src/autoconf.h)
AC_CONFIG_HEADERS(src/autoconf.h)
-AC_CONFIG_SRCDIR(src/main.c)
+AC_CONFIG_SRCDIR(src/main.c
pp
)
AM_INIT_AUTOMAKE
AC_ARG_WITH(setgid,
AM_INIT_AUTOMAKE
AC_ARG_WITH(setgid,
@@
-15,8
+15,6
@@
esac])
AC_SUBST(GAMEGROUP)
AM_CONDITIONAL(SET_GID, test "$GAMEGROUP" != "")
AC_SUBST(GAMEGROUP)
AM_CONDITIONAL(SET_GID, test "$GAMEGROUP" != "")
-AC_LANG_C
-
dnl generate the installation path for the ./lib/ folder
if test "$GAMEGROUP" != ""; then
MY_EXPAND_DIR(game_libpath, "$datadir/games/$PACKAGE/lib/")
dnl generate the installation path for the ./lib/ folder
if test "$GAMEGROUP" != ""; then
MY_EXPAND_DIR(game_libpath, "$datadir/games/$PACKAGE/lib/")
@@
-44,7
+42,14
@@
DEFAULT_VAR_PATH="$game_varpath"
AC_SUBST(DEFAULT_VAR_PATH)
dnl Checks for programs.
AC_SUBST(DEFAULT_VAR_PATH)
dnl Checks for programs.
-AC_PROG_CC
+AC_LANG(C++)
+AC_PROG_CXX
+m4_ifdef([AX_CXX_COMPILE_STDCXX_17], [
+ AX_CXX_COMPILE_STDCXX_17
+], [
+ AC_MSG_ERROR([AX_CXX_COMPILE_STDCXX_17 macro is not defined. You need to install autoconf-archive.])
+])
+PKG_PROG_PKG_CONFIG
AC_ARG_ENABLE(japanese,
[ --disable-japanese build english version], use_japanese=no, [AC_DEFINE(JP, 1, [Enable Japanese]) AC_DEFINE(EUC, 1, [Use Extended Unix Code])])
AC_ARG_ENABLE(japanese,
[ --disable-japanese build english version], use_japanese=no, [AC_DEFINE(JP, 1, [Enable Japanese]) AC_DEFINE(EUC, 1, [Use Extended Unix Code])])
@@
-56,9
+61,13
@@
AC_ARG_ENABLE(fontset,
AC_ARG_ENABLE([xft],
AS_HELP_STRING([--enable-xft], [Enable xft support]))
AC_ARG_ENABLE(worldscore,
AC_ARG_ENABLE([xft],
AS_HELP_STRING([--enable-xft], [Enable xft support]))
AC_ARG_ENABLE(worldscore,
-[ --disable-worldscore disable worldscore support],
,
AC_DEFINE(WORLD_SCORE, 1, [Allow the game to send scores to the score server]))
+[ --disable-worldscore disable worldscore support],
worldscore=no,
AC_DEFINE(WORLD_SCORE, 1, [Allow the game to send scores to the score server]))
AC_ARG_ENABLE(chuukei,
[ --enable-chuukei enable internet chuukei support], AC_DEFINE(CHUUKEI, 1, [Chuukei mode]))
AC_ARG_ENABLE(chuukei,
[ --enable-chuukei enable internet chuukei support], AC_DEFINE(CHUUKEI, 1, [Chuukei mode]))
+AC_ARG_ENABLE([pch],
+[ --disable-pch disable use of precompiled headers],
+enable_pch=no, enable_pch=yes)
+AM_CONDITIONAL([PCH], [test x$enable_pch = xyes])
dnl Checks for libraries.
dnl Replace `main' with a function in -lncurses:
dnl Checks for libraries.
dnl Replace `main' with a function in -lncurses:
@@
-77,6
+86,10
@@
AC_CHECK_LIB(iconv, iconv_open)
AC_CHECK_FILE(/dev/urandom, AC_DEFINE(RNG_DEVICE, "/dev/urandom", [Random Number Generation device file]))
AC_CHECK_FILE(/dev/urandom, AC_DEFINE(RNG_DEVICE, "/dev/urandom", [Random Number Generation device file]))
+if test "$worldscore" != no; then
+ PKG_CHECK_MODULES(libcurl, [libcurl])
+fi
+
dnl Checks for header files.
AC_PATH_XTRA
if test "$have_x" = yes; then
dnl Checks for header files.
AC_PATH_XTRA
if test "$have_x" = yes; then
@@
-137,4
+150,4
@@
AC_FUNC_STRFTIME
AC_FUNC_VPRINTF
AC_CHECK_FUNCS(gethostname mkdir select socket strtol vsnprintf mkstemp usleep)
AC_FUNC_VPRINTF
AC_CHECK_FUNCS(gethostname mkdir select socket strtol vsnprintf mkstemp usleep)
-AC_OUTPUT(Makefile src/Makefile lib/Makefile lib/apex/Makefile lib/bone/Makefile lib/data/Makefile lib/edit/Makefile lib/file/Makefile lib/help/Makefile lib/info/Makefile lib/pref/Makefile lib/save/Makefile lib/script/Makefile lib/user/Makefile lib/xtra/Makefile lib/xtra/
font/Makefile lib/xtra/
graf/Makefile lib/xtra/music/Makefile lib/xtra/sound/Makefile)
+AC_OUTPUT(Makefile src/Makefile lib/Makefile lib/apex/Makefile lib/bone/Makefile lib/data/Makefile lib/edit/Makefile lib/file/Makefile lib/help/Makefile lib/info/Makefile lib/pref/Makefile lib/save/Makefile lib/script/Makefile lib/user/Makefile lib/xtra/Makefile lib/xtra/graf/Makefile lib/xtra/music/Makefile lib/xtra/sound/Makefile)