Update ORBit checks to use new gnome-orbit-checks.m4. acconfig.h: Add

* configure.in: Update ORBit checks to use new
	gnome-orbit-checks.m4.  acconfig.h: Add HAVE_ORBIT.

panel/
	* Makefile.am: Update IDL compiler rule to depend on ORBIT_IDL.

n.b. Be sure to update macros and re autogen to get ORBIT_IDL defined.
This commit is contained in:
Andrew T. Veliath 1998-10-20 16:34:25 +00:00
parent b08f7c854e
commit 8c67d0e037
3 changed files with 12 additions and 8 deletions

View file

@ -1,3 +1,8 @@
1998-10-20 Andrew Veliath <andrewtv@usa.net>
* configure.in: Update ORBit checks to use new
gnome-orbit-checks.m4. acconfig.h: Add HAVE_ORBIT.
Sun Oct 18 22:02:28 1998 Owen Taylor <otaylor@gtk.org> Sun Oct 18 22:02:28 1998 Owen Taylor <otaylor@gtk.org>
* capplets/background-properties/property-background.c * capplets/background-properties/property-background.c

View file

@ -7,6 +7,7 @@
#undef HAVE_LIBSM #undef HAVE_LIBSM
#undef HAVE_PROGRAM_INVOCATION_SHORT_NAME #undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
#undef HAVE_PROGRAM_INVOCATION_NAME #undef HAVE_PROGRAM_INVOCATION_NAME
#undef HAVE_ORBIT
#undef HAVE_MICO_ORB_RUN #undef HAVE_MICO_ORB_RUN
#undef PACKAGE #undef PACKAGE
#undef VERSION #undef VERSION

View file

@ -59,14 +59,12 @@ for dir in `(IFS=:; for i in $PATH; do echo $i ; done)` ; do
break break
fi fi
done done
AC_CHECK_PROG(ORBIT_CONFIG, orbit-config, orbit-config)
if test -n "$ORBIT_CONFIG"; then dnl
ORBIT_LIBS="`orbit-config --libs client server`" dnl ORBit checks
ORBIT_CFLAGS="`orbit-config --cflags client server`" dnl
fi GNOME_ORBIT_HOOK([have_orbit=true],[])
AC_SUBST(ORBIT_CFLAGS) AM_CONDITIONAL(ORBIT_INSTALLED, test x$have_orbit = xtrue)
AC_SUBST(ORBIT_LIBS)
AM_CONDITIONAL(ORBIT_INSTALLED, test -n "$ORBIT_LIBS")
ORB_LIBS="$ORBIT_LIBS" ORB_LIBS="$ORBIT_LIBS"
ORB_CFLAGS="$ORBIT_CFLAGS" ORB_CFLAGS="$ORBIT_CFLAGS"