X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=configure.in;h=b0fe1129d5d0a7d9f84acc2151cd5718d37e7f9c;hb=d4c867387fedcd5f2c1af9943405e97b6cecd0c9;hp=69e4bf5af93c544dd4703a515188b0ff827e964c;hpb=bbfc1c44f1ac1a605146d93d02886029baa906e8;p=hengband%2Fhengband.git

diff --git a/configure.in b/configure.in
index 69e4bf5af..b0fe1129d 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_INIT(src/main.c)
 
 AM_CONFIG_HEADER(src/autoconf.h)
 
-AM_INIT_AUTOMAKE(hengband, 1.1.0)
+AM_INIT_AUTOMAKE(hengband, 1.7.2)
 
 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"])
 
-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,30 +68,34 @@ 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])
   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
-    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_CHECK_LIB(X11, _Xsetlocale, AC_DEFINE(X_LOCALE))
-      AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4")
     fi
+    AC_CHECK_LIB(X11, _Xsetlocale, AC_DEFINE(X_LOCALE, 1, [Use XLocale]))
+    AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4")
   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)
+AC_CHECK_HEADERS(fcntl.h strings.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
@@ -106,6 +110,6 @@ AC_FUNC_MEMCMP
 AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(gethostname mkdir select socket strstr strtol 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)