Remove more duplicate variable declarations.

[gnushogi.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ce314d9..e852a73 100644 (file)
--- 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])
     ],
@@ -47,8 +49,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])
 
 
 
@@ -57,10 +59,8 @@ 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"
-# For profiling targets:
-CEXTRAFLAGS2="-fsigned-char -pg -fprofile-arcs -ftest-coverage"
 else
 # Who knows what warnings your compiler uses?
 WARNINGS=
@@ -69,7 +69,6 @@ fi
 
 AC_SUBST(WARNINGS)
 AC_SUBST(CEXTRAFLAGS)
-AC_SUBST(CEXTRAFLAGS2)
 
 ##########
 AC_MSG_NOTICE([header files])
@@ -103,63 +102,53 @@ AC_MSG_NOTICE([library functions])
 AC_FUNC_FORK
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MALLOC
-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([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
 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)
@@ -169,23 +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
-                gnushogi/Makefile.profile
+                 win32/config.h
                  doc/Makefile
                  xshogi/Makefile])
 AC_OUTPUT