X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=bae9d3d8190fd5a29b912d49b5029ad3bc627bea;hb=a20e51b7c79f22d3e30aa2a6a7abc73d8c5d85eb;hp=2f21d604f52519edb367fce5ed1d51a3538e6ca7;hpb=d73f8bba14816990072cd219147d2dc9a498d614;p=gnushogi.git

diff --git a/configure.ac b/configure.ac
index 2f21d60..bae9d3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([gnushogi],[1.4.0+],[https://savannah.gnu.org/bugs/?group=gnushogi])
+AC_INIT([gnushogi],[1.4.1-rc0+],[https://savannah.gnu.org/bugs/?group=gnushogi])
 AC_CONFIG_SRCDIR([gnushogi/gnushogi.h])
 AC_CONFIG_HEADER(config.h)
 
@@ -47,8 +47,8 @@ AS_IF([test "x$with_curses" != xno],
     [-ltermcap])])
 
 # other libraries.
-AC_CHECK_LIB(m, pow)
-AC_CHECK_LIB(termcap, tgoto)
+AC_CHECK_LIB([m], [pow])
+AC_CHECK_LIB([termcap], [tgoto])
 
 
 
@@ -58,13 +58,13 @@ AC_CHECK_LIB(termcap, tgoto)
 if [[ $ac_cv_c_compiler_gnu = yes ]]
 then
 WARNINGS="-Wall -Wno-implicit-int -Wstrict-prototypes -ansi -pedantic"
-CEXTRAFLAGS="-fsigned-char -funroll-loops \$(HASH)"
+CEXTRAFLAGS="-fsigned-char -funroll-loops"
 # For profiling targets:
-CEXTRAFLAGS2="-fsigned-char -pg -fprofile-arcs -ftest-coverage \$(HASH)"
+CEXTRAFLAGS2="-fsigned-char -pg -fprofile-arcs -ftest-coverage"
 else
 # Who knows what warnings your compiler uses?
 WARNINGS=
-CEXTRAFLAGS="\$(HASH)"
+CEXTRAFLAGS=
 fi
 
 AC_SUBST(WARNINGS)
@@ -107,22 +107,22 @@ AC_FUNC_SETVBUF_REVERSED
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([dup2 gethostname gettimeofday memset pow strcasecmp])
 AC_CHECK_FUNCS([strchr strerror strrchr strstr strtol])
-AC_CHECK_FUNCS(memcpy bcopy)
-AC_CHECK_FUNCS(setlinebuf setvbuf)
+AC_CHECK_FUNCS([memcpy bcopy])
+AC_CHECK_FUNCS([setlinebuf setvbuf])
 
 
 #
 # Set various user-definable options.
 #
-# Valid OPT settings:
-# --with-top-part-bitmaps
-#
-# Other settings:
-# --with-first-shogi-program=PROGNAME
-# --with-second-shogi-program=PROGNAME
-# --with-first-host=HOSTNAME
-# --with-second-host=HOSTNAME
-#
+
+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
@@ -130,36 +130,36 @@ SECOND_SHOGI_PROGRAM=gnushogi
 FIRST_HOST=localhost
 SECOND_HOST=localhost
 
-AC_ARG_ENABLE(xshogi,
+AC_ARG_ENABLE([xshogi],
 AS_HELP_STRING([--enable-xshogi],
   [compile the xshogi graphical interface to GNU shogi (default: no)]),
-enable_xshogi=$enableval,
-enable_xshogi=no)
+[enable_xshogi=$enableval],
+[enable_xshogi=no])
 
-AC_ARG_WITH(top-part-bitmaps,
+AC_ARG_WITH([top-part-bitmaps],
 AS_HELP_STRING([--with-top-part-bitmaps],
   [use top part of Kanji bitmaps only in xshogi]),
-OPT=-DTOP_PART_BITMAPS)
+[OPT=-DTOP_PART_BITMAPS])
 
-AC_ARG_WITH(first-shogi-program,
+AC_ARG_WITH([first-shogi-program],
 AS_HELP_STRING([--with-first-shogi-program=PROGNAME],
   [use PROGNAME as the first shogi program in xshogi (default: gnushogi)]),
-FIRST_SHOGI_PROGRAM=$withval)
+[FIRST_SHOGI_PROGRAM=$withval])
 
-AC_ARG_WITH(second-shogi-program,
+AC_ARG_WITH([second-shogi-program],
 AS_HELP_STRING([--with-second-shogi-program=PROGNAME],
   [use PROGNAME as the second shogi program in xshogi (default: gnushogi)]),
-SECOND_SHOGI_PROGRAM=$withval)
+[SECOND_SHOGI_PROGRAM=$withval])
 
-AC_ARG_WITH(first-host,
+AC_ARG_WITH([first-host],
 AS_HELP_STRING([--with-first-host=HOSTNAME],
   [use HOSTNAME as the machine on which the first shogi program runs in xshogi (default: localhost)]),
-FIRST_HOST=$withval)
+[FIRST_HOST=$withval])
 
-AC_ARG_WITH(second-host,
+AC_ARG_WITH([second-host],
 AS_HELP_STRING([--with-second-host=HOSTNAME],
   [use HOSTNAME as the machine on which the second shogi program runs in xshogi (default: localhost)]),
-SECOND_HOST=$withval)
+[SECOND_HOST=$withval])
 
 AC_SUBST(OPT)
 AC_SUBST(FIRST_SHOGI_PROGRAM)