Fix various regression for building out of tree.

[gnushogi.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 05a53cb..2f21d60 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,74 +6,54 @@ 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_CONFIG_SRCDIR([version.h])
+AC_CONFIG_SRCDIR([gnushogi/gnushogi.h])
 AC_CONFIG_HEADER(config.h)
 
-
-#
-# Check for C compiler.
-#
-
-echo
-AC_MSG_CHECKING(for C compiler)
-echo
-
+##########
+AC_MSG_NOTICE([C compiler])
 AC_PROG_CC
 
-
-#
-# Check for parser generators.
-#
-
-echo
-AC_MSG_CHECKING([for yacc/bison, lex/flex, and install])
-echo
-
+##########
+AC_MSG_NOTICE([yacc/bison, lex/flex, and install])
 AC_PROG_YACC
 AC_PROG_LEX
 AC_PROG_INSTALL
 
-
-#
-# Check for X windows.
-#
-
-echo
+##########
+AC_MSG_NOTICE([X])
 AC_PATH_XTRA
 
-#
-# Check for ncurses.
-#
+##########
+AC_MSG_NOTICE([libs])
 
+# curses
 AC_ARG_WITH([curses],
   [AS_HELP_STRING([--with-curses],
-    [enable curses UI])],
+    [enable curses UI (default: yes if available)])],
   [],
   [with_curses=check])
 
 LIBCURSES=
 AS_IF([test "x$with_curses" != xno],
   [AC_CHECK_LIB([curses], [clrtoeol],
-    [AC_SUBST([LIBCURSES], ["-lcurses"])
+    [AC_SUBST([LIBCURSES], [-lcurses])
+     AC_SUBST([CURSESDSP], [cursesdsp.o])
      AC_DEFINE([HAVE_LIBCURSES], [1],
                [Define if you have lib])
     ],
-    [AC_MSG_FAILURE(
-       [--with-curses was given, but test for curses failed])],
+    [AS_IF([test "x$with_curses" = xyes],
+      [AC_MSG_ERROR(
+        [--with-curses was given, but test for curses failed])])],
     [-ltermcap])])
 
-#
-# Check for other libraries.
-#
-
+# other libraries.
 AC_CHECK_LIB(m, pow)
-dnl Replace `main' with a function in -ltermcap:
 AC_CHECK_LIB(termcap, tgoto)
 
 
-#
+
+##########
 # C compiler warnings.
-#
 
 if [[ $ac_cv_c_compiler_gnu = yes ]]
 then
@@ -91,14 +71,8 @@ AC_SUBST(WARNINGS)
 AC_SUBST(CEXTRAFLAGS)
 AC_SUBST(CEXTRAFLAGS2)
 
-
-#
-# Check for header files.
-#
-
-echo
-AC_MSG_CHECKING(for header files)
-echo
+##########
+AC_MSG_NOTICE([header files])
 
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
@@ -107,14 +81,8 @@ AC_CHECK_HEADERS([sys/param.h sys/time.h unistd.h])
 AC_CHECK_HEADERS(errno.h)
 AC_HEADER_TIME
 
-
-#
-# Check for typedefs, structures, and compiler characteristics.
-#
-
-echo 
-AC_MSG_CHECKING(for typedefs)
-echo
+##########
+AC_MSG_NOTICE([typedefs])
 
 AC_C_CONST
 AC_HEADER_STDBOOL
@@ -124,20 +92,13 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_STRUCT_TM
 
-echo 
-AC_MSG_CHECKING(for compiler characteristics)
-echo
+##########
+AC_MSG_NOTICE([compiler characteristics])
 
 AC_CHECK_SIZEOF(long)
 
-
-#
-# Check for library functions.
-#
-
-echo
-AC_MSG_CHECKING(for library functions)
-echo
+##########
+AC_MSG_NOTICE([library functions])
 
 AC_FUNC_FORK
 AC_PROG_GCC_TRADITIONAL
@@ -169,36 +130,35 @@ SECOND_SHOGI_PROGRAM=gnushogi
 FIRST_HOST=localhost
 SECOND_HOST=localhost
 
-AC_ARG_WITH(xshogi,
-[  --with-xshogi
-        Compile the xshogi graphical interface to GNU shogi (default: no)],
-with_xshogi=$withval,
-with_xshogi=no)
+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,
-[  --with-top-part-bitmaps    Use top part of Kanji bitmaps only in xshogi.],
+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,
-[  --with-first-shogi-program=PROGNAME    
-        Use PROGNAME as the first shogi program in xshogi (default: gnushogi)],
+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,
-[  --with-second-shogi-program=PROGNAME    
-        Use PROGNAME as the second shogi program in xshogi (default: gnushogi)],
+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,
-[  --with-first-host=HOSTNAME    
-        Use HOSTNAME as the machine on which the first shogi program 
-        runs in xshogi (default: localhost)],
+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,
-[  --with-second-host=HOSTNAME    
-        Use HOSTNAME as the machine on which the second shogi program 
-        runs in xshogi (default: localhost)],
+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)
@@ -207,7 +167,7 @@ AC_SUBST(SECOND_SHOGI_PROGRAM)
 AC_SUBST(FIRST_HOST)
 AC_SUBST(SECOND_HOST)
 
-if [[ $with_xshogi = yes ]]
+if [[ $enable_xshogi = yes ]]
 then
 XSHOGI=xshogi_compile
 XSHOGIINSTALL=xshogi_install
@@ -222,13 +182,10 @@ AC_SUBST(XSHOGI)
 AC_SUBST(XSHOGIINSTALL)
 AC_SUBST(XSHOGICLEAN)
 
-
-echo
-echo outputting files...
-
+##########
 AC_CONFIG_FILES([Makefile
                  gnushogi/Makefile
-                                gnushogi/Makefile.profile
+                gnushogi/Makefile.profile
+                 doc/Makefile
                  xshogi/Makefile])
 AC_OUTPUT
-