X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=configure.in;h=bb57a1154a48c87afdaeb0120678abaf70977fb5;hb=3b3300befbf7f67e6b65f29cf31d06344427b312;hp=380c68919580acf958d67186b422cfd89e5a6921;hpb=5335ad94d150ac1b6d2a52048b0bbb357017780f;p=hengband%2Fhengband.git

diff --git a/configure.in b/configure.in
index 380c68919..bb57a1154 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.5.4)
+AM_INIT_AUTOMAKE(hengband, 1.7.2)
 
 AC_ARG_WITH(setgid,
 [  --with-setgid=NAME      install hengband as group NAME],
@@ -69,24 +69,28 @@ AC_PATH_XTRA
 if test "$have_x" = yes; then
   LIBS="$LIBS -lX11"
   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, 1, [Use FontSet])
-    else
-      AC_DEFINE(_JP, 1, [Use Kanji without FontSet])
-    fi
-    if test "$use_xim" = yes; then
-      AC_DEFINE(USE_XIM, 1, [Use X Imput Method])
+
+  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, 1, [Support 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, 1, [Use XLocale]))
-      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
 
@@ -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)