From: Arun Persaud <arun@nubati.net>
Date: Fri, 15 Feb 2013 01:29:51 +0000 (-0800)
Subject: Merge branch 'master' into v4.7.x
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=123b5b814cbc71aa6575fcea6c92131b47a237e7;hp=-c;p=xboard.git

Merge branch 'master' into v4.7.x
---

123b5b814cbc71aa6575fcea6c92131b47a237e7
diff --combined configure.ac
index 218cce7,84614da..bb39cd4
--- a/configure.ac
+++ b/configure.ac
@@@ -28,7 -28,7 +28,7 @@@ dnl| to regenerate configure.  Then sub
  dnl| the standard version of xboard.
  
  dnl| define second argument as VERSION.PATCHLEVEL. e.g. 4.4.0j
 -AC_INIT([xboard],[master-20121211],[bug-xboard@gnu.org])
 +AC_INIT([xboard],[4.7.0],[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 +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)