diff options
author | nobody <nobody@localhost> | 2000-02-05 06:25:36 +0800 |
---|---|---|
committer | nobody <nobody@localhost> | 2000-02-05 06:25:36 +0800 |
commit | 1dfb48f783c0fb86469202ef096e1bd1ce5b1b1f (patch) | |
tree | 5e5c8f9e4d0929a39b0295b10a322997006e4afc /macros/gnome-libgtop-check.m4 | |
parent | dec6d6b0971480b8910c301daa6218abe3f2eee0 (diff) | |
download | gsoc2013-evolution-LIBGTOP_1_0_11.tar gsoc2013-evolution-LIBGTOP_1_0_11.tar.gz gsoc2013-evolution-LIBGTOP_1_0_11.tar.bz2 gsoc2013-evolution-LIBGTOP_1_0_11.tar.lz gsoc2013-evolution-LIBGTOP_1_0_11.tar.xz gsoc2013-evolution-LIBGTOP_1_0_11.tar.zst gsoc2013-evolution-LIBGTOP_1_0_11.zip |
This commit was manufactured by cvs2svn to create tagLIBGTOP_1_0_11
'LIBGTOP_1_0_11'.
svn path=/tags/LIBGTOP_1_0_11/; revision=1670
Diffstat (limited to 'macros/gnome-libgtop-check.m4')
-rw-r--r-- | macros/gnome-libgtop-check.m4 | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/macros/gnome-libgtop-check.m4 b/macros/gnome-libgtop-check.m4 index 0ce6f6f612..038719276b 100644 --- a/macros/gnome-libgtop-check.m4 +++ b/macros/gnome-libgtop-check.m4 @@ -40,7 +40,7 @@ AC_DEFUN([GNOME_LIBGTOP_TYPES], [ AC_CHECK_HEADERS(sys/bitypes.h) AC_LIBGTOP_CHECK_TYPE(u_int64_t, unsigned long long int) - AC_LIBGTOP_CHECK_TYPE(int64_t, signed long long int) + AC_LIBGTOP_CHECK_TYPE(int64_t, long long int) ]) dnl @@ -61,6 +61,10 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK], AC_SUBST(LIBGTOP_INCS) AC_SUBST(LIBGTOP_NAMES_LIBS) AC_SUBST(LIBGTOP_NAMES_INCS) + AC_SUBST(LIBGTOP_GUILE_INCS) + AC_SUBST(LIBGTOP_GUILE_LIBS) + AC_SUBST(LIBGTOP_GUILE_NAMES_INCS) + AC_SUBST(LIBGTOP_GUILE_NAMES_LIBS) AC_SUBST(LIBGTOP_MAJOR_VERSION) AC_SUBST(LIBGTOP_MINOR_VERSION) AC_SUBST(LIBGTOP_MICRO_VERSION) @@ -149,13 +153,10 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK], sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` libgtop_micro_version=`$LIBGTOP_CONFIG --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test $libgtop_major_version != $min_libgtop_major ; then - no_libgtop=mismatch - else - test $libgtop_minor_version -lt $min_libgtop_minor && no_libgtop=yes - if test $libgtop_minor_version = $min_libgtop_minor ; then - test $libgtop_micro_version -lt $min_libgtop_micro && no_libgtop=yes - fi + test $libgtop_major_version != $min_libgtop_major && no_libgtop=yes + test $libgtop_minor_version -lt $min_libgtop_minor && no_libgtop=yes + if test $libgtop_minor_version = $min_libgtop_minor ; then + test $libgtop_micro_version -lt $min_libgtop_micro && no_libgtop=yes fi . $configfile fi @@ -172,9 +173,6 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK], ifelse([$2], [], :, [$2]) else AC_MSG_RESULT(no) - if test "$no_libgtop"x = mismatchx; then - AC_MSG_ERROR(LibGTop major version mismatch $libgtop_major_version != $min_libgtop_major) - fi if test "x$3" = "xfail"; then AC_MSG_ERROR(LibGTop >= $min_libgtop_version not found) else |