[monkey-bubble: 528/753] AC_SUBST this.

[Sven Herzberg <herzi src gnome org>]

commit 90b8f4b629c66821dbe5448e7d73b3cc1e78cde1
Author: Martin Baulig <baulig suse de>
Date:   Sat Jul 14 14:21:27 2001 +0000

    AC_SUBST this.
    
    2001-07-14  Martin Baulig  <baulig suse de>
    
    	* configure.in (BONOBO_IDLDIR): AC_SUBST this.

 ChangeLog            |    4 ++++
 configure.in         |    5 ++++-
 libgnome/Makefile.am |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c772f1a..1fd7f3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-14  Martin Baulig  <baulig suse de>
+
+	* configure.in (BONOBO_IDLDIR): AC_SUBST this.
+
 2001-07-12  Darin Adler  <darin bentspoon com>
 
 	* configure.in: Remove duplicate AC_PROG_LEX.
diff --git a/configure.in b/configure.in
index 4079f40..24d53d3 100644
--- a/configure.in
+++ b/configure.in
@@ -68,9 +68,12 @@ AC_SUBST(MONIKER_LIBS)
 GNOME_VFS_VERSION=`$PKG_CONFIG --modversion gnome-vfs-2.0`
 AC_SUBST(GNOME_VFS_VERSION)
 
-AC_PATH_PROG(ORBIT_IDL, orbit-idl, no)
+ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
 AC_SUBST(ORBIT_IDL)
 
+BONOBO_IDLDIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
+AC_SUBST(BONOBO_IDLDIR)
+
 AC_CHECK_LIB(popt, poptStrippedArgv,, AC_MSG_ERROR([popt 1.5 or newer is required to build
 gnome-libs. You can download the latest version from ftp://people.redhat.com/sopwith/popt/]))
 
diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am
index 454672f..02c0c82 100644
--- a/libgnome/Makefile.am
+++ b/libgnome/Makefile.am
@@ -43,7 +43,7 @@ idls =							\
 	$(top_srcdir)/idl/Gnome.idl			\
 	$(top_srcdir)/idl/Gnome_Desktop.idl
 
-idl_flags = -I $(datadir)/idl -D__GNOME_COMPILATION
+idl_flags = -I @BONOBO_IDLDIR@ -D__GNOME_COMPILATION
 
 $(CORBA_SOURCE): $(idls) $(ORBIT_IDL)
 	$(ORBIT_IDL) $(top_srcdir)/idl/Gnome.idl -I$(top_srcdir)/idl $(idl_flags)