aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog6
-rw-r--r--macros/gnome-gnorba-check.m422
-rw-r--r--macros/gnome-orbit-check.m419
3 files changed, 32 insertions, 15 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 5c6fd85a94..bb2d1a4264 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,5 +1,11 @@
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.
+
* gnome.m4: (GNOME_INIT_HOOK): Add GNOME_GNORBA_CHECK if
gnome-config is found. New GNOMEGNORBA_LIBS library variable
(GNOMEGNORBA_LIBS is a superset of GNOMEUI_LIBS). Update
diff --git a/macros/gnome-gnorba-check.m4 b/macros/gnome-gnorba-check.m4
index bb3d9b7125..dbac0a6cf7 100644
--- a/macros/gnome-gnorba-check.m4
+++ b/macros/gnome-gnorba-check.m4
@@ -6,23 +6,27 @@ dnl
AC_DEFUN([GNOME_GNORBA_HOOK],[
GNOME_ORBIT_HOOK([],$2)
- AC_MSG_CHECKING(for gnorba libraries)
- GNORBA_CFLAGS=
- GNORBA_LIBS=
- if test -n "$ORBIT_LIBS"; then
+ AC_CACHE_CHECK([for gnorba libraries],gnome_cv_gnorba_found,[
+ gnome_cv_gnorba_found=no
+ if test x$gnome_cv_orbit_found = xyes; then
+ GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
+ GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
+ if test -n "$GNORBA_LIBS"; then
+ gnome_cv_gnorba_found=yes
+ fi
+ fi
+ ])
+ AM_CONDITIONAL(HAVE_GNORBA, test x$gnome_cv_gnorba_found = xyes)
+ if test x$gnome_cv_orbit_found = xyes; then
$1
GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
- fi
- if test -n "$GNORBA_LIBS"; then
AC_SUBST(GNORBA_CFLAGS)
AC_SUBST(GNORBA_LIBS)
- AC_MSG_RESULT(yes)
else
if test x$2 = xfailure; then
- AC_MSG_ERROR(Could not find gnorba libraries)
+ AC_MSG_ERROR(gnorba library not installed or installation problem)
fi
- AC_MSG_RESULT(no)
fi
])
diff --git a/macros/gnome-orbit-check.m4 b/macros/gnome-orbit-check.m4
index c2cb9c8e41..54bf33aa4b 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
])