X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=611dd181b967bc92ef5867f2999af68d3afdcd76;hb=c2ec1736bf64a623718e6c8fbb25c7aaf4d725e3;hp=712c250565e24c73de49586f355d87756ffa363c;hpb=b82df03a5011d3b3865a3a02ecac402ec48e402e;p=xboard.git

diff --git a/configure.ac b/configure.ac
index 712c250..611dd18 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],[4.5.0],[bug-xboard@gnu.org])
 
 dnl| need this to be able to compile some files in a subdir (filebrowser)
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -133,34 +133,31 @@ fi
 
 dnl | test if user wants ot use Xaw3d headers
 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])
 
 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])],
 			       [-lXaw])])
-if test "$with_xaw3d" = "no" ; then
+if test x"$with_Xaw3d" = x"no" ; then
    XAW_LIBS="-lXaw"
 fi
 AC_SUBST(XAW_LIBS)
 
 dnl | end Xaw3d test
 
-if test "$xaw_headers" = "no" ; then
+if test x"$xaw_headers" = x"no" ; then
    echo Xaw headers not found 
    exit 1
-
 fi
 
 
@@ -436,11 +433,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 "        Xaw3d:           $with_Xaw3d"
 echo ""
 echo "        xpm:             $enable_xpm"
 echo "        ptys:            $enable_ptys"