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

diff --git a/configure.ac b/configure.ac
index 5f1497d..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 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],[4.4.0],[bug-xboard@gnu.org])
-AM_INIT_AUTOMAKE
+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])
+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
@@ -107,6 +114,8 @@ AC_CHECK_FUNC(setlocale, [],
 
 AC_CHECK_LIB(seq, getpseudotty)
 
+
+dnl | check for X-libraries
 AC_PATH_XTRA
 if test -n "$no_x" ; then
   echo $PACKAGE requires the X Window System header files and libraries!
@@ -117,41 +126,38 @@ 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
 
 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
 
 
@@ -331,7 +337,6 @@ dnl| USE_PTYS=1
 
 dnl| add some libs for OS X
   *-apple-* )
-    X_LIBS="$X_LIBS -lX11 -lXt"    
   ;;
 esac
 
@@ -408,6 +413,13 @@ enable_sigint=$enableval
 AC_DEFINE(ATTENTION, 1)])
 
 
+dnl | save all information for X in X_LIBS, also add the libraries themself
+dnl | since AC_PATH_XTRA only adds the paths
+X_LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS -lXmu -lX11 -lXt "    
+AC_SUBST(X_CFLAGS)
+AC_SUBST(X_LIBS)
+
+
 AC_CONFIG_FILES([Makefile cmail])
 AC_CONFIG_COMMANDS([test-stamp-h],[test -z "$CONFIG_HEADERS" || date > stamp-h])
 AC_CONFIG_COMMANDS([chmod-cmail],[chmod 755 cmail])
@@ -419,9 +431,14 @@ 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 "        Xaw3d:           $with_Xaw3d"
 echo ""
 echo "        xpm:             $enable_xpm"
 echo "        ptys:            $enable_ptys"