X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=9dfa39ddca77021300dc9cd4eaaba98f20d999c5;hb=a90c45ee54a358b17fa4d006417bab8c6cf8657e;hp=611dd181b967bc92ef5867f2999af68d3afdcd76;hpb=68b93d3820802349ca6dfeb0ca36fd9dcfd6e09b;p=xboard.git

diff --git a/configure.ac b/configure.ac
index 611dd18..9dfa39d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl| to regenerate configure.  Then submit your changes to be folded into
 dnl| the standard version of xboard.
 
 dnl| define second argument as VERSION.PATCHLEVEL. e.g. 4.4.0j
-AC_INIT([xboard],[4.5.0],[bug-xboard@gnu.org])
+AC_INIT([xboard],[4.5.1],[bug-xboard@gnu.org])
 
 dnl| need this to be able to compile some files in a subdir (filebrowser)
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -75,14 +75,6 @@ AC_PROG_CPP
 AC_ISC_POSIX
 AC_PROG_INSTALL
 
-AC_PROG_LEX
-if test "$LEX" != flex; then
-  LEX="$SHELL $missing_dir/missing flex"
-  AC_SUBST([LEX_OUTPUT_ROOT], [lex.yy])
-  AC_SUBST([LEXLIB], [''])
-fi
-
-
 AC_CHECK_PROGS(RSH, remsh rsh, rsh)
 AC_CHECK_PROGS(MINFO, makeinfo, makeinfo_not_found)
 if test "$MINFO" = makeinfo_not_found ; then
@@ -100,7 +92,7 @@ AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 AC_HEADER_DIRENT
 AC_TYPE_SIGNAL
-AC_CHECK_HEADERS(stropts.h sys/time.h string.h unistd.h sys/systeminfo.h malloc.h)
+AC_CHECK_HEADERS(stropts.h sys/time.h string.h unistd.h sys/systeminfo.h)
 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))
@@ -131,12 +123,15 @@ if test "$xt" = "no" ; then
    exit 1
 fi
 
-dnl | test if user wants ot use Xaw3d headers
+dnl | test if user wants ot use Xaw3d or Xaw
+
+dnl | add configure option for Xaw3d
 AC_ARG_WITH([Xaw3d],
             [AS_HELP_STRING([--with-Xaw3d],[use Xaw3d instead of Xaw])],
             [],
             [with_Xaw3d=no])
 
+dnl | check availability of Xaw3d
 XAW_LIBS=
 AS_IF([test x"$with_Xaw3d" != x"no"],
       [AC_CHECK_LIB([Xaw3d], 
@@ -144,21 +139,19 @@ AS_IF([test x"$with_Xaw3d" != x"no"],
                     [AC_SUBST([XAW_LIBS],["-lXaw3d"])
                      AC_DEFINE([USE_XAW3D], [1],
                                [Define if you want to use Xaw3d])],
-                    [AC_CHECK_HEADER(X11/Xaw/Dialog.h,xaw_headers="yes")
-		     AC_MSG_FAILURE(
-      		               [--with-Xaw3d was given, but test for Xaw3d failed])],
+                    [AC_MSG_ERROR([--with-Xaw3d was given, but test for Xaw3d failed. Make sure that you have Xaw3d installed, else you might want to try the configure option --without-Xaw3d])],
 			       [-lXaw])])
+dnl | no Xaw3d, check for Xaw
 if test x"$with_Xaw3d" = x"no" ; then
+   AC_CHECK_HEADER(X11/Xaw/Dialog.h,xaw_headers="yes", xaw_headers="no")
+   if test x"$xaw_headers" = x"no" ; then
+      AC_MSG_ERROR([Xaw headers not found. Please install the Xaw package and headers.])
+   fi
    XAW_LIBS="-lXaw"
 fi
 AC_SUBST(XAW_LIBS)
 
-dnl | end Xaw3d test
-
-if test x"$xaw_headers" = x"no" ; then
-   echo Xaw headers not found 
-   exit 1
-fi
+dnl | end Xaw/Xaw3d test
 
 
 AC_CANONICAL_HOST