? confdefs.h
? depcomp
? gtk-doc.make
? iconv-detect.h
? calendar/config.guess
? calendar/config.sub
? calendar/depcomp
? calendar/install-sh
? calendar/ltmain.sh
? calendar/missing
? calendar/mkinstalldirs
? calendar/ylwrap
? camel/camel-mime-tables.c
? libedataserver/.e-msgport.c.swp
? libedataserverui/test-contact-store
? libedataserverui/test-name-selector
? src/GNOME_Evolution_DataServer_1.2.server
Index: INSTALL
===================================================================
RCS file: /cvs/gnome/evolution-data-server/INSTALL,v
retrieving revision 1.2
diff -u -p -r1.2 INSTALL
--- INSTALL	21 Dec 2004 06:52:15 -0000	1.2
+++ INSTALL	6 Jan 2005 11:52:35 -0000
@@ -1,4 +1,4 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
 Foundation, Inc.
 
    This file is free documentation; the Free Software Foundation gives
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/configure.in,v
retrieving revision 1.83
diff -u -p -r1.83 configure.in
--- configure.in	4 Jan 2005 18:47:47 -0000	1.83
+++ configure.in	6 Jan 2005 11:52:36 -0000
@@ -3,6 +3,7 @@ AC_PREREQ(2.52)
 
 AC_INIT(evolution-data-server, 1.1.2)
 AC_CONFIG_SRCDIR(README)
+AC_PROG_INSTALL
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 AM_CONFIG_HEADER(config.h)
@@ -94,7 +95,6 @@ case $YACC in
 	;;
 esac
 AC_STDC_HEADERS
-AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
@@ -309,7 +309,8 @@ dnl If the user specifies --with-foo or 
 	if test "x${check_manually}" = "xyes"; then
 		mozilla_nss=""
 		have_nspr_includes="no"
-		if test "x${with_nspr_includes}" != "xno"; then
+		moz_nspr_includes="no"
+		if test -n "${with_nspr_includes}"; then
 			CPPFLAGS_save="$CPPFLAGS"
 			
 			AC_MSG_CHECKING(for Mozilla nspr4 includes in $with_nspr_includes)
@@ -329,7 +330,7 @@ dnl If the user specifies --with-foo or 
 		fi
 		
 		have_nspr_libs="no"
-		if test "x${with_nspr_libs}" != "xno" -a "x${have_nspr_includes}" != "xno"; then
+		if test -n "${with_nspr_libs}" -a "x${have_nspr_includes}" != "xno"; then
 			CFLAGS_save="$CFLAGS"
 			LDFLAGS_save="$LDFLAGS"
 			
@@ -350,7 +351,7 @@ dnl If the user specifies --with-foo or 
 		       		LIBS_save="$LIBS"
 				CFLAGS="$CFLAGS $MANUAL_NSPR_CFLAGS"
 				
-				if test "x${with_nspr_libs}" != "x"; then
+				if test -n "x${with_nspr_libs}"; then
 		       			LIBS="$nsprlibs"
 		       			LDFLAGS="$LDFLAGS -L$with_nspr_libs"
 				else
@@ -374,21 +375,22 @@ dnl If the user specifies --with-foo or 
 			AC_MSG_RESULT(no)
 		fi
 		
-		if test "x${with_nss_includes}" != "xno" -a "x${have_nspr_libs}" != "xno"; then
+		have_nss_includes="no"
+
+		if test -n "${with_nss_includes}" -a "x${have_nspr_libs}" != "xno"; then
 			CPPFLAGS_save="$CPPFLAGS"
 			
 			AC_MSG_CHECKING(for Mozilla nss3 includes in $with_nss_includes)
 			AC_MSG_RESULT("")
 			
-			if test "x${with_nspr_includes}" != "x"; then
+			if test -n "${with_nspr_includes}"; then
 				CPPFLAGS="$CPPFLAGS -I$with_nspr_includes -I$with_nss_includes"
 			else
 				CPPFLAGS="$CPPFLAGS -I$with_nss_includes"
 			fi
 			
 			AC_CHECK_HEADERS(nss.h ssl.h smime.h,
-				[ have_nss_includes="yes" ], 
-				[ have_nss_includes="no" ])
+				[ have_nss_includes="yes" ])
 			
 			CPPFLAGS="$CPPFLAGS_save"
 			
@@ -404,7 +406,7 @@ dnl If the user specifies --with-foo or 
 			AC_MSG_RESULT(no)
 		fi
 		
-		if test "x${with_nss_libs}" != "xno" -a "x${have_nss_includes}" != "xno"; then
+		if test -n "${with_nss_libs}" -a "x${have_nss_includes}" != "xno"; then
 			LDFLAGS_save="$LDFLAGS"
 			
 			if test "$enable_nss" = "static"; then
@@ -1033,9 +1035,7 @@ AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
 	deps="$2"
 	extra_cflags="$3"
 	extra_libs="$4"
-	PKG_CHECK_MODULES(EVOLUTION, $deps)
-	$1_CFLAGS="$EVOLUTION_CFLAGS \$(WERROR) $extra_cflags"
-	$1_LIBS="$EVOLUTION_LIBS $extra_libs"
+	PKG_CHECK_MODULES($1, $deps)
 ])
 
 dnl --- Flags to get all the GNOME stuff
Index: calendar/libical/INSTALL
===================================================================
RCS file: /cvs/gnome/libical/INSTALL,v
retrieving revision 1.6
diff -u -p -r1.6 INSTALL
--- calendar/libical/INSTALL	18 Dec 2004 08:03:05 -0000	1.6
+++ calendar/libical/INSTALL	6 Jan 2005 11:52:38 -0000
@@ -1,4 +1,4 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
 Foundation, Inc.
 
    This file is free documentation; the Free Software Foundation gives
Index: calendar/libical/src/libicalss/icalssyacc.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalssyacc.h,v
retrieving revision 1.12
diff -u -p -r1.12 icalssyacc.h
--- calendar/libical/src/libicalss/icalssyacc.h	28 May 2004 10:14:24 -0000	1.12
+++ calendar/libical/src/libicalss/icalssyacc.h	6 Jan 2005 11:52:38 -0000
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
+/* A Bison parser, made by GNU Bison 1.875c.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -78,8 +78,8 @@
 typedef union YYSTYPE {
 	char* v_string;
 } YYSTYPE;
-/* Line 1249 of yacc.c.  */
-#line 82 "icalssyacc.h"
+/* Line 1275 of yacc.c.  */
+#line 83 "icalssyacc.h"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
