[evolution-patches] Gnome Spell configure.in/Makefile.am fixes

[Rodney Dawes <dobey ximian com>]

This patch fixes various errors when using automake/autoheader and moves
the spelling component to a private libdir, as it is not a library that
gets linked to, and shlib components and plug-ins are supposed to be in
private libdirs.

-- dobey

? autom4te.cache
? intltool-extract
? intltool-extract.in
? intltool-merge
? intltool-merge.in
? intltool-update
? intltool-update.in
? stamp-h1
? gnome-spell/GNOME_Spell.server
? gnome-spell/GNOME_Spell.server.in
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-spell/configure.in,v
retrieving revision 1.61
diff -u -r1.61 configure.in
--- configure.in	9 Apr 2003 19:59:13 -0000	1.61
+++ configure.in	14 Apr 2003 16:10:26 -0000
@@ -20,7 +20,7 @@
 dnl
 
 AC_SUBST(GNOME_SPELL_RELEASE)
-AC_DEFINE_UNQUOTED(GNOME_SPELL_RELEASE, "${GNOME_SPELL_RELEASE}")
+AC_DEFINE_UNQUOTED(GNOME_SPELL_RELEASE, "${GNOME_SPELL_RELEASE}", "GnomeSpell Release")
 
 AM_INIT_AUTOMAKE(gnome-spell, ${GNOME_SPELL_RELEASE})
 
@@ -39,10 +39,10 @@
 AM_GLIB_GNU_GETTEXT
 
 AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE","Gettext Package")
 
 
-AC_DEFINE_UNQUOTED(API_VERSION, "${API_VERSION}")
+AC_DEFINE_UNQUOTED(API_VERSION, "${API_VERSION}", "API Version")
 AC_SUBST(API_VERSION)
 
 dnl
@@ -96,7 +96,7 @@
 GNOME_SPELL_DATADIR="${datadir}"
 AC_SUBST(GNOME_SPELL_DATADIR)
 
-GNOME_SPELL_COMPONENT_LOCATION=${libdir}
+GNOME_SPELL_COMPONENT_LOCATION="${libdir}/gnome-spell"
 AC_SUBST(GNOME_SPELL_COMPONENT_LOCATION)
 
 dnl
Index: gnome-spell/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-spell/gnome-spell/Makefile.am,v
retrieving revision 1.26
diff -u -r1.26 Makefile.am
--- gnome-spell/Makefile.am	24 Mar 2003 12:33:39 -0000	1.26
+++ gnome-spell/Makefile.am	14 Apr 2003 16:10:26 -0000
@@ -8,9 +8,6 @@
 INCLUDES =                                              \
         -I$(srcdir)                                     \
 	$(ASPELL_INC)					\
-	$(END)
-
-CFLAGS +=						\
         -DGNOMEDATADIR=\""$(datadir)"\"         	\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
 	-DGLADE_DATADIR=\"$(gladedir)\"			\
@@ -39,19 +36,26 @@
 
 Spell-impl.o: Spell.h
 
-lib_LTLIBRARIES = libgnome-spell-component.la
+privlibdir = $(GNOME_SPELL_COMPONENT_LOCATION)
+privlib_LTLIBRARIES = libgnome-spell-component.la
 
 noinst_PROGRAMS =				\
 	test-gnome-spell-component
 
+noinst_LTLIBRARIES = libgnome-spell-idl.la
+
+libgnome_spell_idl_la_SOURCES =	\
+	$(IDL_GENERATED)	\
+	$(END)
+
 libgnome_spell_component_la_LDFLAGS = -release $(API_VERSION)
 libgnome_spell_component_la_LIBADD = 		\
-	-L/usr/lib $(ASPELL_LIBS)		\
+	libgnome-spell-idl.la		\
+	$(ASPELL_LIBS)		\
 	$(GNOME_SPELL_LIBS)			\
 	$(END)
 
 libgnome_spell_component_la_SOURCES =		\
-	$(IDL_GENERATED)			\
 	control.h				\
 	control.c				\
 	dictionary.h				\
@@ -60,12 +64,12 @@
 	$(END)
 
 test_gnome_spell_component_LDADD =		\
+	libgnome-spell-idl.la		\
 	$(ASPELL_LIBS)				\
 	$(GNOME_SPELL_LIBS)			\
 	$(END)
 
 test_gnome_spell_component_SOURCES =		\
-	$(IDL_GENERATED)			\
 	test-spell.c
 
 serverdir = $(libdir)/bonobo/servers