OSDN Git Service
(root)
/
hengband
/
hengband.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
アイテムを繰り返しコマンドで使っていて, 鑑定による自動破壊等でザック
[hengband/hengband.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
c9ec510
..
54423a2
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-3,7
+3,7
@@
AC_INIT(src/main.c)
AM_CONFIG_HEADER(src/autoconf.h)
AM_CONFIG_HEADER(src/autoconf.h)
-AM_INIT_AUTOMAKE(hengband, 1.
1.0b
)
+AM_INIT_AUTOMAKE(hengband, 1.
7.0
)
AC_ARG_WITH(setgid,
[ --with-setgid=NAME install hengband as group NAME],
AC_ARG_WITH(setgid,
[ --with-setgid=NAME install hengband as group NAME],
@@
-30,7
+30,7
@@
AC_ARG_WITH(libpath,
[ --with-libpath=path specify the path to the Hengband lib folder],
[game_datadir="$withval"])
[ --with-libpath=path specify the path to the Hengband lib folder],
[game_datadir="$withval"])
-AC_DEFINE_UNQUOTED(DEFAULT_PATH, "$game_datadir")
+AC_DEFINE_UNQUOTED(DEFAULT_PATH, "$game_datadir"
, [Path to the Hengband lib folder]
)
DEFAULT_PATH="$game_datadir"
AC_SUBST(DEFAULT_PATH)
DEFAULT_PATH="$game_datadir"
AC_SUBST(DEFAULT_PATH)
@@
-38,16
+38,16
@@
dnl Checks for programs.
AC_PROG_CC
AC_ARG_ENABLE(japanese,
AC_PROG_CC
AC_ARG_ENABLE(japanese,
-[ --disable-japanese build english version], use_japanese=no, [AC_DEFINE(JP
) AC_DEFINE(EUC
)])
+[ --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(xim,
[ --disable-xim disable xim support], use_xim=no, use_xim=yes)
AC_ARG_ENABLE(fontset,
[ --disable-fontset disable fontset support], use_fontset=no, use_fontset=yes)
AC_ARG_ENABLE(worldscore,
AC_ARG_ENABLE(xim,
[ --disable-xim disable xim support], use_xim=no, use_xim=yes)
AC_ARG_ENABLE(fontset,
[ --disable-fontset disable fontset support], use_fontset=no, use_fontset=yes)
AC_ARG_ENABLE(worldscore,
-[ --disable-worldscore disable worldscore support], ,AC_DEFINE(WORLD_SCORE))
+[ --disable-worldscore disable worldscore support], ,AC_DEFINE(WORLD_SCORE
, 1, [Allow the game to send scores to the score server]
))
AC_ARG_ENABLE(chuukei,
AC_ARG_ENABLE(chuukei,
-[ --enable-chuukei enable internet chuukei support], AC_DEFINE(CHUUKEI))
+[ --enable-chuukei enable internet chuukei support], AC_DEFINE(CHUUKEI
, 1, [Chuukei mode]
))
dnl -fno-strength-reduce prevents a bug in some versions of gcc
if test "$GCC" = yes; then
dnl -fno-strength-reduce prevents a bug in some versions of gcc
if test "$GCC" = yes; then
@@
-56,11
+56,11
@@
fi
dnl Checks for libraries.
dnl Replace `main' with a function in -lncurses:
dnl Checks for libraries.
dnl Replace `main' with a function in -lncurses:
-AC_CHECK_LIB(ncurses, initscr, [AC_DEFINE(USE_GCU
) AC_DEFINE(USE_NCURSES
) LIBS="$LIBS -lncurses"])
+AC_CHECK_LIB(ncurses, initscr, [AC_DEFINE(USE_GCU
, 1, [Allow -mGCU environment]) AC_DEFINE(USE_NCURSES, 1, [Use ncurses]
) LIBS="$LIBS -lncurses"])
if test "$ac_cv_lib_ncurses_initscr" != yes; then
if test "$ac_cv_lib_ncurses_initscr" != yes; then
- AC_CHECK_LIB(curses, initscr, [AC_DEFINE(USE_GCU) LIBS="$LIBS -lcurses"])
+ AC_CHECK_LIB(curses, initscr, [AC_DEFINE(USE_GCU
, 1, [Allow -mGCU environment]
) LIBS="$LIBS -lcurses"])
if test "$ac_cv_lib_curses_initscr" != yes; then
if test "$ac_cv_lib_curses_initscr" != yes; then
- AC_CHECK_LIB(termcap, tgetent, [AC_DEFINE(USE_CAP) LIBS="$LIBS -ltermcap"])
+ AC_CHECK_LIB(termcap, tgetent, [AC_DEFINE(USE_CAP
, 1, [Allow -mCAP environment]
) LIBS="$LIBS -ltermcap"])
fi
fi
fi
fi
@@
-68,25
+68,29
@@
dnl Checks for header files.
AC_PATH_XTRA
if test "$have_x" = yes; then
LIBS="$LIBS -lX11"
AC_PATH_XTRA
if test "$have_x" = yes; then
LIBS="$LIBS -lX11"
- AC_DEFINE(USE_X11)
- AC_DEFINE(USE_TRANSPARENCY)
+ AC_DEFINE(USE_X11, 1, [Allow -mX11 environment])
CFLAGS="$X_CFLAGS $CFLAGS"
LDFLAGS="$X_LIBS $LDFLAGS"
CFLAGS="$X_CFLAGS $CFLAGS"
LDFLAGS="$X_LIBS $LDFLAGS"
- if test "$use_japanese" != no; then
- if test "$use_fontset" = yes; then
- AC_DEFINE(USE_FONTSET)
- else
- AC_DEFINE(_JP)
- fi
- if test "$use_xim" = yes; then
- AC_DEFINE(USE_XIM)
+
+ if test "$use_fontset" = yes; then
+ AC_DEFINE(USE_FONTSET, 1, [Use FontSet])
+ else
+ if test "$use_japanese" != no; then
+ AC_DEFINE(USE_JP_FONTSTRUCT, 1, [Use Kanji without FontSet])
fi
fi
- if test "$use_fontset" = yes || test "$use_xim" = yes; then
- AC_DEFINE(USE_LOCALE)
+ fi
+
+ if test "$use_xim" = yes; then
+ AC_DEFINE(USE_XIM, 1, [Use X Imput Method])
+ fi
+
+ if test "$use_fontset" = yes || test "$use_xim" = yes; then
+ AC_DEFINE(USE_LOCALE, 1, [Support Locale])
+ if test "$use_japanese" != no; then
AC_DEFINE(DEFAULT_LOCALE, "ja_JP.eucJP", Default Japanese Locale)
AC_DEFINE(DEFAULT_LOCALE, "ja_JP.eucJP", Default Japanese Locale)
- AC_CHECK_LIB(X11, _Xsetlocale, AC_DEFINE(X_LOCALE))
- AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4")
fi
fi
+ AC_CHECK_LIB(X11, _Xsetlocale, AC_DEFINE(X_LOCALE, 1, [Use XLocale]))
+ AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4")
fi
fi
fi
fi
@@
-106,6
+110,6
@@
AC_FUNC_MEMCMP
AC_TYPE_SIGNAL
AC_FUNC_STRFTIME
AC_FUNC_VPRINTF
AC_TYPE_SIGNAL
AC_FUNC_STRFTIME
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(gethostname mkdir select socket str
str str
tol vasprintf vsnprintf mkstemp usleep)
+AC_CHECK_FUNCS(gethostname mkdir select socket strtol vasprintf 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/font/Makefile lib/xtra/graf/Makefile lib/xtra/music/Makefile lib/xtra/sound/Makefile)