diff -crN ./libbonobo/bonobo/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/bonobo/Makefile.am *** ./libbonobo/bonobo/Makefile.am Fri Oct 18 12:25:53 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/bonobo/Makefile.am Mon Feb 24 16:37:57 2003 *************** *** 14,20 **** -DG_LOG_DOMAIN=\"Bonobo\" \ -DVERSION=\"$(VERSION)\" ! LDFLAGS=@LT_VERSION_INFO@ CORBA_SOURCE = \ Bonobo.h \ --- 14,21 ---- -DG_LOG_DOMAIN=\"Bonobo\" \ -DVERSION=\"$(VERSION)\" ! LDFLAGS= @LDFLAGS@ \ ! @LT_VERSION_INFO@ CORBA_SOURCE = \ Bonobo.h \ diff -crN ./libbonobo/bonobo/libbonobo-2.0.pc.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/bonobo/libbonobo-2.0.pc.in *** ./libbonobo/bonobo/libbonobo-2.0.pc.in Tue Jan 8 14:03:58 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/bonobo/libbonobo-2.0.pc.in Tue Jan 28 13:54:12 2003 *************** *** 3,9 **** libdir=@libdir@ includedir=@includedir@ idldir=@datadir@/idl/bonobo-2.0 ! idlinclude=@datadir@/idl/bonobo-2.0 @BONOBO_ACTIVATION_IDL_DIR@ Name: libbonobo Description: libbonobo --- 3,9 ---- libdir=@libdir@ includedir=@includedir@ idldir=@datadir@/idl/bonobo-2.0 ! idlinclude=@datadir@/idl/bonobo-2.0 @BONOBO_ACTIVATION_IDL_DIR_PC@ Name: libbonobo Description: libbonobo diff -crN ./libbonobo/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/configure.in *** ./libbonobo/configure.in Fri Mar 14 16:53:41 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/configure.in Mon Feb 24 16:42:32 2003 *************** *** 1,7 **** AC_INIT(bonobo/bonobo-moniker.h) AM_CONFIG_HEADER(config.h) ! AM_INIT_AUTOMAKE(libbonobo, 2.2.1) AM_MAINTAINER_MODE --- 1,7 ---- AC_INIT(bonobo/bonobo-moniker.h) AM_CONFIG_HEADER(config.h) ! AM_INIT_AUTOMAKE(libbonobo, 2.2.0) AM_MAINTAINER_MODE *************** *** 11,21 **** dnl AC_PROG_INTLTOOL - dnl with higher autotools, we can set ACLOCAL_AMFLAGS to make Makefile's - dnl aware of our aclocal include dirs; but this works for automake-1.4 - dnl gnome-autogen.sh sets ACLOCAL_FLAGS properly - ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - LT_VERSION_INFO='-version-info 0:0:1' AC_ISC_POSIX --- 11,16 ---- *************** *** 32,38 **** gnomelocaledir='${prefix}/${DATADIRNAME}/locale' AC_SUBST(gnomelocaledir) ! ALL_LINGUAS="am ar az be bg ca cs da de el eo es fa fi fr gl he hu id it ja ko lv mk mn ms nl nn no pl pt pt_BR ro ru sk sl sq sv ta tr uk vi zh_CN zh_TW" AM_GLIB_GNU_GETTEXT AC_SUBST(CFLAGS) --- 27,33 ---- gnomelocaledir='${prefix}/${DATADIRNAME}/locale' AC_SUBST(gnomelocaledir) ! ALL_LINGUAS="am ar az be bg ca cs da de el es fa fi fr gl he hu it ja ko lv mk ms nl nn no pl pt pt_BR ru sk sl sq sv ta tr uk vi zh_CN zh_TW" AM_GLIB_GNU_GETTEXT AC_SUBST(CFLAGS) *************** *** 89,95 **** --- 84,94 ---- # Activation idl files BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`" + if test "x$BONOBO_ACTIVATION_IDL_DIR_PC" = "x" ; then + BONOBO_ACTIVATION_IDL_DIR_PC=$BONOBO_ACTIVATION_IDL_DIR + fi AC_SUBST(BONOBO_ACTIVATION_IDL_DIR) + AC_SUBST(BONOBO_ACTIVATION_IDL_DIR_PC) ################################################## # Check for gtk-doc. diff -crN ./libbonobo/doc/api/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/Makefile.am *** ./libbonobo/doc/api/Makefile.am Wed Feb 5 19:53:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/Makefile.am Fri Jul 4 13:54:27 2003 *************** *** 47,55 **** GTKDOC_CFLAGS = \ @CFLAGS@ \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(LIBBONOBO_CFLAGS) \ -I$(top_srcdir) \ ! -I$(top_builddir) GTKDOC_LIBS = $(top_builddir)/bonobo/libbonobo-2.la $(LIBBONOBO_LIBS) --- 47,56 ---- GTKDOC_CFLAGS = \ @CFLAGS@ \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir) \ ! -I$(top_builddir) \ ! @CPPFLAGS@ \ ! $(LIBBONOBO_CFLAGS) GTKDOC_LIBS = $(top_builddir)/bonobo/libbonobo-2.la $(LIBBONOBO_LIBS) *************** *** 171,178 **** echo '-- Installing '$$i ; \ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ fi) # --- 172,177 ---- diff -crN ./libbonobo/monikers/Bonobo_Moniker_std.server.in.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/monikers/Bonobo_Moniker_std.server.in.in *** ./libbonobo/monikers/Bonobo_Moniker_std.server.in.in Fri Oct 5 13:09:19 2001 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/monikers/Bonobo_Moniker_std.server.in.in Thu Aug 29 09:40:43 2002 *************** *** 1,7 **** --- 1,7 ---- diff -crN ./libbonobo/monikers/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/monikers/Makefile.am *** ./libbonobo/monikers/Makefile.am Fri Feb 1 07:04:16 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/monikers/Makefile.am Fri Aug 2 13:14:32 2002 *************** *** 40,45 **** bonobo-moniker-std.c libmoniker_std_2_la_LDFLAGS = -module -avoid-version ! libmoniker_std_2_la_LIBADD = $(top_builddir)/bonobo/libbonobo-2.la EXTRA_DIST = Bonobo_Moniker_std.server.in.in --- 40,46 ---- bonobo-moniker-std.c libmoniker_std_2_la_LDFLAGS = -module -avoid-version ! libmoniker_std_2_la_LIBADD = $(top_builddir)/bonobo/libbonobo-2.la \ ! $(LIBBONOBO_LIBS) EXTRA_DIST = Bonobo_Moniker_std.server.in.in