diff options
| author | Eric Fischer <eric@eazel.com> | 2001-03-12 20:01:53 +0000 |
|---|---|---|
| committer | Eric Fischer <eric@src.gnome.org> | 2001-03-12 20:01:53 +0000 |
| commit | 8e91bb9968cf3f94853bd52766cbf6e02638f37a (patch) | |
| tree | 5a810c90e452ad7da2f1d72f91cc0ea6d9f5cb7d | |
| parent | bbac7beca524c77b6b44864459cb7732a7b9e4de (diff) | |
| download | nautilus-8e91bb9968cf3f94853bd52766cbf6e02638f37a.tar.gz | |
reviewed by: Robin * Slomkowski <rslomkow@eazel.com>
2001-03-12 Eric Fischer <eric@eazel.com>
reviewed by: Robin * Slomkowski <rslomkow@eazel.com>
* configure.in:
Change ammonite version checking to use the same logic as
other version number checks, to fix the broken tinderbox
* nautilus.spec.in:
Inherit the required ammonite version number from configure.in
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | configure.in | 27 | ||||
| -rw-r--r-- | nautilus.spec.in | 2 |
3 files changed, 18 insertions, 22 deletions
@@ -1,3 +1,14 @@ +2001-03-12 Eric Fischer <eric@eazel.com> + + reviewed by: Robin * Slomkowski <rslomkow@eazel.com> + + * configure.in: + Change ammonite version checking to use the same logic as + other version number checks, to fix the broken tinderbox + + * nautilus.spec.in: + Inherit the required ammonite version number from configure.in + 2001-03-12 Robin * Slomkowski <rslomkow@rslomkow.org> * configure.in: upped the test to 1000 instead of diff --git a/configure.in b/configure.in index 6f6a41f5f..65f23043e 100644 --- a/configure.in +++ b/configure.in @@ -26,6 +26,7 @@ MEDUSA_REQUIRED=0.5 ESOUND_REQUIRED=0.2.22 LIBGHTTP_REQUIRED=1.0.9 SCROLLKEEPER_REQUIRED=0.1.4 +AMMONITE_REQUIRED=1.0.0 AC_SUBST(IMLIB_REQUIRED) AC_SUBST(LIBXML_REQUIRED) @@ -847,28 +848,12 @@ dnl = Begin tests for ammonite (--enable-eazel-services only) dnl ==================================== if test "x$EAZEL_SERVICES_ENABLED" = "xyes" ; then - AC_MSG_CHECKING(for Ammonite >= 1.0.0) - 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 1000; then - ammonite_ok=true; - else - ammonite_ok=false - fi - fi + EAZEL_VERSION_INSIST(ammonite, $GNOME_CONFIG --modversion ammonite | awk -F- '{print $2}', >=, AMMONITE_REQUIRED) - 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 1.0.0 or newer is required for Eazel Services. Please obtain it from Eazel's FTP site) - fi + AMMONITE_CFLAGS=`$GNOME_CONFIG --cflags ammonite` + AMMONITE_LIBS=`$GNOME_CONFIG --libs ammonite` + AC_SUBST(AMMONITE_CFLAGS) + AC_SUBST(AMMONITE_LIBS) fi dnl ======================= dnl = End tests for ammonite diff --git a/nautilus.spec.in b/nautilus.spec.in index bd3fbad6e..a66f567a1 100644 --- a/nautilus.spec.in +++ b/nautilus.spec.in @@ -64,7 +64,7 @@ Conflicts: mozilla = M17 Summary: Nautilus component framework for services Group: User Interface/Desktop Requires: %name = %{PACKAGE_VERSION} -Requires: ammonite >= 1.0 +Requires: ammonite >= @AMMONITE_REQUIRED@ Requires: rpm >= @RPM_VERSION@ Requires: usermode >= 1.37 Requires: pam >= 0.72 |