diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 15 | ||||
| -rw-r--r-- | libversit/.cvsignore | 3 | ||||
| -rw-r--r-- | libversit/Makefile.am | 4 |
4 files changed, 28 insertions, 3 deletions
@@ -1,3 +1,12 @@ +2002-07-22 Dan Winship <danw@ximian.com> + + * configure.in: Check if we're trying to build with the old + libversit module borrowed from gnome-pim instead of our own new + one, and refuse to build if so. + + * libversit/Makefile.am: Remove libversit.la stuff since we don't + want it and it messes up the build slightly. + 2002-07-18 Ettore Perazzoli <ettore@ximian.com> * configure.in: Prepend "$(WERROR)" to all the *_CFLAGS variables diff --git a/configure.in b/configure.in index 60a1bfe8e4..bfcd6e686a 100644 --- a/configure.in +++ b/configure.in @@ -2,6 +2,21 @@ AC_INIT(camel) AM_CONFIG_HEADER(config.h) +if test -f libversit/CVS/Repository; then + case `cat libversit/CVS/Repository` in + gnome-pim*) + echo "" + echo "ERROR: CVS working directory is out of date" + echo "Please do:" + echo " rm -rf libversit" + echo " cvs update -d libversit" + echo " automake libversit/Makefile" + echo "and try again. We apologize for the inconvenience" + exit 1 + ;; + esac +fi + EVOLUTION_MAJOR_VERSION=1 EVOLUTION_MINOR_VERSION=1 EVOLUTION_MICRO_VERSION=0 diff --git a/libversit/.cvsignore b/libversit/.cvsignore new file mode 100644 index 0000000000..1b997b3df8 --- /dev/null +++ b/libversit/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +vcc.c diff --git a/libversit/Makefile.am b/libversit/Makefile.am index 60ce4a41d1..40bdc48f36 100644 --- a/libversit/Makefile.am +++ b/libversit/Makefile.am @@ -1,6 +1,6 @@ # Makefile for libversit.a -# $Id: Makefile.am,v 1.11 2002/07/17 21:03:11 peterw Exp $ +# $Id: Makefile.am,v 1.12 2002/07/22 15:35:36 danw Exp $ VERSIT_SRC = \ vcc.y \ @@ -12,10 +12,8 @@ VERSIT_SRC = \ vcaltmp.h privlib_LIBRARIES = libversit.a -noinst_LTLIBRARIES = libversit_lt.la libversit_a_SOURCES = $(VERSIT_SRC) -libversit_lt_la_SOURCES = $(VERSIT_SRC) EXTRA_DIST = README.TXT vcaltest.c vctest.c |