Remove extra space following -I which is not kind to Tru64 Unix C

2006-05-10  Harish Krishnaswamy  <kharish@novell.com>

	* addressbook/libebook/libebook.pc.in,
	addressbook/libedata-book/libedata-book.pc.in,
	calendar/libecal/libecal.pc.in,
	calendar/libedata-cal/libedata-cal.pc.in,
	configure.in, evolution-data-server.pc.in,
	libedataserver/libedataserver.pc.in,
	servers/groupwise/libegroupwise.pc.in: Remove extra space following -I which
	is not kind to Tru64 Unix C compilers. Patch suggested by the Written Word.
	Fixes #271839.

diff --git a/ChangeLog b/ChangeLog
index 255ac59..7b105c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-05-10  Harish Krishnaswamy  <kharish@novell.com>
+
+       * addressbook/libebook/libebook.pc.in, 
+       addressbook/libedata-book/libedata-book.pc.in,
+       calendar/libecal/libecal.pc.in,
+       calendar/libedata-cal/libedata-cal.pc.in,
+       configure.in, evolution-data-server.pc.in,
+       libedataserver/libedataserver.pc.in, 
+       servers/groupwise/libegroupwise.pc.in: Remove extra space following -I which
+       is not kind to Tru64 Unix C compilers. Patch suggested by the Written Word.
+       Fixes #271839.
+
 2006-05-09  Ross Burton  <ross@openedhand.com>
 
        * libedataserver/e-data-server-module.h:

diff --git a/addressbook/libebook/libebook.pc.in b/addressbook/libebook/libebook.pc.in
index c65cdca..7629e15 100644 (file)
--- a/addressbook/libebook/libebook.pc.in
+++ b/addressbook/libebook/libebook.pc.in
@@ -2,9 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+datadir=@datadir@
 
 idldir=@idldir@
-IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
+IDL_INCLUDES=-I${idldir} @IDL_INCLUDES@
 
 privincludedir=@privincludedir@
 

diff --git a/addressbook/libedata-book/libedata-book.pc.in b/addressbook/libedata-book/libedata-book.pc.in
index 9cb8fcb..8b28eba 100644 (file)
--- a/addressbook/libedata-book/libedata-book.pc.in
+++ b/addressbook/libedata-book/libedata-book.pc.in
@@ -2,9 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+datadir=@datadir@
 
 idldir=@idldir@
-IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
+IDL_INCLUDES=-I${idldir} @IDL_INCLUDES@
 
 privincludedir=@privincludedir@
 

diff --git a/calendar/libecal/libecal.pc.in b/calendar/libecal/libecal.pc.in
index b5cf9bb..4a18503 100644 (file)
--- a/calendar/libecal/libecal.pc.in
+++ b/calendar/libecal/libecal.pc.in
@@ -2,9 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+datadir=@datadir@
 
 idldir=@idldir@
-IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
+IDL_INCLUDES=-I${idldir} @IDL_INCLUDES@
 
 privincludedir=@privincludedir@
 

diff --git a/calendar/libedata-cal/libedata-cal.pc.in b/calendar/libedata-cal/libedata-cal.pc.in
index f6fbec2..f99692d 100644 (file)
--- a/calendar/libedata-cal/libedata-cal.pc.in
+++ b/calendar/libedata-cal/libedata-cal.pc.in
@@ -2,9 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+datadir=@datadir@
 
 idldir=@idldir@
-IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
+IDL_INCLUDES=-I${idldir} @IDL_INCLUDES@
 
 privincludedir=@privincludedir@
 

diff --git a/configure.in b/configure.in
index 83dc82e..3ea028a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1178,7 +1178,7 @@ esac
 AM_PATH_ORBIT2(2.9.8)
 
 AC_MSG_CHECKING(for CORBA include paths)
-IDL_INCLUDES="-I "`pkg-config --variable=idldir libbonobo-2.0`" -I "`pkg-config --variable=idldir bonobo-activation-2.0`
+IDL_INCLUDES="-I"`pkg-config --variable=idldir libbonobo-2.0`" -I"`pkg-config --variable=idldir bonobo-activation-2.0`
 AC_MSG_RESULT($IDL_INCLUDES)
 AC_SUBST(IDL_INCLUDES)
 

diff --git a/evolution-data-server.pc.in b/evolution-data-server.pc.in
index 40b30f9..f02d32d 100644 (file)
--- a/evolution-data-server.pc.in
+++ b/evolution-data-server.pc.in
@@ -10,7 +10,7 @@ privdatadir=@privdatadir@
 execversion=@BASE_VERSION@
 
 idldir=@idldir@
-IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
+IDL_INCLUDES=-I${idldir} @IDL_INCLUDES@
 
 Name: evolution-data-server
 Description: The evolution data server for the calendar and addressbook

diff --git a/libedataserver/libedataserver.pc.in b/libedataserver/libedataserver.pc.in
index b41ba1a..b591033 100644 (file)
--- a/libedataserver/libedataserver.pc.in
+++ b/libedataserver/libedataserver.pc.in
@@ -2,6 +2,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+datadir=@datadir@
 
 privincludedir=@privincludedir@
 

diff --git a/servers/groupwise/libegroupwise.pc.in b/servers/groupwise/libegroupwise.pc.in
index c80a080..9c5b3e3 100644 (file)
--- a/servers/groupwise/libegroupwise.pc.in
+++ b/servers/groupwise/libegroupwise.pc.in
@@ -2,9 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+datadir=@datadir@
 
 idldir=@idldir@
-IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
+IDL_INCLUDES=-I${idldir} @IDL_INCLUDES@
 
 privincludedir=@privincludedir@