diff -up gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am.intlclock-build-fixes gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am
--- gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am.intlclock-build-fixes 2007-10-05 11:43:24.000000000 -0400
+++ gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am 2007-10-05 11:46:42.000000000 -0400
@@ -1,6 +1,8 @@
## We put the libpanel-applet dir here for when we build the applet
## inside the gnome-panel source tree
INCLUDES = \
+ -I$(srcdir)/../../libpanel-applet \
+ -I$(top_builddir)/libpanel-applet \
$(INTLCLOCK_CFLAGS) \
-DGNOMELOCALEDIR=\"$(prefix)/$(DATADIRNAME)/locale\" \
-DEVOLUTION_TEXTDOMAIN=\"evolution-2.12\" \
@@ -28,7 +30,6 @@ intlclock-marshallers.c: intlclock-marsh
intlclock-marshallers.h: intlclock-marshallers.list
glib-genmarshal --prefix _intlclock_marshal --header $< > $@
-noinst_PROGRAMS = intlclock-standalone
libexec_PROGRAMS = intlclock-applet
COMMON_SOURCES = \
@@ -75,7 +76,10 @@ intlclock_standalone_SOURCES = \
$(COMMON_SOURCES) \
standalone.c
-intlclock_applet_LDADD = $(INTLCLOCK_LIBS)
+intlclock_applet_LDADD = \
+ ../../libpanel-applet/libpanel-applet-2.la \
+ $(INTLCLOCK_LIBS)
+
intlclock_standalone_LDADD = $(INTLCLOCK_LIBS)
EXTRA_DIST = intlclock-marshallers.list
diff -up gnome-panel-2.20.0.1/intlclock-1.0/configure.in.intlclock-build-fixes gnome-panel-2.20.0.1/intlclock-1.0/configure.in
--- gnome-panel-2.20.0.1/intlclock-1.0/configure.in.intlclock-build-fixes 2007-10-05 11:43:24.000000000 -0400
+++ gnome-panel-2.20.0.1/intlclock-1.0/configure.in 2007-10-05 11:43:24.000000000 -0400
@@ -59,7 +59,7 @@ if test -n "$LIBECAL_REQUIREMENT"; then
fi
AM_CONDITIONAL(HAVE_LIBECAL, test -n "$LIBECAL_REQUIREMENT")
-PKG_CHECK_MODULES(INTLCLOCK, [ glib-2.0 gobject-2.0 gtk+-2.0 gdk-2.0 librsvg-2.0 libpanelapplet-2.0 libgnome-2.0 gconf-2.0 $LIBECAL_REQUIREMENT dbus-glib-1 gweather libxml-2.0 polkit polkit-dbus ])
+PKG_CHECK_MODULES(INTLCLOCK, [ glib-2.0 gobject-2.0 gtk+-2.0 gdk-2.0 librsvg-2.0 libgnome-2.0 libgnomeui-2.0 libbonobo-2.0 gconf-2.0 $LIBECAL_REQUIREMENT dbus-glib-1 gweather libxml-2.0 polkit polkit-dbus ])
AC_SUBST(INTLCLOCK_CFLAGS)
AC_SUBST(INTLCLOCK_LIBS)