X-Git-Url: http://winboard.nl/cgi-bin?p=gnushogi.git;a=blobdiff_plain;f=configure.ac;h=2447789b9e867f3d59ed81232ce3392f3ac1561a;hp=23cf2fdf273427296e0646782a39e8d88094e046;hb=HEAD;hpb=4148983259c73579d3b9d0128a72d3c698d3894d

diff --git a/configure.ac b/configure.ac
index 23cf2fd..2447789 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,25 +5,19 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([gnushogi],[1.4.1],[https://savannah.gnu.org/bugs/?group=gnushogi])
+AC_INIT([gnushogi],[1.4.2+],[https://savannah.gnu.org/bugs/?group=gnushogi])
+AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([gnushogi/gnushogi.h])
 AC_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
 
 ##########
 AC_MSG_NOTICE([C compiler])
 AC_PROG_CC
-
-##########
-AC_MSG_NOTICE([yacc/bison, lex/flex, and install])
-AC_PROG_YACC
-AC_PROG_LEX
+AC_CANONICAL_BUILD
 AC_PROG_INSTALL
 
 ##########
-AC_MSG_NOTICE([X])
-AC_PATH_XTRA
-
-##########
 AC_MSG_NOTICE([libs])
 
 # curses
@@ -37,7 +31,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 +52,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"
 CEXTRAFLAGS="-fsigned-char -funroll-loops"
 else
 # Who knows what warnings your compiler uses?
@@ -97,11 +92,9 @@ AC_CHECK_SIZEOF(long)
 ##########
 AC_MSG_NOTICE([library functions])
 
-AC_FUNC_FORK
 AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MALLOC
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([dup2 gethostname gettimeofday memset pow strcasecmp])
+AC_CHECK_FUNCS([gettimeofday memset pow])
 AC_CHECK_FUNCS([strchr strerror strrchr strstr strtol])
 AC_CHECK_FUNCS([memcpy bcopy])
 AC_CHECK_FUNCS([setvbuf setlinebuf])
@@ -120,68 +113,16 @@ 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],
-AS_HELP_STRING([--enable-xshogi],
-  [compile the xshogi graphical interface to GNU shogi (default: no)]),
-[enable_xshogi=$enableval],
-[enable_xshogi=no])
-
-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])
-
-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])
-
-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])
-
-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])
-
-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])
-
-AC_SUBST(OPT)
-AC_SUBST(FIRST_SHOGI_PROGRAM)
-AC_SUBST(SECOND_SHOGI_PROGRAM)
-AC_SUBST(FIRST_HOST)
-AC_SUBST(SECOND_HOST)
-
-if [[ $enable_xshogi = yes ]]
-then
-XSHOGI=xshogi_compile
-XSHOGIINSTALL=xshogi_install
-XSHOGICLEAN=xshogi_clean
-else
-XSHOGI=
-XSHOGIINSTALL=
-XSHOGICLEAN=
-fi
+##########
 
-AC_SUBST(XSHOGI)
-AC_SUBST(XSHOGIINSTALL)
-AC_SUBST(XSHOGICLEAN)
+# don't build pat2inc when cross-compiling, we don't need it
+if test "$cross_compiling" = no; then
+   AC_SUBST([PAT2INC], [pat2inc])
+   AC_SUBST([PAT2INCEXE], [pat2inc$EXEEXT])
+fi
 
 ##########
 AC_CONFIG_FILES([Makefile
                  gnushogi/Makefile
-                 win32/config.h
-                 doc/Makefile
-                 xshogi/Makefile])
+                 doc/Makefile])
 AC_OUTPUT