diff --git a/ChangeLog b/ChangeLog index 6f5739919c..628f80bc2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-26 Derek Atkins + + * 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 * src/import-export/hbci/gnc-hbci-gettrans.h: Factor out importing diff --git a/configure.in b/configure.in index e6e5bcd426..67cfa1ae90 100644 --- a/configure.in +++ b/configure.in @@ -508,14 +508,15 @@ dnl MUMBLE_{LIBS,CFLAGS}... 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