changes from H.G. Muller; version 4.3.15

[xboard.git] / configure.in

diff --git a/configure.in b/configure.in
index 797c7b3..da09924 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -9,12 +9,18 @@ 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
 dnl| the standard version of xboard.
 
-AC_INIT(xboard.c)
-AC_CONFIG_HEADER(config.h)
-
+AC_INIT([xboard],[4.3])
+AM_INIT_AUTOMAKE
+AC_PROG_CC
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([
+Makefile
+])
+AC_OUTPUT
 PRODUCT=xboard
-VERSION=4.2
-PATCHLEVEL=6
+#VERSION=4.3  # version is already defined
+PATCHLEVEL=15
+
 
 if test -z "$CFLAGS" ; then
 dnl| Prevent the next macro from setting CFLAGS to -g
@@ -29,17 +35,19 @@ if test "$LEX" != lex_not_found ; then
   AC_DECL_YYTEXT
 fi
 AC_CHECK_PROGS(RSH, remsh rsh, rsh)
+AC_CHECK_PROGS(MINFO, makeinfo, makeinfo_not_found)
+if test "$MINFO" == makeinfo_not_found ; then
+   echo Please install \"makeinfo\"
+   exit 1
+fi
 AC_DEFINE_UNQUOTED(REMOTE_SHELL, "$RSH")
 AC_CHECK_PROG(NROFF, nroff, [nroff -man], cat)
 AC_SUBST(NROFFFLAGS)
 AC_PATH_PROGS(AWKPATH, awk mawk gawk nawk)
 AC_PATH_PROGS(PERLPATH, perl)
 
-AC_ARG_WITH(Xaw3d, [  --with-Xaw3d            use Xaw3d instead of Xaw],
-  [AC_DEFINE(USE_XAW3D)
-   XAW_LIBS="-lXaw3d"],
-  XAW_LIBS="-lXaw")
-AC_SUBST(XAW_LIBS)
+
+
 
 AC_HEADER_STDC
 AC_HEADER_TIME
@@ -51,10 +59,6 @@ AC_CHECK_HEADERS(fcntl.h sys/fcntl.h, break)
 AC_CHECK_HEADERS(sys/socket.h lan/socket.h, break)
 AC_CHECK_HEADER(stddef.h, [], AC_DEFINE(X_WCHAR, 1))
 
-AC_EGREP_HEADER(sys_errlist, errno.h, AC_DEFINE(DEFINED_SYS_ERRLIST))
-AC_EGREP_HEADER(sys_errlist, stdio.h, AC_DEFINE(DEFINED_SYS_ERRLIST))
-AC_EGREP_HEADER(sys_errlist, stdlib.h, AC_DEFINE(DEFINED_SYS_ERRLIST))
-
 AC_CHECK_FUNCS(_getpty grantpt setitimer usleep)
 AC_CHECK_FUNCS(gettimeofday ftime, break)
 AC_CHECK_FUNCS(random rand48, break)
@@ -72,6 +76,51 @@ if test -n "$no_x" ; then
   exit 1
 fi
 
+AC_CHECK_HEADER(X11/Intrinsic.h,xt="yes",xt="no")
+
+if test "$xt" == "no" ; then
+   echo Xt headers not found
+   exit 1
+fi
+
+AC_ARG_WITH(Xaw3d, [  --with-Xaw3d            use Xaw3d instead of Xaw],
+  with_xaw3d="yes", with_xaw3d="no")
+
+
+xaw_headers="no"
+if test "$with_xaw3d" == "yes" ; then
+   XAW_LIBS="-lXaw3d"
+   AC_CHECK_LIB([Xaw3d], [XawTextReplace], xaw3d_lib="yes", xaw3d_lib="no")
+   if test "$xaw3d_lib" == "no" ; then
+      echo Xaw3d libraries not found
+      exit 1
+   else
+      AC_CHECK_HEADER(X11/Xaw3d/Dialog.h,xaw3d_headers="yes",xaw3d_headers="no")       
+      if test "$xaw3d_headers" == "yes" ; then
+        AC_DEFINE(USE_XAW3D)
+        xaw_headers="yes"
+      else
+       AC_CHECK_HEADER(X11/Xaw/Dialog.h,xaw_headers="yes")     
+      fi
+   fi
+else
+   XAW_LIBS="-lXaw"
+   AC_CHECK_HEADER(X11/Xaw/Dialog.h,xaw_headers="yes")
+fi
+
+AC_SUBST(XAW_LIBS)
+
+
+
+if test "$xaw_headers" == "no" ; then
+   echo Xaw headers not found 
+   exit 1
+
+fi
+
+
+
+
 AC_CANONICAL_HOST
 
 dnl| The following info is mostly gathered from GNU Emacs 19.24.  Basically,
@@ -293,12 +342,14 @@ fi])
 AC_DEFINE_UNQUOTED(USE_PTYS, $USE_PTYS)
 
 AC_ARG_ENABLE(zippy, 
-[  --enable-zippy          features for interfacing a chess program to ICS],
-[if test "$enableval" = yes; then
+[  --enable-zippy          support interfacing a chess program to ICS (default)
+  --disable-zippy         do not support interfacing a chess program to ICS],
+[enable_zippy="$enableval"], [enable_zippy="yes"])
+if test "$enable_zippy" = yes; then
   AC_DEFINE(ZIPPY, 1)
   ZIPPY_O=zippy.o
   ZIPPY_H=zippy.h
-fi])
+fi
 AC_SUBST(ZIPPY_O)  
 AC_SUBST(ZIPPY_H)  
 
@@ -317,7 +368,7 @@ AC_SUBST(PRODUCT)
 AC_SUBST(VERSION)
 AC_SUBST(PATCHLEVEL)
 
-AC_OUTPUT(Makefile comment.awk:comment.in cmail xboard.texinfo,
+AC_OUTPUT(cmail xboard.texinfo,
 [test -z "$CONFIG_HEADERS" || date > stamp-h
-chmod 755 comment.awk cmail
+chmod 755 cmail
 ])