Merge branch 'maint' into HEAD

[gnushogi.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ce334dc..bdfde4e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,12 +6,14 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
 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)
 
 ##########
 AC_MSG_NOTICE([C compiler])
 AC_PROG_CC
+AC_CANONICAL_BUILD
 AC_PROG_INSTALL
 
 ##########
@@ -28,7 +30,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])
     ],
@@ -48,7 +51,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?
@@ -89,7 +92,6 @@ AC_CHECK_SIZEOF(long)
 AC_MSG_NOTICE([library functions])
 
 AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MALLOC
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([gettimeofday memset pow])
 AC_CHECK_FUNCS([strchr strerror strrchr strstr strtol])
@@ -111,8 +113,15 @@ AC_SUBST([PROGNAME], [gnuminishogi])
 ])
 
 ##########
+
+# 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])
 AC_OUTPUT