callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check if we're trying to build with the old libversit module borrowed from

Browse Source 
* 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.

svn path=/trunk/; revision=17526
This commit is contained in:
Dan Winship
2002-07-22 15:35:36 +00:00
parent 3be22927c9
commit 1e79524cbb
4 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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> 2002-07-18 Ettore Perazzoli <ettore@ximian.com>
* configure.in: Prepend "$(WERROR)" to all the *_CFLAGS variables * configure.in: Prepend "$(WERROR)" to all the *_CFLAGS variables

15
configure.in
View File

@ -2,6 +2,21 @@
AC_INIT(camel) AC_INIT(camel)
AM_CONFIG_HEADER(config.h) 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_MAJOR_VERSION=1
EVOLUTION_MINOR_VERSION=1 EVOLUTION_MINOR_VERSION=1
EVOLUTION_MICRO_VERSION=0 EVOLUTION_MICRO_VERSION=0

3
libversit/.cvsignore Normal file
View File

@ -0,0 +1,3 @@
Makefile.in
Makefile
vcc.c

4
libversit/Makefile.am
View File

@ -1,6 +1,6 @@
# Makefile for libversit.a # 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 = \ VERSIT_SRC = \
vcc.y \ vcc.y \
@ -12,10 +12,8 @@ VERSIT_SRC = \
vcaltmp.h vcaltmp.h
privlib_LIBRARIES = libversit.a privlib_LIBRARIES = libversit.a
noinst_LTLIBRARIES = libversit_lt.la
libversit_a_SOURCES = $(VERSIT_SRC) libversit_a_SOURCES = $(VERSIT_SRC)
libversit_lt_la_SOURCES = $(VERSIT_SRC)
EXTRA_DIST = README.TXT vcaltest.c vctest.c EXTRA_DIST = README.TXT vcaltest.c vctest.c