X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=05135b2f48331728bcffc072b5a3a0595b28d5a4;hb=6e81557cc7a3d288c2b0860675b83d2c50d672e9;hp=64844e1b8309cda0a1d33ea523c0c233fb0eee73;hpb=c95ef32a700132a134f335f857ca6f1b6f3c169f;p=xboard.git

diff --git a/configure.ac b/configure.ac
index 64844e1..05135b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl| configure.in
 dnl|
 dnl| Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006, 2007, 
-dnl| 2008, 2009, 2010 Free Software Foundation, Inc.
+dnl| 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 dnl|
 dnl| GNU XBoard is free software: you can redistribute it and/or modify
 dnl| it under the terms of the GNU General Public License as published by
@@ -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],[master-20100806],[bug-xboard@gnu.org])
+AC_INIT([xboard],[master-20110411],[bug-xboard@gnu.org])
 
 dnl| need this to be able to compile some files in a subdir (filebrowser)
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -61,6 +61,7 @@ AH_TEMPLATE([USE_XAW3D],[template])
 AH_TEMPLATE([X_LOCALE],[template])
 
 
+
 if test -z "$CFLAGS" ; then
 dnl| Prevent the next macro from setting CFLAGS to -g
   CFLAGS=" "
@@ -74,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
@@ -99,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))
@@ -130,59 +123,35 @@ 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=yes],
-            [with_xaw3d=no])
+            [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" != xno],
+AS_IF([test x"$with_Xaw3d" != x"no"],
       [AC_CHECK_LIB([Xaw3d], 
                     [XawTextReplace],
-                    [AC_SUBST([XAW_LIBS], 
-                              ["-lXaw3d"])
+                    [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])])
-if test "$with_xaw3d" = "no" ; then
+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 "$xaw_headers" = "no" ; then
-   echo Xaw headers not found 
-   exit 1
-
-fi
-
-
-dnl | test for readline
-AC_ARG_WITH([readline],
-	    [AS_HELP_STRING([--with-readline],
-        	            [support fancy command line editing @<:@default=yes@:>@])
-	    ],
-            [],
-	    [with_readline=yes])
-          
-LIBREADLINE=
-AS_IF([test "x$with_readline" != xno],
-      [AC_CHECK_LIB([readline], [main],
-                    [AC_SUBST([LIBREADLINE], ["-lreadline "])
-                     AC_DEFINE([HAVE_LIBREADLINE], [1],
-                               [Define if you have libreadline])
-                    ],
-                    [if test "x$with_readline" != xyes; then
-                     AC_MSG_FAILURE(
-                     [--with-readline was given, but test for readline failed])
-               	     fi
-              	    ], "")])
+dnl | end Xaw/Xaw3d test
 
 
 AC_CANONICAL_HOST
@@ -457,12 +426,12 @@ echo " Configurations summary:"
 echo ""
 echo "        prefix:          $prefix       "
 echo "        datarootdir:     $datarootdir  "
-echo "        datadir:         $datadir   (icons will go in \$datadir\icons\hicolor\...)"
+echo "        datadir:         $datadir   (icons will go in \$datadir/icons/hicolor/...)"
+echo "                                    (bitmaps will go in \$datadir/games/xboard/...)"
 echo "        infodir:         $infodir   (info files will go here)"
 echo "        sysconfdir:      $sysconfdir   (xboard.conf will go here)"
 echo ""
-echo "        Xaw3d:           $with_xaw3d"
-echo "        readline:        $with_readline"
+echo "        Xaw3d:           $with_Xaw3d"
 echo ""
 echo "        xpm:             $enable_xpm"
 echo "        ptys:            $enable_ptys"