X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=86b135f25823da63b13fd8ebc33abef43c670850;hb=9d84fbc414dd9e4112e6ba42c9eca6c2244be6db;hp=981f05878baf3979d30e9d90f3959d9ab909286e;hpb=50439f8be999b82243f850c952c0557f2a57bf58;p=xboard.git

diff --git a/configure.ac b/configure.ac
index 981f058..86b135f 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, 2011, 2012 Free Software Foundation, Inc.
+dnl| 2008, 2009, 2010, 2011, 2012, 2013 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-20121107],[bug-xboard@gnu.org])
+AC_INIT([xboard],[master-20130224],[bug-xboard@gnu.org])
 
 dnl| need this to be able to compile some files in a subdir (filebrowser)
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -119,8 +119,12 @@ AC_TRY_COMPILE([],[],
   AC_MSG_RESULT(no)
   CFLAGS="$SAVE_CFLAGS")
 
-dnl | check for cairo and librsvg
+dnl | check for pkg-config
+AC_CHECK_PROGS([PKGCONFIG], [pkg-config], pkgconfig_not_found)
+AS_IF( [test "x$PKGCONFIG" = xpkgconfig_not_found],
+       AC_MSG_ERROR([cannot find pkg-config! Please install it.]))
 
+dnl | check for cairo and librsvg
 PKG_CHECK_MODULES([CAIRO], [ cairo >= 1.2.0 librsvg-2.0 >= 2.14.0 ])
 AC_SUBST(CAIRO_CFLAGS)
 AC_SUBST(CAIRO_LIBS)
@@ -147,11 +151,6 @@ AC_ARG_WITH([Xaw],
             [with_Xaw=yes],
             [with_Xaw=no])
 
-dnl | make results available in Makefile.am
-AM_CONDITIONAL([withGTK],   [test x"$with_GTK" = x"yes"])
-AM_CONDITIONAL([withXaw],   [test x"$with_Xaw3d" = x"yes"])
-AM_CONDITIONAL([withXaw],   [test x"$with_Xaw" = x"yes"])
-
 dnl | check for libraries
 if test x"$with_GTK" = x"yes" ; then
   PKG_CHECK_MODULES([GTK], [ gtk+-2.0 >= 2.16.0 gmodule-2.0 ])
@@ -191,8 +190,9 @@ dnl | check availability of Xaw3d
                     [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])])
 
-dnl | no Xaw3d, check for Xaw
+dnl | no Xaw3d, check for Xaw; make it the default
   if test x"$with_Xaw3d" = x"no" ; then
+     with_Xaw=yes
      save_cflags="$CFLAGS"
      save_cppflags="$CPPFLAGS"
      CFLAGS="$CFLAGS $X_CFLAGS"
@@ -210,6 +210,12 @@ dnl | no Xaw3d, check for Xaw
 
 fi
 
+dnl | make results available in Makefile.am
+AM_CONDITIONAL([withGTK],   [test x"$with_GTK" = x"yes"])
+AM_CONDITIONAL([withXaw],   [test x"$with_Xaw3d" = x"yes"])
+AM_CONDITIONAL([withXaw],   [test x"$with_Xaw" = x"yes"])
+
+
 AC_SUBST(FRONTEND_CFLAGS)
 AC_SUBST(FRONTEND_LIBS)
 
@@ -446,14 +452,15 @@ AC_DEFINE_UNQUOTED(USE_PTYS, $USE_PTYS)
 
 
 dnl | define not to build zippy as a default, so that autoheader is happy
-AC_DEFINE(ZIPPY, 0,[should zippy be enabled])
 AC_ARG_ENABLE( [zippy],
 	       [AS_HELP_STRING([--enable-zippy],[support interfacing a chess program to ICS (default)])],
 	       [],
-	       [enable_zippy="yes"])
+	       [enable_zippy="no"])
 
 if test x"$enable_zippy" != xno; then
   AC_DEFINE(ZIPPY, 1,[should zippy be enabled])
+else
+  AC_DEFINE(ZIPPY, 0,[should zippy be enabled])
 fi
 AM_CONDITIONAL([ZIPPY], [test x$enable_zippy != xno])
 
@@ -469,11 +476,13 @@ enable_sigint=$enableval
 AC_DEFINE(ATTENTION, 1)])
 
 
+if test x"$with_Xaw3d" = x"yes" -o  x"$with_Xaw" = x"yes" ; then
 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)
+fi
 
 dnl | should we install desktop icons and mime associations?
 AC_ARG_ENABLE(	[update-mimedb],