[Gnucash-changes] r12983 - gnucash/trunk - * configure.in: fail if we find libgsf >= 1.12.2 but not libgsf-gnome.

[Derek Atkins]

Author: warlord
Date: 2006-01-26 14:01:16 -0500 (Thu, 26 Jan 2006)
New Revision: 12983
Trac: http://svn.gnucash.org/trac/changeset/12983

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/configure.in
Log:
	* configure.in: fail if we find libgsf >= 1.12.2 but not libgsf-gnome.
	  This is instead of configure succeeding and then failing the
	  build later.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-26 17:38:26 UTC (rev 12982)
+++ gnucash/trunk/ChangeLog	2006-01-26 19:01:16 UTC (rev 12983)
@@ -1,3 +1,9 @@
+2006-01-26  Derek Atkins  <derek at ihtfp.com>
+
+	* configure.in: fail if we find libgsf >= 1.12.2 but not libgsf-gnome.
+	  This is instead of configure succeeding and then failing the
+	  build later.
+
 2006-01-24  Christian Stimming  <stimming at tuhh.de>
 
 	* src/import-export/hbci/gnc-hbci-gettrans.h: Factor out importing

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2006-01-26 17:38:26 UTC (rev 12982)
+++ gnucash/trunk/configure.in	2006-01-26 19:01:16 UTC (rev 12983)
@@ -508,14 +508,15 @@
 dnl Q: What does PKG_CHECK_MODULES create?
 dnl A: Just _CFLAGS and _LIBS, apparently [pkg.m4]
 
-dnl $4=true => don't die in case of failure.
-PKG_CHECK_MODULES(GSF, libgsf-1 >= 1.12.2 libgsf-gnome-1 >= 1.12.2,,true)
+AC_MSG_CHECKING([for libgsf >= 1.12.2])
 if $PKG_CONFIG --silence-errors 'libgsf-1 >= 1.12.2'
 then
+  AC_MSG_RESULT(found)
+  PKG_CHECK_MODULES(GSF, libgsf-1 >= 1.12.2 libgsf-gnome-1 >= 1.12.2,,)
   AC_DEFINE(HAVE_LIBGSF,1,[System has libgsf-1.12.2 or better])
   HAVE_LIBGSF=yes
 else
-  AC_MSG_RESULT(using internally-packaged libgsf)
+  AC_MSG_RESULT(not found.  using internally-packaged libgsf)
   GSF_CFLAGS='-I${top_srcdir}/lib/libgsf-1.12.3'
   GSF_LIBS='${top_builddir}/lib/libgsf-1.12.3/gsf/libgsf-1.la'
   HAVE_LIBGSF=no