X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=c67f6c6a926d816a0ae829bc917dfe098d27d6f9;hb=87accfa18a33abac6b6b2582d1872590dd244198;hp=b9856327a6ab3280123ba7beb75444070db0be5b;hpb=84786e5f06126838b5a38acc7fe7f8758ec44422;p=xboard.git

diff --git a/configure.ac b/configure.ac
index b985632..c67f6c6 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 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],[4.4.0.beta1],[bug-xboard@gnu.org])
+AC_INIT([xboard],[master-20100206],[bug-xboard@gnu.org])
 AM_INIT_AUTOMAKE
 
 AC_CONFIG_HEADERS([config.h])
@@ -107,6 +107,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!
@@ -328,6 +330,10 @@ dnl| USE_PTYS=1
       CONF_CFLAGS="-fwritable-strings"
     fi
   ;;
+
+dnl| add some libs for OS X
+  *-apple-* )
+  ;;
 esac
 
 AC_ARG_ENABLE(	[xpm],
@@ -388,11 +394,9 @@ AC_ARG_ENABLE( [zippy],
 
 if test x"$enable_zippy" != xno; then
   AC_DEFINE(ZIPPY, 1,[should zippy be enabled])
-  ZIPPY_O=zippy.o
-  ZIPPY_H=zippy.h
 fi
-AC_SUBST(ZIPPY_O)  
-AC_SUBST(ZIPPY_H)  
+AM_CONDITIONAL([ZIPPY], [test x$enable_zippy != xno])
+
 
 AC_ARG_ENABLE(sigint, 
 [AS_HELP_STRING([--enable-sigint],[sending SIGINT (^C) wakes up GNU Chess (default)])],
@@ -405,6 +409,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])
@@ -417,6 +428,9 @@ echo ""
 echo " Configurations summary:"
 echo ""
 echo "        prefix:          $prefix"
+echo "        datarootdir:     $datarootdir"
+echo "        infodir:         $infodir"
+echo "        sysconfdir:      $sysconfdir"
 echo ""
 echo "        Xaw3d:           $with_xaw3d"
 echo ""