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:
parent
b08f7c854e
commit
8c67d0e037
3 changed files with 12 additions and 8 deletions
14
configure.in
14
configure.in
|
@ -59,14 +59,12 @@ for dir in `(IFS=:; for i in $PATH; do echo $i ; done)` ; do
|
|||
break
|
||||
fi
|
||||
done
|
||||
AC_CHECK_PROG(ORBIT_CONFIG, orbit-config, orbit-config)
|
||||
if test -n "$ORBIT_CONFIG"; then
|
||||
ORBIT_LIBS="`orbit-config --libs client server`"
|
||||
ORBIT_CFLAGS="`orbit-config --cflags client server`"
|
||||
fi
|
||||
AC_SUBST(ORBIT_CFLAGS)
|
||||
AC_SUBST(ORBIT_LIBS)
|
||||
AM_CONDITIONAL(ORBIT_INSTALLED, test -n "$ORBIT_LIBS")
|
||||
|
||||
dnl
|
||||
dnl ORBit checks
|
||||
dnl
|
||||
GNOME_ORBIT_HOOK([have_orbit=true],[])
|
||||
AM_CONDITIONAL(ORBIT_INSTALLED, test x$have_orbit = xtrue)
|
||||
|
||||
ORB_LIBS="$ORBIT_LIBS"
|
||||
ORB_CFLAGS="$ORBIT_CFLAGS"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue