diff options
| author | Andrew T. Veliath <andrewv@usa.net> | 1998-11-13 04:11:17 +0000 |
|---|---|---|
| committer | Andrew T. Veliath <andrewtv@src.gnome.org> | 1998-11-13 04:11:17 +0000 |
| commit | 1ce0dde5f733f3e857da90edaf02a2be33fa919c (patch) | |
| tree | fe1fde044d6d1483e3cdb6736c34e4b416e75bb9 /macros/gnome-orbit-check.m4 | |
| parent | 544c70ca9ad0fcfb4672c2fff7ae35eb857af65d (diff) | |
| download | shared-mime-info-1ce0dde5f733f3e857da90edaf02a2be33fa919c.tar.gz | |
Remove AC_DEFINE(HAVE_ORBIT). Add AM_CONDITIONAL for HAVE_ORBIT.
1998-11-12 Andrew T. Veliath <andrewv@usa.net>
* gnome-orbit-check.m4: Remove AC_DEFINE(HAVE_ORBIT). Add
AM_CONDITIONAL for HAVE_ORBIT. gnome-gnorba-check.m4: Same with
HAVE_GNORBA. Change GNOME_ORBIT_HOOK and GNOME_GNORBA_HOOK to use
AC_CACHE_CHECK, setting both gnome_cv_orbit_found and
gnome_cv_gnorba_found.
svn path=/trunk/; revision=472
Diffstat (limited to 'macros/gnome-orbit-check.m4')
| -rw-r--r-- | macros/gnome-orbit-check.m4 | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/macros/gnome-orbit-check.m4 b/macros/gnome-orbit-check.m4 index c2cb9c8e..54bf33aa 100644 --- a/macros/gnome-orbit-check.m4 +++ b/macros/gnome-orbit-check.m4 @@ -7,17 +7,24 @@ dnl AC_DEFUN([GNOME_ORBIT_HOOK],[ AC_PATH_PROG(ORBIT_CONFIG,orbit-config,no) AC_PATH_PROG(ORBIT_IDL,orbit-idl,no) - if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then - if test x$2 = xfailure; then - AC_MSG_ERROR(Could not find orbit-config or orbit-idl) - fi - else + AC_CACHE_CHECK([for working ORBit environment],gnome_cv_orbit_found,[ + if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then + gnome_cv_orbit_found=no + else + gnome_cv_orbit_found=yes + fi + ]) + AM_CONDITIONAL(HAVE_ORBIT, test x$gnome_cv_orbit_found = xyes) + if test x$gnome_cv_orbit_found = xyes; then $1 ORBIT_CFLAGS=`orbit-config --cflags client server` ORBIT_LIBS=`orbit-config --use-service=name --libs client server` AC_SUBST(ORBIT_CFLAGS) AC_SUBST(ORBIT_LIBS) - AC_DEFINE(HAVE_ORBIT) + else + if test x$2 = xfailure; then + AC_MSG_ERROR(ORBit not installed or installation problem) + fi fi ]) |