diff options
| author | Michael Fleming <mfleming@src.gnome.org> | 2001-03-01 23:35:24 +0000 |
|---|---|---|
| committer | Michael Fleming <mfleming@src.gnome.org> | 2001-03-01 23:35:24 +0000 |
| commit | 98eff0489470af4e350449ffb7fcd46a8d4115ee (patch) | |
| tree | 47eabc1a416528be9604590be493eae2026e3256 | |
| parent | c49b2e259407ca3b22b49191de595913f0f96bea (diff) | |
| download | nautilus-98eff0489470af4e350449ffb7fcd46a8d4115ee.tar.gz | |
reviewed by: <rslomkow@eazel.com>
Bug 2926: Improve check for ammonite with --enable-eazel-services
* configure.in:
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 22 |
2 files changed, 22 insertions, 8 deletions
@@ -1,3 +1,11 @@ +2001-03-01 Mike Fleming <mfleming@eazel.com> + + reviewed by: <rslomkow@eazel.com> + + Bug 2926: Improve check for ammonite with --enable-eazel-services + + * configure.in: + 2001-03-01 Michael Engber <engber@eazel.com> reviewed by: George Lebl <jirka@5z.org> diff --git a/configure.in b/configure.in index 2af2c31d3..c970b7f40 100644 --- a/configure.in +++ b/configure.in @@ -709,22 +709,28 @@ dnl = Begin tests for ammonite (--enable-eazel-services only) dnl ==================================== if test "x$EAZEL_SERVICES_ENABLED" = "xyes" ; then - AMMONITE_CFLAGS="" - AMMONITE_LIBS="" - AC_MSG_CHECKING(for Ammonite) + AC_MSG_CHECKING(for Ammonite >= 0.8.7) if test -n `gnome-config --libs ammonite | cut -d ' ' -f1`; then + vers=`gnome-config --modversion ammonite | sed -e "s/[^-]*-//" | \ + awk 'BEGIN { FS = "."; } { printf "%d", $1 * 1000 + $2 * 100 + $3;}'` + if test "$vers" -ge 807; then + ammonite_ok=true; + else + ammonite_ok=false + fi + fi + + if $ammonite_ok; then AMMONITE_CFLAGS=`gnome-config --cflags ammonite` AMMONITE_LIBS=`gnome-config --libs ammonite` AC_MSG_RESULT(yes) + AC_SUBST(AMMONITE_CFLAGS) + AC_SUBST(AMMONITE_LIBS) else AC_MSG_RESULT(no) - AC_MSG_ERROR(Ammonite is required for Eazel Services. Please obtain it from Eazel's FTP site) + AC_MSG_ERROR(Ammonite 0.8.7 or newer is required for Eazel Services. Please obtain it from Eazel's FTP site) fi - - AC_SUBST(AMMONITE_CFLAGS) - AC_SUBST(AMMONITE_LIBS) - fi dnl ======================= dnl = End tests for ammonite |