diff options
| author | Peter Williams <peterw@src.gnome.org> | 2000-06-29 23:59:20 +0800 |
|---|---|---|
| committer | Peter Williams <peterw@src.gnome.org> | 2000-06-29 23:59:20 +0800 |
| commit | 8ba0e76ccb80df199a04f8b9d60afcf7e5930666 (patch) | |
| tree | e96a3fc4e2417b00fa697a479844e1517de2165e | |
| parent | d2875d9e05b5d20e7f8a5d5300dfc9e83de7b7bc (diff) | |
| download | gsoc2013-evolution-8ba0e76ccb80df199a04f8b9d60afcf7e5930666.tar.gz gsoc2013-evolution-8ba0e76ccb80df199a04f8b9d60afcf7e5930666.tar.zst gsoc2013-evolution-8ba0e76ccb80df199a04f8b9d60afcf7e5930666.zip | |
Make the pilot stuff in calendar/gui optional.
svn path=/trunk/; revision=3793
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 15 | ||||
| -rw-r--r-- | configure.in | 2 |
4 files changed, 25 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2000-06-29 Peter Williams <peterw@helixcode.com> + + * configure.in: Re-enable GNOME_PILOT_CHECK + 2000-06-28 Ettore Perazzoli <ettore@helixcode.com> * configure.in: `AM_PATH_GCONF'. diff --git a/calendar/ChangeLog b/calendar/ChangeLog index ba01ebddbc..3f3aca1fa8 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2000-06-29 Peter Williams <peterw@helixcode.com> + + * gui/Makefile.am (LINK_FLAGS): Make the calendar-pilot-sync + program conditional on HAVE_GNOME_PILOT, and add + GNOME_PILOT_CFLAGS, GNOME_PILOT_LIBS, and PISOCK_LIBS in the + appropriate places. + 2000-06-29 Seth Alves <alves@hungry.com> * pcs/cal.c (Cal_get_uid_by_pilot_id): diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index b7c6082f99..d3f8410595 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -2,6 +2,14 @@ SUBDIRS = dialogs help_base = $(datadir)/gnome/help/cal +if HAVE_GNOME_PILOT +CPS = calendar-pilot-sync #empty-pilot-calendar +else +CPS = +endif + +bin_PROGRAMS = evolution-calendar $(CPS) + CPPFLAGS = \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" @@ -16,6 +24,7 @@ INCLUDES = \ -I$(includedir) \ $(BONOBO_VFS_GNOME_CFLAGS) \ $(GNOME_CONDUIT_INCLUDEDIR) \ + $(GNOME_PILOT_CFLAGS) \ $(PISOCK_INCLUDEDIR) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" @@ -23,6 +32,8 @@ INCLUDES = \ LINK_FLAGS = \ $(BONOBO_VFS_GNOME_LIBS) \ $(INTLLIBS) \ + $(GNOME_PILOT_LIBS) \ + $(PISOCK_LIBS) \ dialogs/libcal-dialogs.a \ $(top_builddir)/calendar/cal-client/libcal-client.la \ $(top_builddir)/calendar/cal-util/libcal-util.la \ @@ -40,7 +51,6 @@ glade_DATA = \ glade_messages = event-editor-dialog.glade.h -bin_PROGRAMS = evolution-calendar calendar-pilot-sync #empty-pilot-calendar # calendar-conduit-control-applet evolution_calendar_SOURCES = \ @@ -101,7 +111,7 @@ evolution_calendar_LDADD = \ evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf` - +if HAVE_GNOME_PILOT calendar_pilot_sync_SOURCES = \ calendar-pilot-sync.c @@ -111,6 +121,7 @@ calendar_pilot_sync_LDADD = -lpisock \ $(BONOBO_HTML_GNOME_LIBS) \ $(LINK_FLAGS) +endif #empty_pilot_calendar_SOURCES = \ # empty-pilot-calendar.c diff --git a/configure.in b/configure.in index b9d5d3be78..fa2424beb8 100644 --- a/configure.in +++ b/configure.in @@ -349,7 +349,7 @@ AC_SUBST(BONOBO_VFS_GNOME_CFLAGS) dnl ****************************** dnl Pilot checking dnl ****************************** -dnl GNOME_PILOT_CHECK +GNOME_PILOT_CHECK dnl ****** |