Commit Graph

221 Commits

Author SHA1 Message Date
03dee6853b ignore more generated stuff
svn path=/trunk/; revision=19960
2003-02-20 03:17:14 +00:00
c5e48bf9a5 (libical_static_la_DEPENDENCIES): Make
libical-static.la depend on libical-evolution.la so they they are
not built in parallel by a parallel make, since that would break
libtool.

svn path=/trunk/; revision=19869
2003-02-10 15:53:21 +00:00
e359fec5c8 Added missing files to .cvsignore and AC_PREREQ to configure.in.
svn path=/trunk/; revision=19842
2003-02-07 12:39:46 +00:00
3a315cf4f3 AC_SUBST privlibdir, privincludedir, privdatadir (sent from ../configure).
* configure.in: AC_SUBST privlibdir, privincludedir, privdatadir
	(sent from ../configure). Add descriptions to AC_DEFINEs. Don't
	bother checking for python since we don't build it anyway.

	* acconfig.h: Gone

	* src/libical/Makefile.am: install library in privlibdir and
	headers under privincludedir. Look for zone files in privdatadir

	* src/libicalvcal/Makefile.am: install in privlibdir

	* zoneinfo/Makefile.am (zoneinfodatadir): define in terms of
	privdatadir
	(install-data-local): update

svn path=/trunk/; revision=19823
2003-02-06 18:13:57 +00:00
05a87528f2 Add AC_CONFIG_AUX_DIR(..) so it looks for ylwrap in the toplevel evolution
2002-12-19  Joe Shaw  <joe@ximian.com>

	* configure.in: Add AC_CONFIG_AUX_DIR(..) so it looks for ylwrap in
	the toplevel evolution directory and not our directory.  Fixes the
	build for automake >= 1.5

svn path=/trunk/; revision=19169
2002-12-19 17:40:55 +00:00
1c0c2cc2f4 added missing ';' for new bison to not complain.
2002-11-26  Rodrigo Moya <rodrigo@ximian.com>

	* src/libical/icalyacc.y: added missing ';' for new bison to not
	complain.

svn path=/trunk/; revision=18938
2002-11-27 00:33:20 +00:00
e5d1afdc53 Free the location if it's set. Otherwise one copy of the location of each
* src/libical/icaltimezone.c
        (icaltimezone_get_vtimezone_properties): Free the location if it's
        set. Otherwise one copy of the location of each built-in timezone
        we use gets leaked.

svn path=/trunk/; revision=18447
2002-10-27 15:58:25 +00:00
dcfed36441 Fixes #25153
2002-10-15  Rodrigo Moya <rodrigo@ximian.com>

	Fixes #25153

	* scripts/mkderivedvalues.pl: changed the _get functions for
	string values to return a NULL if arguments are wrong

	* src/libical/icalderivedvalue.c.in (icalvalue_get_x): return from
	function if pointer checking fails.

svn path=/trunk/; revision=18378
2002-10-16 21:41:39 +00:00
14829e0cc4 Allocate the right number of bytes when
appending the string value [it was allocating one fewer than
necessary].  [#28321]

svn path=/trunk/; revision=18281
2002-10-01 17:14:23 +00:00
3c92b86460 Update timezones (from Damon)
2002-06-18  JP Rosevear  <jpr@ximian.com>

	* Update timezones (from Damon)

2002-06-07  JP Rosevear  <jpr@ximian.com>

	* src/libical/icalparameter.c (icalparameter_as_ical_string):
	quote if the item contains a comma

svn path=/trunk/; revision=17602
2002-07-26 13:52:41 +00:00
2c202400a4 Darwin/OS portability from Max Horn <max@quendi.de>
* src/libical/icallangbind.c: #include <stdlib.h>, not <malloc.h>

	* src/libicalvcal/vobject.c: Likewise

	* src/libicalvcal/vcc.y: Likewise

	* src/libicalss/icaldirset.c: Rearrange #includes slightly to make
	Darwin happy.

svn path=/trunk/; revision=16307
2002-04-01 16:27:06 +00:00
28c6d294af added libicalvcal.
2002-02-08  Damon Chaplin  <damon@ximian.com>

	* src/Makefile.am (SUBDIRS): added libicalvcal.

	* configure.in (AC_OUTPUT): added src/libicalvcal/Makefile.

svn path=/trunk/; revision=15629
2002-02-09 01:06:31 +00:00
d64e7cf12f major changes to support RRULE/EXRULE, VALARMS and several other
2002-02-06  Damon Chaplin  <damon@ximian.com>

	* src/libicalvcal/icalvcal.c: major changes to support RRULE/EXRULE,
	VALARMS and several other properties.

	* src/libicalvcal/icalvcal.h (icalvcal_convert_with_defaults): new
	function to pass defaults for a few values into the importer. These
	are used when the vCalendar file doesn't provide the property but it
	is required in iCalendar.

	* src/libicalvcal/vcc.y: support multi-valued properties, by appending
	new ones and separating by ';'. This was pinched from our changes to
	evolution/libversit/vcc.y.

	* src/libicalvcal/Makefile.am: renamed library to libicalvcal-evolution
	Don't install the headers.

	* design-data/parameters.csv: added new error for error's parsing
	vCalendar properties.

svn path=/trunk/; revision=15582
2002-02-06 23:16:12 +00:00
84e6a5344f Skip over illegal whitespace in Microsoft-generated BYDAY rules.
* src/libical/icalrecur.c (icalrecur_add_bydayrules): Skip over
	illegal whitespace in Microsoft-generated BYDAY rules.

svn path=/trunk/; revision=15497
2002-01-28 21:47:39 +00:00
db035d9cf1 removed unused 'trigger:' production.
2001-12-18  Damon Chaplin  <damon@ximian.com>

	* src/libical/icalyacc.y: removed unused 'trigger:' production.

	* configure.in (AC_OUTPUT): patch from Jeremy Katz <katzj@redhat.com>
	to remove src/libicalss/Makefile and src/libicalvcal/Makefile, as we
	don't ship those directories now.

svn path=/trunk/; revision=15152
2001-12-18 20:08:31 +00:00
9786b8ab7d if all we have is the TZID, see if it is one of our TZIDs and if so get
2001-12-10  Damon Chaplin  <damon@ximian.com>

	* src/libical/icaltimezone.c (icaltimezone_get_display_name): if all
	we have is the TZID, see if it is one of our TZIDs and if so get the
	city name out of it. Fixes bug #16571.

svn path=/trunk/; revision=14957
2001-12-10 19:15:40 +00:00
b93c623212 initialize the builtin timezones, to ensure that the TZID of the UTC zone
2001-11-13  Damon Chaplin  <damon@ximian.com>

	* src/libical/icaltimezone.c (icaltimezone_get_tzid): initialize the
	builtin timezones, to ensure that the TZID of the UTC zone is set.
	Hopefully fixes bugs #14941 & #14622.

svn path=/trunk/; revision=14689
2001-11-13 23:35:16 +00:00
c9ce571c20 use MAX_LINE_LEN rather than magic numbers all over the place.
2001-10-31  Damon Chaplin  <damon@ximian.com>

	* src/libical/icalproperty.c (get_next_line_start): use MAX_LINE_LEN
	rather than magic numbers all over the place.

svn path=/trunk/; revision=14536
2001-10-31 14:13:29 +00:00
3f5027009a had to redo the folding code since Outlook 2000 doesn't like parameter
2001-10-31  Damon Chaplin  <damon@ximian.com>

	* src/libical/icalproperty.c (icalproperty_as_ical_string): had to
	redo the folding code since Outlook 2000 doesn't like parameter values
	like 'TENTATIVE' cut in half. Now it tries to split after a ';', ':'
	or space.

svn path=/trunk/; revision=14529
2001-10-31 11:17:42 +00:00
3453ef724b forgot to account for the spaces added, so it could have been writing over
2001-10-30  Damon Chaplin  <damon@ximian.com>

	* src/libical/icalproperty.c (fold_property_line): forgot to account
	for the spaces added, so it could have been writing over the end of
	the allocated memory. Added check for buffer overflow as well.
	This could well have been the problem causing bug #14067.

svn path=/trunk/; revision=14517
2001-10-31 05:17:49 +00:00
5f9a503838 Regenerated all VTIMEZONEs, to be compatable with Outlook Web Access. They
2001-10-30  Damon Chaplin  <damon@ximian.com>

	* zoneinfo/*.ics: Regenerated all VTIMEZONEs, to be compatable with
	Outlook Web Access. They now only include 2 RRULEs components or
	1 simple DTSTART component.

svn path=/trunk/; revision=14454
2001-10-30 12:45:30 +00:00
dbff414ea8 renamed the library to libical-evolution.la, install ical.h into
2001-10-29  Damon Chaplin  <damon@ximian.com>

	* src/libical/Makefile.am: renamed the library to libical-evolution.la,
	install ical.h into $includedir/evolution, with the other Evo headers.

	* src/libical/icalproperty.c (fold_property_line): new function to
	fold property lines around every 70 characters. Outlook Web Access
	doesn't seem to like some properties folded after the property name
	(e.g. UID, VTIMEZONE stuff.) Slight chance of data corruption here.

	* src/libical/icalvalue.c (icalvalue_text_as_ical_string): don't fold
	the lines here.

	* src/libical/icaltime.c (icaltime_from_string): DATE values should
	not have is_utc set to 1 - they don't have a timezone.

	* src/libical/icalvalue.c (icalvalue_utcoffset_as_ical_string):
	always round UTC offsets to the nearest minute, for compatability
	with Outlook. Should round data when parsing as well.

svn path=/trunk/; revision=14396
2001-10-30 01:49:30 +00:00
27c2d8fee6 added function to get a reasonable name to display for the timezone.
2001-10-27  Damon Chaplin  <damon@ximian.com>

	* src/libical/icaltimezone.c (icaltimezone_get_display_name): added
	function to get a reasonable name to display for the timezone.
	(Though it won't be translated.)

svn path=/trunk/; revision=14265
2001-10-28 02:24:22 +00:00
750c920dcd Outlooks (2000) places "Standard Time" and "Daylight Time" in the TZNAME
2001-10-25  Damon Chaplin  <damon@ximian.com>

	* src/libical/icaltimezone.c (icaltimezone_get_tznames_from_vtimezone):
	Outlooks (2000) places "Standard Time" and "Daylight Time" in the
	TZNAME strings, which is useless, so return NULL in that case.
	ETimezoneEntry will then use the TZID instead, in which Outlook does
	place the actual timezone name. (I just hope Outlook doesn't translate
	"Standard Time" to other languages, as we won't be able to fix it then)

svn path=/trunk/; revision=14107
2001-10-25 23:27:47 +00:00
1f506e4a03 use sizeof(test_array) for the memset call. It was clearing 9 bytes but
2001-10-23  Damon Chaplin  <damon@ximian.com>

	* src/libical/icalrecur.c (icalrecur_two_byrule): use
	sizeof(test_array) for the memset call. It was clearing 9 bytes but
	the array uses shorts.

svn path=/trunk/; revision=13958
2001-10-23 21:37:42 +00:00
2428e668ea added a few new timezones
svn path=/trunk/; revision=13913
2001-10-22 23:41:49 +00:00
1da29bab5d updated all files again, placing current RDATEs first, so Outlook uses
2001-10-22  Damon Chaplin  <damon@ximian.com>

	* zoneinfo/*: updated all files again, placing current RDATEs first,
	so Outlook uses those. Also fixed a few bugs in vzic which resulted in
	a few changes.

	* zoneinfo/Makefile.am (DIRS): added America/North_Dakota.

2001-10-22  Damon Chaplin  <damon@ximian.com>

	* src/libical/icaltimezone.c (icaltimezone_get_utc_offset):
	(icaltimezone_get_utc_offset_of_utc_time): if we go off the start of
	the changes array, return the TZOFFSETFROM of the first change.
	Also changed the maximum year to 2037.

	* src/libical/icaltime.c (icaltime_day_of_week):
	(icaltime_start_doy_of_week):
	(icaltime_week_number): init tm_hour to 12. Sometimes mktime()
	adjusts the time, if that local time doesn't actually exist, leading
	to the wrong day being returned. It is unlikely to adjust by 12 hours.
	(icaltime_as_timet_with_zone):
	(icaltime_from_timet_with_zone): change it back so it does convert
	DATE values to/from the timezone. time_t values don't really go well
	with DATE values, so be very careful when using them. We now assume
	that the time_t points to the start of the day in the given timezone.
	(We used to assume it pointed to the start of the day in UTC, but
	that meant it was actually incorrect wrt the displayed calendar.)

	* src/libical/icalrecur.c (expand_year_days): for FREQ=YEARLY with no
	modifiers, we add one day, using the month and day from DTSTART.
	(next_year): make sure we never go past 2037.

	* scripts/mkderivedproperties.pl: Updated to allow DTSTART, DTEND, DUE
	and RECURRENCE-ID to be set with DATE values. I think it now handles
	all properties which can take DATE values, except RDATE which uses
	DATE-TIME-PERIOD.

svn path=/trunk/; revision=13912
2001-10-22 23:40:29 +00:00
7d70bec880 don't free the parameter
2001-10-19  JP Rosevear  <jpr@ximian.com>

	* src/libical/icalproperty.c (icalproperty_remove_parameter):
	don't free the parameter

svn path=/trunk/; revision=13808
2001-10-19 22:17:16 +00:00
952708390e Assign with =', not +='.
* src/libical/Makefile.am (CLEANFILES): Assign with `=', not `+='.

svn path=/trunk/; revision=13463
2001-10-05 20:23:26 +00:00
6543d06edf Fix the libical-related part of Ximian bug #7892.
2001-09-26  Federico Mena Quintero  <federico@ximian.com>

	Fix the libical-related part of Ximian bug #7892.

	* src/libical/icalduration.c (icaldurationtype_as_ical_string):
	The correct string for zero seconds is "PT0S", not "PTS0".  Also
	handle "negative zero" durations.

	* src/libical/icalvalue.c (icalvalue_new_from_string_with_error):
	Use icalerrno to see if the duration string is invalid.  We cannot
	use icaldurationtype_is_null_duration() because a duration of zero
	*is* valid, not an error (icalduration_type_from_string() returns
	a zero duration on parse error, too).

svn path=/trunk/; revision=13172
2001-09-26 23:10:08 +00:00
00dcd396ed free the temp dup'd string.
2001-09-19  Larry Ewing  <lewing@ximian.com>

	* src/libical/icalperiod.c (icalperiodtype_from_string): free the
	temp dup'd string.

svn path=/trunk/; revision=12984
2001-09-19 19:34:19 +00:00
b55a868f79 Generate an ICAL_ATTACH_VALUE value from the string.
2001-09-11  Federico Mena Quintero  <federico@ximian.com>

	* src/libical/icalvalue.c (icalvalue_new_from_string_with_error):
	Generate an ICAL_ATTACH_VALUE value from the string.

svn path=/trunk/; revision=12769
2001-09-11 22:00:22 +00:00
e0beab1325 strdup the result of the first call to ical_component_as_ical_string()
2001-09-10  Damon Chaplin  <damon@ximian.com>

	* src/libical/icalcomponent.c (icalcomponent_compare_vtimezones):
	strdup the result of the first call to ical_component_as_ical_string()
	since the second call may free it.
	Also, don't free the results of ical_component_as_ical_string() since
	it is a tmp buffer which is freed elsewhere.

svn path=/trunk/; revision=12750
2001-09-10 23:07:51 +00:00
2be48d8855 Replace struct icalattachtype by an opaque icalattach that is properly
2001-09-10  Federico Mena Quintero  <federico@ximian.com>

	Replace struct icalattachtype by an opaque icalattach that is
	properly reference-counted.

	* src/libical/icalvalueimpl.h (struct icalattach_impl): Private
	declaration for the icalattach type.
	(struct icalvalue_impl): Make the v_attach field be an icalattach *.

	* src/libical/icaltypes.h: Added declaration for icalattach.  This
	is now an opaque type; the implementation is in icalvalueimpl.h.
	(struct icalattachtype): Removed.

	* src/libical/icaltypes.c (icalattach_new_from_url): New function.
	(icalattach_new_from_data): New function.
	(icalattach_ref): New function.
	(icalattach_unref): New function.
	(icalattach_get_is_url): New function.
	(icalattach_get_url): New function.
	(icalattach_get_data): New function.
	(icalattachtype_new): Removed.
	(icalattachtype_free): Removed.
	(icalattachtype_add_reference): Removed.
	(icalattachtype_set_url): Removed.
	(icalattachtype_get_url): Removed.
	(icalattachtype_set_base64): Removed.
	(icalattachtype_get_base64): Removed.
	(icalattachtype_set_binary): Removed.
	(icalattachtype_get_binary): Removed.

	* src/libical/icalderivedvalue.c.in (icalvalue_new_attach): New
	function; we implement it ourselves.
	(icalvalue_set_attach): New function.
	(icalvalue_get_attach): New function.

	* src/libical/icalvalue.c (icalmemory_strdup_and_dequote): Made
	static.
	(icalvalue_new_clone): Clone BINARY and ATTACH values by refing
	the old attach value.
	(icalvalue_free): Free BINARY and ATTACH values.
	(icalvalue_attach_as_ical_string): Handle the new icalattachtype.
	(icalvalue_compare): Ditto.

	* src/libical/Makefile.am (CLEANFILES): Added ical.h.

	* design-data/*: Mark ATTACH as a custom value.

svn path=/trunk/; revision=12745
2001-09-10 21:54:44 +00:00
da42183a7b pass the VTIMEZONE component to icalcomponent_compare_vtimezones(), not
2001-09-06  Damon Chaplin  <damon@ximian.com>

	* src/libical/icalcomponent.c (icalcomponent_merge_vtimezone): pass
	the VTIMEZONE component to icalcomponent_compare_vtimezones(), not
	the icaltimezone*. Strangely we weren't getting a compiler error.
	Fixes bug #5275, hopefully.

	* src/libical/icaltimezone.c (icaltimezone_dump_changes): updated so
	it still outputs the same format, even though the '1 Jan 0001'
	component isn't included any more.

svn path=/trunk/; revision=12670
2001-09-07 03:36:30 +00:00
3ca5273c1d updated all of the VTIMEZONE files to try to be more compatable with
2001-08-31  Damon Chaplin  <damon@ximian.com>

	* zoneinfo/*: updated all of the VTIMEZONE files to try to be more
	compatable with Outlook. i.e. We don't use seconds in UTC offsets,
	we don't use BYMONTHDAY if we can avoid it (there are still a few uses
	of this we need to fix), and we don't use years < 1600.

	* src/libical/icalvalue.c (icalvalue_utcoffset_as_ical_string): if
	seconds is 0 then don't output it. None of the builtin VTIMEZONE data
	uses the seconds value any more, since it messes up iTIP with Outlook.
	We may want to make it always round to the nearest minute, to avoid
	interop problems.

svn path=/trunk/; revision=12551
2001-09-01 01:53:47 +00:00
d9e5feffa7 Remove src/python/Makefile and src/test/Makefile.
* configure.in: Remove src/python/Makefile and src/test/Makefile.

svn path=/trunk/; revision=12407
2001-08-22 23:17:06 +00:00
9333af2f12 Dequote the same characters that we know how to quote in
2001-08-16  Federico Mena Quintero  <federico@ximian.com>

	* src/libical/icalvalue.c (icalmemory_strdup_and_dequote): Dequote
	the same characters that we know how to quote in
	icalvalue_text_as_ical_string().  Fixes Ximian bug #7433.

svn path=/trunk/; revision=12115
2001-08-16 19:23:41 +00:00
beb38ecbf6 removed some debugging messages.
2001-08-01  Damon Chaplin  <damon@ximian.com>

	* src/libical/icaltimezone.c: removed some debugging messages.

svn path=/trunk/; revision=11562
2001-08-02 03:22:01 +00:00
61889c3c08 changed the debugging message to avoid a crash on non-glibc boxes. (Using
2001-07-30  Damon Chaplin  <damon@ximian.com>

	* src/libical/icaltimezone.c (icaltimezone_get_builtin_timezone):
	changed the debugging message to avoid a crash on non-glibc boxes.
	(Using %s with a NULL argument will crash them.)

svn path=/trunk/; revision=11492
2001-07-30 21:44:09 +00:00
ddbf92b2ec copy the TZID just in case the property we got it from gets modified.
2001-07-30  Damon Chaplin  <damon@ximian.com>

	* src/libical/icalcomponent.c (icalcomponent_merge_vtimezone): copy
	the TZID just in case the property we got it from gets modified.
	(icalcomponent_rename_tzids_callback): break out of the loop if we
	have renamed the TZID parameter. Otherwise our tzid variable would be
	invalid.

	* scripts/mkderivedproperties.pl (fudge_data): changed this so we can
	set EXDATEs that are DATE values, by checking the is_date field.
	I'm not entirely sure this is the way it should be done.
	If it is, I'll also do this for other things like DTSTART/DTEND.

	* src/libical/icalrecur.c (icalrecurrencetype_as_string): handle
	UNTIL as a DATE value as well as a DATE-TIME.

	* src/libical/icalcomponent.c (icalcomponent_compare_vtimezones):
	fixed stupid error, getting TZID property from wrong VTIMEZONE.
	This would only have affected iTIP stuff, with VTIMEZONEs that don't
	use the '/' prefix (i.e. from Outlook). It probably just meant we
	kept multiple copies of the same VTIMEZONE.

	* src/libical/icaltimezone.c: removed some debugging messages.

svn path=/trunk/; revision=11491
2001-07-30 21:31:43 +00:00
11198e3e26 call pvl_next on i rather than itr.iter
2001-07-26  JP Rosevear  <jpr@ximian.com>

	* src/libical/icalcomponent.c (icalcomponent_begin_component):
	call pvl_next on i rather than itr.iter

svn path=/trunk/; revision=11439
2001-07-27 00:03:55 +00:00
4d50dc146d if from_zone is NULL (i.e. it is a floating time), just return.
2001-07-26  Damon Chaplin  <damon@ximian.com>

	* src/libical/icaltimezone.c (icaltimezone_convert_time): if from_zone
	is NULL (i.e. it is a floating time), just return.

svn path=/trunk/; revision=11435
2001-07-26 21:43:39 +00:00
487fbbf877 accept an icaltimezone* of NULL for all the public functions, since NULL
2001-07-25  Damon Chaplin  <damon@ximian.com>

	* src/libical/icaltimezone.c: accept an icaltimezone* of NULL for all
	the public functions, since NULL is used to represent floating times.

svn path=/trunk/; revision=11413
2001-07-25 21:00:11 +00:00
77a394e24d if the property contai
2001-07-25  JP Rosevear  <jpr@ximian.com>

	* src/libical/icalparameter.c (icalparameter_as_ical_string): if
	the property contai

svn path=/trunk/; revision=11405
2001-07-25 18:46:43 +00:00
dc4f47979d pass extra param to icalparser_get_next_char (icalparser_get_next_char):
2001-07-23  JP Rosevear  <jpr@ximian.com>

	* src/libical/icalparser.c: pass extra param to
	icalparser_get_next_char
	(icalparser_get_next_char): only use quote mode if the flag is set

svn path=/trunk/; revision=11326
2001-07-23 23:30:11 +00:00
80f0e61199 changed so it doesn't use mktime(). We are having problems because
2001-07-23  Damon Chaplin  <damon@ximian.com>

	* src/libical/icaltime.c (icaltime_day_of_year): changed so it doesn't
	use mktime(). We are having problems because mktime() only works
	post 1970.

svn path=/trunk/; revision=11325
2001-07-23 22:56:06 +00:00
833b8636a3 do not strdup a NULL (valid) timezone
2001-07-17  JP Rosevear  <jpr@ximian.com>

	* src/libical/icaltimezone.c
	(icaltimezone_get_tznames_from_vtimezone): do not strdup a NULL
	(valid) timezone

svn path=/trunk/; revision=11180
2001-07-17 21:36:14 +00:00
3b8e07c5b8 return NULL if we couldn't find the LOCATION.
2001-07-16  Damon Chaplin  <damon@ximian.com>

	* src/libical/icaltimezone.c (icaltimezone_get_location_from_vtimezone): return NULL if we couldn't find the LOCATION.
	(icaltimezone_get_utc_offset): ifdef'd out a debugging message.
	(icaltimezone_get_location):
	(icaltimezone_get_latitude):
	(icaltimezone_get_longitude): don't load the builtin timezone for
	these. We should already have the data from reading zones.tab.
	(icaltimezone_get_builtin_timezone_from_tzid): return NULL if the TZID
	given is NULL or "" (i.e. a floating time).

svn path=/trunk/; revision=11143
2001-07-17 01:06:18 +00:00
de6d478888 Add the COMBINEDHEADERS here and remove the EXTRA_DIST. This fixes
2001-07-10  Peter Williams  <peterw@ximian.com>

	* src/libicalss/Makefile.am (libicalss_la_SOURCES): Add the
	COMBINEDHEADERS here and remove the EXTRA_DIST. This fixes distcheck.
	We can't just put CONBINEDHEADERS at the bottom of _SOURCES because
	of the $(srcdir).

svn path=/trunk/; revision=11040
2001-07-12 14:21:27 +00:00