bonobo-config fixage

[Havoc Pennington <hp redhat com>]

Hi,

I think bonobo-config is still broken for parallel with bonobo-conf,
because I don't have a stable package of it built yet. But this makes
HEAD compile properly.

Headers/IDL still need moving in both stable and unstable.

Havoc

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/bonobo-config/ChangeLog,v
retrieving revision 1.116
diff -u -p -u -r1.116 ChangeLog
--- ChangeLog	2001/09/03 05:50:22	1.116
+++ ChangeLog	2001/09/19 19:20:08
@@ -1,3 +1,12 @@
+2001-09-17  Havoc Pennington  <hp redhat com>
+
+	* configure.in (BONOBO_IDLFLAGS): fix to find IDL files for
+	bonobo-activation in addition to libbonobo
+
+	* tests/Makefile.am (idl_flags): corresponding fix
+
+	* bonobo-config/Makefile.am (idl_flags): corresponding fix
+	
 2001-09-03  Abel Cheung  <maddog linux org hk>
 
 	* configure.in: Added zh_TW to ALL_LINGUAS.
Index: configure.in
===================================================================
RCS file: /cvs/gnome/bonobo-config/configure.in,v
retrieving revision 1.39
diff -u -p -u -r1.39 configure.in
--- configure.in	2001/09/03 05:50:22	1.39
+++ configure.in	2001/09/19 19:20:08
@@ -1,4 +1,3 @@
-AC_PREREQ(2.52)
 AC_INIT(bonobo-config/bonobo-config-bag.h)
 
 AM_CONFIG_HEADER(config.h)
@@ -31,8 +30,11 @@ AC_SUBST(BONOBO_CONFIG_LIBS)
 ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
 AC_SUBST(ORBIT_IDL)
 
+dnl some pkg-config support for this would be nice
 BONOBO_IDLDIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
-AC_SUBST(BONOBO_IDLDIR)
+BONOBO_ACTIVATION_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
+BONOBO_IDLFLAGS="-I $BONOBO_IDLDIR -I $BONOBO_ACTIVATION_IDLDIR"
+AC_SUBST(BONOBO_IDLFLAGS)
 
 PKG_CHECK_MODULES(BONOBO_CONFIG_GCONF, libbonobo-2.0 >= 1.98.0 gconf-2.0 >= 1.1.1)
 AC_SUBST(BONOBO_CONFIG_GCONF_CFLAGS)
Index: bonobo-config/Makefile.am
===================================================================
RCS file: /cvs/gnome/bonobo-config/bonobo-config/Makefile.am,v
retrieving revision 1.36
diff -u -p -u -r1.36 Makefile.am
--- bonobo-config/Makefile.am	2001/07/14 14:16:52	1.36
+++ bonobo-config/Makefile.am	2001/09/19 19:20:08
@@ -12,7 +12,7 @@ CORBA_SOURCE =			\
 	Bonobo_Config-stubs.c	\
 	Bonobo_Config-skels.c
 
-idl_flags = -I @BONOBO_IDLDIR@
+idl_flags = @BONOBO_IDLFLAGS@
 
 $(CORBA_SOURCE): ../idl/Bonobo_Config.idl $(ORBIT_IDL)
 	$(ORBIT_IDL) $(top_srcdir)/idl/Bonobo_Config.idl -I$(top_srcdir)/idl $(idl_flags)
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/gnome/bonobo-config/tests/Makefile.am,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile.am
--- tests/Makefile.am	2001/08/30 15:29:52	1.6
+++ tests/Makefile.am	2001/09/19 19:20:08
@@ -27,7 +27,7 @@ EXTRA_DIST = test-config.xml.in test-dit
 
 CORBA_SOURCE = Foo.h Foo-common.c Foo-stubs.c Foo-skels.c
 
-idl_flags = -I @BONOBO_IDLDIR@
+idl_flags =  @BONOBO_IDLFLAGS@
 
 $(CORBA_SOURCE): Foo.idl $(ORBIT_IDL)
 	$(ORBIT_IDL) $(srcdir)/Foo.idl -I$(top_srcdir)/idl $(idl_flags)