From b2544ea780d5f56ac23e92125d366cc8fa645c05 Mon Sep 17 00:00:00 2001 From: mogami Date: Tue, 22 Oct 2002 13:06:46 +0000 Subject: [PATCH] =?utf8?q?AC=5FDEFINE()=E3=81=AE=E4=B8=AD=E3=81=A7?= =?utf8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E5=AE=9A=E7=BE=A9?= =?utf8?q?=E3=81=99=E3=82=8C=E3=81=B0=E3=80=81acconfig.h=20=E3=81=AF?= =?utf8?q?=E3=81=84=E3=82=89=E3=81=AA=E3=81=84=E3=81=AE=E3=81=A7=E5=89=8A?= =?utf8?q?=E9=99=A4=E3=80=82=20=E3=81=93=E3=82=8C=E3=81=AF=E3=80=81?= =?utf8?q?=E3=81=9D=E3=82=82=E3=81=9D=E3=82=82=E3=82=B3=E3=83=A1=E3=83=B3?= =?utf8?q?=E3=83=88=E3=82=92=E6=9B=B8=E3=81=8F=E7=82=BA=E3=81=AE=E3=83=95?= =?utf8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=A0=E3=81=A3=E3=81=9F=E3=82=89?= =?utf8?q?=E3=81=97=E3=81=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- acconfig.h | 15 --------------- configure.in | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 29 deletions(-) delete mode 100644 acconfig.h diff --git a/acconfig.h b/acconfig.h deleted file mode 100644 index 9bad6642e..000000000 --- a/acconfig.h +++ /dev/null @@ -1,15 +0,0 @@ -#undef USE_GCU -#undef USE_CAP -#undef USE_NCURSES -#undef USE_X11 -#undef JP -#undef EUC -#undef USE_LOCALE -#undef USE_XIM -#undef USE_FONTSET -#undef _JP -#undef X_LOCALE -#undef CHUUKEI -#undef WORLD_SCORE -#undef USE_TRANSPARENCY -#undef DEFAULT_PATH diff --git a/configure.in b/configure.in index b0acd64ed..9b1e6d0c2 100644 --- a/configure.in +++ b/configure.in @@ -30,7 +30,7 @@ AC_ARG_WITH(libpath, [ --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) @@ -38,16 +38,16 @@ dnl Checks for programs. 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, -[ --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, -[ --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 @@ -56,11 +56,11 @@ fi 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 - 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 - 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 @@ -68,23 +68,23 @@ dnl Checks for header files. 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]) + AC_DEFINE(USE_TRANSPARENCY, 1, [Use transparency mode]) CFLAGS="$X_CFLAGS $CFLAGS" LDFLAGS="$X_LIBS $LDFLAGS" if test "$use_japanese" != no; then if test "$use_fontset" = yes; then - AC_DEFINE(USE_FONTSET) + AC_DEFINE(USE_FONTSET, 1, [Use FontSet]) else - AC_DEFINE(_JP) + AC_DEFINE(_JP, 1, [Use Kanji without FontSet]) fi if test "$use_xim" = yes; then - AC_DEFINE(USE_XIM) + AC_DEFINE(USE_XIM, 1, [Use X Imput Method]) fi if test "$use_fontset" = yes || test "$use_xim" = yes; then - AC_DEFINE(USE_LOCALE) + AC_DEFINE(USE_LOCALE, 1, [Support Locale]) AC_DEFINE(DEFAULT_LOCALE, "ja_JP.eucJP", Default Japanese Locale) - AC_CHECK_LIB(X11, _Xsetlocale, AC_DEFINE(X_LOCALE)) + AC_CHECK_LIB(X11, _Xsetlocale, AC_DEFINE(X_LOCALE, 1, [Use XLocale])) AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4") fi fi -- 2.11.0