fixed autoheader warings, remove depreciated acconfig.h

diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644 (file)
index 8957afb..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* This file is just here to make autoheader happy, so it will generate
-   config.h for me. */
-
-#define FIRST_PTY_LETTER 'p'
-
-#define HAVE_FCNTL_H 0
-
-#define HAVE_GETHOSTNAME 0
-
-#define HAVE_GETTIMEOFDAY 0
-
-#define HAVE_RANDOM 0
-
-#define HAVE_SYS_SOCKET_H 0
-
-#undef IBMRTAIX
-
-#define LAST_PTY_LETTER 'q'
-
-#define PATCHLEVEL "0"
-
-#define PRODUCT "xboard"
-
-#undef PTY_ITERATION
-
-#undef PTY_NAME_SPRINTF
-
-#undef PTY_OPEN
-
-#undef PTY_TTY_NAME_SPRINTF
-
-#define REMOTE_SHELL "rsh"
-
-#undef RTU
-
-#undef UNIPLUS
-
-#define USE_PTYS 0
-
-#define VERSION "x.y"
-
-#undef X_WCHAR
-
-#undef ZIPPY
-
-#undef ATTENTION 
-
-#undef DEFINED_SYS_ERRLIST
-
-#undef HAVE_LIBXPM
-
-#define HAVE_USLEEP 0
-
-#undef USE_XAW3D
-
-#define X_LOCALE
-

diff --git a/configure.in b/configure.in
index ef55295..b211899 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -9,17 +9,46 @@ dnl| it portable to sites and systems other than your own), and run autoconf
 dnl| to regenerate configure.  Then submit your changes to be folded into\r
 dnl| the standard version of xboard.\r
 \r
-AC_INIT([xboard],[4.3])\r
+PRODUCT=xboard\r
+VERSION=4.4  \r
+PATCHLEVEL=0e\r
+\r
+AC_INIT([PRODUCT],[VERSION-PATCHLEVEL])\r
 AM_INIT_AUTOMAKE\r
-AC_PROG_CC\r
+\r
 AC_CONFIG_HEADERS([config.h])\r
-AC_CONFIG_FILES([\r
-Makefile\r
+AC_CONFIG_FILES([Makefile cmail xboard.texinfo],\r
+[test -z "$CONFIG_HEADERS" || date > stamp-h \r
+chmod 755 cmail\r
 ])\r
-AC_OUTPUT\r
-PRODUCT=xboard\r
-#VERSION=4.4  # version is already defined\r
-PATCHLEVEL=0e\r
+\r
+dnl | a bunch of templates for defines used below\r
+AH_TEMPLATE([FIRST_PTY_LETTER],[template])\r
+AH_TEMPLATE([HAVE_FCNTL_H],[template])\r
+AH_TEMPLATE([HAVE_GETHOSTNAME],[template])\r
+AH_TEMPLATE([HAVE_GETTIMEOFDAY],[template])\r
+AH_TEMPLATE([HAVE_RANDOM],[template])\r
+AH_TEMPLATE([HAVE_SYS_SOCKET_H],[template])\r
+AH_TEMPLATE([IBMRTAIX],[template])\r
+AH_TEMPLATE([LAST_PTY_LETTER],[template])\r
+AH_TEMPLATE([PATCHLEVEL],[template])\r
+AH_TEMPLATE([PRODUCT],[template])\r
+AH_TEMPLATE([PTY_ITERATION],[template])\r
+AH_TEMPLATE([PTY_NAME_SPRINTF],[template])\r
+AH_TEMPLATE([PTY_OPEN],[template])\r
+AH_TEMPLATE([PTY_TTY_NAME_SPRINTF],[template])\r
+AH_TEMPLATE([REMOTE_SHELL],[template])\r
+AH_TEMPLATE([RTU],[template])\r
+AH_TEMPLATE([UNIPLUS],[template])\r
+AH_TEMPLATE([USE_PTYS],[template])\r
+AH_TEMPLATE([VERSION],[template])\r
+AH_TEMPLATE([X_WCHAR],[template])\r
+AH_TEMPLATE([ATTENTION],[template])\r
+AH_TEMPLATE([DEFINED_SYS_ERRLIST],[template])\r
+AH_TEMPLATE([HAVE_LIBXPM],[template])\r
+AH_TEMPLATE([USE_XAW3D],[template])\r
+AH_TEMPLATE([X_LOCALE],[template])\r
+\r
 \r
 \r
 if test -z "$CFLAGS" ; then\r
@@ -46,9 +75,6 @@ AC_SUBST(NROFFFLAGS)
 AC_PATH_PROGS(AWKPATH, awk mawk gawk nawk)\r
 AC_PATH_PROGS(PERLPATH, perl)\r
 \r
-\r
-\r
-\r
 AC_HEADER_STDC\r
 AC_HEADER_TIME\r
 AC_HEADER_SYS_WAIT\r
@@ -119,8 +145,6 @@ if test "$xaw_headers" == "no" ; then
 fi\r
 \r
 \r
-\r
-\r
 AC_CANONICAL_HOST\r
 \r
 dnl| The following info is mostly gathered from GNU Emacs 19.24.  Basically,\r
@@ -341,12 +365,15 @@ else
 fi])\r
 AC_DEFINE_UNQUOTED(USE_PTYS, $USE_PTYS)\r
 \r
+\r
+dnl | define not to build zippy as a default, so that autoheader is happy\r
+AC_DEFINE(ZIPPY, 0,[should zippy be enabled])\r
 AC_ARG_ENABLE(zippy, \r
 [  --enable-zippy          support interfacing a chess program to ICS (default)\r
   --disable-zippy         do not support interfacing a chess program to ICS],\r
 [enable_zippy="$enableval"], [enable_zippy="yes"])\r
 if test "$enable_zippy" = yes; then\r
-  AC_DEFINE(ZIPPY, 1)\r
+  AC_DEFINE(ZIPPY, 1,[should zippy be enabled])\r
   ZIPPY_O=zippy.o\r
   ZIPPY_H=zippy.h\r
 fi\r
@@ -368,7 +395,4 @@ AC_SUBST(PRODUCT)
 AC_SUBST(VERSION)\r
 AC_SUBST(PATCHLEVEL)\r
 \r
-AC_OUTPUT(cmail xboard.texinfo,\r
-[test -z "$CONFIG_HEADERS" || date > stamp-h\r
-chmod 755 cmail\r
-])\r
+AC_OUTPUT\r