X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=42f3f8c4cf215728ff9bbefbfabf34f51c5d5abd;hb=3b8daf8d5450a2deb46ae61c4e0a3fa215a3eda4;hp=920767101d4d2431b8bf50d6ad104d02666ab03a;hpb=829c253a7cc2d3e1a9ed643485c1b1a92967b5df;p=gnushogi.git

diff --git a/configure.ac b/configure.ac
index 9207671..42f3f8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ 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])
 
@@ -41,8 +41,9 @@ AS_IF([test "x$with_curses" != xno],
      AC_DEFINE([HAVE_LIBCURSES], [1],
                [Define if you have lib])
     ],
-    [AC_MSG_ERROR(
-       [--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])])
 
 # other libraries.
@@ -57,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)
@@ -113,15 +114,15 @@ 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,35 +131,34 @@ FIRST_HOST=localhost
 SECOND_HOST=localhost
 
 AC_ARG_ENABLE(xshogi,
-[  --enable-xshogi
-        Compile the xshogi graphical interface to GNU shogi (default: no)],
+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)
@@ -186,5 +186,6 @@ AC_SUBST(XSHOGICLEAN)
 AC_CONFIG_FILES([Makefile
                  gnushogi/Makefile
 		 gnushogi/Makefile.profile
+                 doc/Makefile
                  xshogi/Makefile])
 AC_OUTPUT