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
Merge pull request #2942 from backwardsEric/sprintf-refactor-floor-save
[hengbandforosx/hengbandosx.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
48fdd0e
..
922d93d
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,6
+1,7
@@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(hengband, 3.0.0.0)
dnl Process this file with autoconf to produce a configure script.
AC_INIT(hengband, 3.0.0.0)
+AC_CONFIG_MACRO_DIRS([m4])
AC_CONFIG_HEADERS(src/autoconf.h)
AC_CONFIG_SRCDIR(src/main.cpp)
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS(src/autoconf.h)
AC_CONFIG_SRCDIR(src/main.cpp)
AM_INIT_AUTOMAKE
@@
-17,7
+18,7
@@
AM_CONDITIONAL(SET_GID, test "$GAMEGROUP" != "")
dnl generate the installation path for the ./lib/ folder
if test "$GAMEGROUP" != ""; then
dnl generate the installation path for the ./lib/ folder
if test "$GAMEGROUP" != ""; then
- MY_EXPAND_DIR(game_libpath, "$datadir/games/$PACKAGE/lib/")
+ MY_EXPAND_DIR(game_libpath, "$data
root
dir/games/$PACKAGE/lib/")
else
MY_EXPAND_DIR(game_libpath, "./lib/")
bindir=".."
else
MY_EXPAND_DIR(game_libpath, "./lib/")
bindir=".."
@@
-44,11
+45,7
@@
AC_SUBST(DEFAULT_VAR_PATH)
dnl Checks for programs.
AC_LANG(C++)
AC_PROG_CXX
dnl Checks for programs.
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.])
-])
+AX_CXX_COMPILE_STDCXX(17, [ext], [mandatory])
PKG_PROG_PKG_CONFIG
AC_ARG_ENABLE(japanese,
PKG_PROG_PKG_CONFIG
AC_ARG_ENABLE(japanese,
@@
-61,7
+58,7
@@
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], worldscore=no
, AC_DEFINE(WORLD_SCORE, 1, [Allow the game to send scores to the score server])
)
+[ --disable-worldscore disable worldscore support], worldscore=no)
AC_ARG_ENABLE(chuukei,
[ --enable-chuukei enable internet chuukei support], AC_DEFINE(CHUUKEI, 1, [Chuukei mode]))
AC_ARG_ENABLE([pch],
AC_ARG_ENABLE(chuukei,
[ --enable-chuukei enable internet chuukei support], AC_DEFINE(CHUUKEI, 1, [Chuukei mode]))
AC_ARG_ENABLE([pch],
@@
-84,10
+81,13
@@
fi
AC_CHECK_LIB(iconv, iconv_open)
AC_CHECK_LIB(iconv, iconv_open)
-AC_CHECK_FILE(/dev/urandom, AC_DEFINE(RNG_DEVICE, "/dev/urandom", [Random Number Generation device file]))
-
+dnl The world score server is currently only available in Japanese.
+if test "$use_japanese" = no; then
+ worldscore=no
+fi
if test "$worldscore" != no; then
PKG_CHECK_MODULES(libcurl, [libcurl])
if test "$worldscore" != no; then
PKG_CHECK_MODULES(libcurl, [libcurl])
+ AC_DEFINE(WORLD_SCORE, 1, [Allow the game to send scores to the score server])
fi
dnl Checks for header files.
fi
dnl Checks for header files.
@@
-132,22
+132,20
@@
if test "$use_japanese" != no; then
fi
fi
fi
fi
-AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h strings.h sys/file.h sys/ioctl.h sys/time.h termio.h unistd.h stdint.h)
+AC_CHECK_HEADERS(fcntl.h sys/file.h sys/ioctl.h sys/time.h termio.h unistd.h stdint.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_PID_T
AC_TYPE_SIZE_T
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_PID_T
AC_TYPE_SIZE_T
-AC_HEADER_TIME
AC_STRUCT_TM
dnl Checks for library functions.
AC_PROG_GCC_TRADITIONAL
AC_FUNC_MEMCMP
AC_STRUCT_TM
dnl Checks for library functions.
AC_PROG_GCC_TRADITIONAL
AC_FUNC_MEMCMP
-AC_TYPE_SIGNAL
AC_FUNC_STRFTIME
AC_FUNC_VPRINTF
AC_CHECK_FUNCS(gethostname mkdir select socket strtol vsnprintf mkstemp usleep)
AC_FUNC_STRFTIME
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_CONFIG_FILES(Makefile src/Makefile lib/Makefile lib/apex/Makefile lib/bone/Makefile lib/data/Makefile lib/edit/Makefile lib/edit/quests/Makefile lib/edit/towns/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)
+AC_OUTPUT()