Fixed INCLUDES and don't autogenerate ical.h, no need to. Plus it caused

2003-10-09  Jeffrey Stedfast  <fejj@ximian.com>

	* src/libical/Makefile.am: Fixed INCLUDES and don't autogenerate
	ical.h, no need to. Plus it caused problems anyways.

	* src/libical/*.[c,h]: Fixed the #includes

	* src/libicalss/Makefile.am: Fixed INCLUDES and don't autogenerate
	icalss.h, no need to. Plus it caused problems anyways.

	* src/libicalss/*.[c,h]: Fixed the #includes

	* tests/*.c: #include <libical/ical.h> rather
	than "ical.h"

	* tests/Makefile.am: Fixed INCLUDES

	* examples/*.c: #include <libical/ical.h> rather
	than "ical.h"

	* examples/Makefile.am: Fixed INCLUDES

	* src/libicalvcal/icalvcal.h: #include <libical/ical.h> which is
	no longer autogenerated.

	* src/libicalvcal/icalvcal.c (icalvcal_convert_with_defaults): Use
	the proper macro names from config.h

svn path=/trunk/; revision=22844

17 files changed, 32 insertions, 38 deletions

diff --git a/libical/src/test/Makefile.am b/libical/src/test/Makefile.am
index 8b7f3e9672..e1824b064c 100644
--- a/libical/src/test/Makefile.am
+++ b/libical/src/test/Makefile.am
@@ -24,14 +24,8 @@ LDADD =  ../libicalss/libicalss-evolution.la ../libicalvcal/libicalvcal-evolutio
 LIBS = @PTHREAD_LIBS@
 
 INCLUDES = 				\
-       -I. 				\
-       -I../libicalvcal 		\
-       -I$(srcdir)/../libicalvcal 	\
-       -I$(srcdir) 			\
-       -I../libical 			\
-       -I$(srcdir)/../libical 		\
-       -I../libicalss 			\
-       -I$(srcdir)/../libicalss         \
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/src		\
 	$(cxx_inc) $(bdb4_inc)
 
 TESTS=regression
diff --git a/libical/src/test/copycluster.c b/libical/src/test/copycluster.c
index 6c57177290..6894de9d36 100644
--- a/libical/src/test/copycluster.c
+++ b/libical/src/test/copycluster.c
@@ -32,8 +32,8 @@
 #include <unistd.h> /* for alarm */
 #include <stdlib.h> /* for exit */
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 
 static void sig_alrm(int i){
     fprintf(stderr,"Could not get lock on file\n");
diff --git a/libical/src/test/findobj.c b/libical/src/test/findobj.c
index 3c1eac85e3..eb565afa7a 100644
--- a/libical/src/test/findobj.c
+++ b/libical/src/test/findobj.c
@@ -29,8 +29,8 @@
 #include <errno.h>
 #include <string.h> /* For strerror */
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 
 /* This program finds an object stored in a calendar */
 
diff --git a/libical/src/test/icaltestparser.c b/libical/src/test/icaltestparser.c
index e5973e0d4a..9992979a3a 100644
--- a/libical/src/test/icaltestparser.c
+++ b/libical/src/test/icaltestparser.c
@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include "ical.h"
+#include <libical/ical.h>
 
 #include <stdlib.h>
 
diff --git a/libical/src/test/process.c b/libical/src/test/process.c
index 466cf38101..605a83eee7 100644
--- a/libical/src/test/process.c
+++ b/libical/src/test/process.c
@@ -26,8 +26,8 @@
 #include <string.h> /* For strerror */
 #include <stdlib.h> /* for free */
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 
 void send_message(icalcomponent *reply,const char* this_user)
 {
diff --git a/libical/src/test/recur.c b/libical/src/test/recur.c
index bb23337adb..0b490c0513 100644
--- a/libical/src/test/recur.c
+++ b/libical/src/test/recur.c
@@ -35,8 +35,8 @@
 #include <unistd.h> /* for alarm */
 #endif
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 
 #ifdef WIN32
 #define snprintf	_snprintf
diff --git a/libical/src/test/regression-classify.c b/libical/src/test/regression-classify.c
index c805047c24..7af64499f3 100644
--- a/libical/src/test/regression-classify.c
+++ b/libical/src/test/regression-classify.c
@@ -28,8 +28,8 @@
 #include <errno.h>
 #include <string.h> /* For strerror */
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 #include "regression.h"
 
 extern int VERBOSE;
diff --git a/libical/src/test/regression-component.c b/libical/src/test/regression-component.c
index 0babb579ba..5494bdd779 100644
--- a/libical/src/test/regression-component.c
+++ b/libical/src/test/regression-component.c
@@ -1,4 +1,4 @@
-#include "ical.h"
+#include <libical/ical.h>
 #include "regression.h"
 
 #include <string.h>
diff --git a/libical/src/test/regression-recur.c b/libical/src/test/regression-recur.c
index 85f643e964..793eb402c8 100644
--- a/libical/src/test/regression-recur.c
+++ b/libical/src/test/regression-recur.c
@@ -30,8 +30,8 @@
 #include <unistd.h> /* for alarm */
 #endif
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 #include "regression.h"
 
 extern int VERBOSE;
diff --git a/libical/src/test/regression-storage.c b/libical/src/test/regression-storage.c
index 6f67c6c030..ea59767014 100644
--- a/libical/src/test/regression-storage.c
+++ b/libical/src/test/regression-storage.c
@@ -33,8 +33,8 @@
 #include <stdio.h> /* for printf */
 #include <time.h> /* for time() */
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 #include "regression.h"
 
 #define OUTPUT_FILE "filesetout.ics"
diff --git a/libical/src/test/regression-utils.c b/libical/src/test/regression-utils.c
index edc1eddba3..685e9fe94a 100644
--- a/libical/src/test/regression-utils.c
+++ b/libical/src/test/regression-utils.c
@@ -1,4 +1,4 @@
-#include "ical.h"
+#include <libical/ical.h>
 
 #include <stdlib.h>	/* abort() */
 #include <string.h>	/* strcmp() */
diff --git a/libical/src/test/regression.c b/libical/src/test/regression.c
index d4fc276e6b..034764551b 100644
--- a/libical/src/test/regression.c
+++ b/libical/src/test/regression.c
@@ -27,9 +27,9 @@
     
   ======================================================================*/
 
-#include "ical.h"
-#include "icalss.h"
-#include "icalvcal.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
+#include <libicalvcal/icalvcal.h>
 
 #include "regression.h"
 
@@ -1090,7 +1090,7 @@ void test_recur_parameter_bug(){
  
 #include <stdio.h>
 #include <stdlib.h>
-#include <ical.h>
+#include <libical/ical.h>
  
     static const char test_icalcomp_str[] =
 "BEGIN:VEVENT\n"
@@ -2425,7 +2425,7 @@ void test_x(){
  
 #include <stdio.h>
 #include <stdlib.h>
-#include <ical.h>
+#include <libical/ical.h>
  
     static const char test_icalcomp_str[] =
 "BEGIN:VEVENT\r\n"
diff --git a/libical/src/test/storage.c b/libical/src/test/storage.c
index 9c29d728af..acd9d95734 100644
--- a/libical/src/test/storage.c
+++ b/libical/src/test/storage.c
@@ -27,7 +27,7 @@
     
   ======================================================================*/
 
-#include "ical.h"
+#include <libical/ical.h>
 #include <assert.h>
 #include <string.h> /* for strdup */
 #include <stdlib.h> /* for malloc */
diff --git a/libical/src/test/stow.c b/libical/src/test/stow.c
index 01abea4f75..52307420bb 100644
--- a/libical/src/test/stow.c
+++ b/libical/src/test/stow.c
@@ -38,8 +38,8 @@
 #include <sys/types.h> /* For getpwent */
 #include <ctype.h> /* for tolower */
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 
 char* program_name;
 #define TMPSIZE 2048
@@ -309,7 +309,7 @@ icalcomponent* make_reply(icalcomponent *comp, icalproperty *return_status,
 
     snprintf(attendee,TMPSIZE,"mailto:%s",local_attendee);
 
-    snprintf(prodid,TMPSIZE,"-//Softwarestudio.org//%s version %s//EN",ICAL_PACKAGE,ICAL_VERSION);
+    snprintf(prodid,TMPSIZE,"-//Softwarestudio.org//%s version %s//EN",PACKAGE,VERSION);
 
     /* Create the base component */
     reply = icalcomponent_vanew( 
diff --git a/libical/src/test/testclassify.c b/libical/src/test/testclassify.c
index 649d80cc58..6e8385cbc4 100644
--- a/libical/src/test/testclassify.c
+++ b/libical/src/test/testclassify.c
@@ -26,10 +26,10 @@
  ======================================================================*/
 
 #include <stdio.h> /* for printf */
-#include "ical.h"
+#include <libical/ical.h>
 #include <errno.h>
 #include <string.h> /* For strerror */
-#include "icalss.h"
+#include <libicalss/icalss.h>
 
 /* Get a note about the purpose of the property*/
 const char* get_note(icalcomponent *c)
diff --git a/libical/src/test/testmime.c b/libical/src/test/testmime.c
index cdb47d88dc..1fd455a001 100644
--- a/libical/src/test/testmime.c
+++ b/libical/src/test/testmime.c
@@ -33,7 +33,7 @@
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
  ======================================================================*/
 
-#include "ical.h"
+#include <libical/ical.h>
 
 #include <stdlib.h> /* For rand */
 #include <string.h> /* for strrchr, strdup*/
diff --git a/libical/src/test/testvcal.c b/libical/src/test/testvcal.c
index f82adffcc8..80b227b148 100644
--- a/libical/src/test/testvcal.c
+++ b/libical/src/test/testvcal.c
@@ -25,7 +25,7 @@
 
  ======================================================================*/
 
-#include "icalvcal.h"
+#include <libicalvcal/icalvcal.h>
 #include <stdio.h>
 
 /* Given a vCal data file as its first argument, this program will