X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=e852a7376fb0789b979cc8ea31e22dd53e04adfb;hb=b1b9616a3147b835beaabfaaa8f2de0db6d12ee9;hp=99b758ab95f49461627581bfcdf13be319e8ab90;hpb=6c394be5d7edab121feba6e3ba70cddf3a090f39;p=gnushogi.git

diff --git a/configure.ac b/configure.ac
index 99b758a..e852a73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([gnushogi],[1.4.1-rc0+],[https://savannah.gnu.org/bugs/?group=gnushogi])
+AC_INIT([gnushogi],[1.4.1+],[https://savannah.gnu.org/bugs/?group=gnushogi])
+AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([gnushogi/gnushogi.h])
 AC_CONFIG_HEADER(config.h)
 
@@ -37,7 +38,8 @@ LIBCURSES=
 AS_IF([test "x$with_curses" != xno],
   [AC_CHECK_LIB([curses], [clrtoeol],
     [AC_SUBST([LIBCURSES], [-lcurses])
-     AC_SUBST([CURSESDSP], [cursesdsp.o])
+     AC_SUBST([CURSESDSP], [gnushogi-cursesdsp.o])
+     AC_SUBST([CURSESDSPMINI], [gnuminishogi-cursesdsp.o])
      AC_DEFINE([HAVE_LIBCURSES], [1],
                [Define if you have lib])
     ],
@@ -57,7 +59,7 @@ AC_CHECK_LIB([termcap], [tgoto])
 
 if [[ $ac_cv_c_compiler_gnu = yes ]]
 then
-WARNINGS="-Wall -Wno-implicit-int -Wstrict-prototypes -ansi -pedantic"
+WARNINGS="-Wall -Wno-implicit-int -Wstrict-prototypes -ansi"
 CEXTRAFLAGS="-fsigned-char -funroll-loops"
 else
 # Who knows what warnings your compiler uses?
@@ -111,15 +113,6 @@ AC_CHECK_FUNCS([setvbuf setlinebuf])
 # Set various user-definable options.
 #
 
-AC_ARG_ENABLE([minishogi],
-[  --enable-minishogi
-        Build gnuminishogi instead of gnushogi (default: no)],
-[AC_DEFINE([MINISHOGI], [], [Define to build gnuminishogi instead of gnushogi])
-AC_SUBST([PROGNAME], [gnuminishogi])
-],
-[AC_SUBST([PROGNAME], [gnushogi])
-])
-
 OPT=
 FIRST_SHOGI_PROGRAM=gnushogi
 SECOND_SHOGI_PROGRAM=gnushogi
@@ -165,22 +158,23 @@ AC_SUBST(SECOND_HOST)
 
 if [[ $enable_xshogi = yes ]]
 then
-XSHOGI=xshogi_compile
-XSHOGIINSTALL=xshogi_install
-XSHOGICLEAN=xshogi_clean
+XSHOGI=xshogi
+XSHOGIMAN=xshogi.6
+XDOCS='$(XDOCS)'
 else
 XSHOGI=
-XSHOGIINSTALL=
-XSHOGICLEAN=
+XSHOGIMAN=
+XDOCS=
 fi
 
 AC_SUBST(XSHOGI)
-AC_SUBST(XSHOGIINSTALL)
-AC_SUBST(XSHOGICLEAN)
+AC_SUBST(XSHOGIMAN)
+AC_SUBST(XDOCS)
 
 ##########
 AC_CONFIG_FILES([Makefile
                  gnushogi/Makefile
+                 win32/config.h
                  doc/Makefile
                  xshogi/Makefile])
 AC_OUTPUT