X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=78f7510bbb7d78325ab8bf247f691d7ddb2692cf;hb=b382d988c6f886f3a49483df9e3e36de0b6b0824;hp=ce20a4f6d891f7c3a4f1676df8c9f18bd4cf410d;hpb=aae1b2706f58097dcdd1ee907e26add590d81df9;p=xboard.git

diff --git a/configure.ac b/configure.ac
index ce20a4f..78f7510 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 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,8 +28,11 @@ 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-20100118],[bug-xboard@gnu.org])
-AM_INIT_AUTOMAKE
+AC_INIT([xboard],[master-20101211],[bug-xboard@gnu.org])
+
+dnl| need this to be able to compile some files in a subdir (filebrowser)
+AM_INIT_AUTOMAKE([subdir-objects])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
 AC_CONFIG_HEADERS([config.h])
 
@@ -64,6 +67,10 @@ dnl| Prevent the next macro from setting CFLAGS to -g
   CFLAGS=" "
 fi
 AC_PROG_CC
+
+dnl| need this to be able to compile files in a subdir
+AM_PROG_CC_C_O 
+
 AC_PROG_CPP
 AC_ISC_POSIX
 AC_PROG_INSTALL
@@ -78,7 +85,7 @@ fi
 
 AC_CHECK_PROGS(RSH, remsh rsh, rsh)
 AC_CHECK_PROGS(MINFO, makeinfo, makeinfo_not_found)
-if test "$MINFO" == makeinfo_not_found ; then
+if test "$MINFO" = makeinfo_not_found ; then
    echo Please install \"makeinfo\"
    exit 1
 fi
@@ -119,7 +126,7 @@ fi
 
 AC_CHECK_HEADER(X11/Intrinsic.h,xt="yes",xt="no")
 
-if test "$xt" == "no" ; then
+if test "$xt" = "no" ; then
    echo Xt headers not found
    exit 1
 fi
@@ -143,14 +150,14 @@ AS_IF([test "x$with_xaw3d" != xno],
 		     AC_MSG_FAILURE(
       		               [--with-Xaw3d was given, but test for Xaw3d failed])],
 			       [-lXaw])])
-if test "$with_xaw3d" == "no" ; then
+if test "$with_xaw3d" = "no" ; then
    XAW_LIBS="-lXaw"
 fi
 AC_SUBST(XAW_LIBS)
 
 dnl | end Xaw3d test
 
-if test "$xaw_headers" == "no" ; then
+if test "$xaw_headers" = "no" ; then
    echo Xaw headers not found 
    exit 1
 
@@ -427,7 +434,12 @@ dnl
 echo ""
 echo " Configurations summary:"
 echo ""
-echo "        prefix:          $prefix"
+echo "        prefix:          $prefix       "
+echo "        datarootdir:     $datarootdir  "
+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 ""