[gedit] Fix plugins distcheck.



commit fcae337dfd1292ef1f13f2f3db86740a5bcd676a
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Jun 21 15:22:45 2009 +0200

    Fix plugins distcheck.

 configure.ac        |   15 ++-------------
 plugins/Makefile.am |   14 ++++++++++----
 2 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1566156..7085d97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,24 +200,13 @@ if test "x$enable_enchant" = "xyes" ; then
 		else
 			AC_MSG_ERROR([iso-codes is required to build the spell plugin. Use --disable-spell to build without spell plugin.])
 		fi
-	
-		enable_enchant=yes
-		ENCHANT_CFLAGS="${ENCHANT_CFLAGS}"
-		ENCHANT_LIBS="${ENCHANT_LIBS}"
-		SPELL_PLUGIN_DIR="spell"
 	else
+		enable_enchant=no
 		AC_MSG_ERROR([Enchant library not found or too old. Use --disable-spell to build without spell plugin.])
 	fi
-else
-	enable_enchant=no
-	ENCHANT_CFLAGS=
-	ENCHANT_LIBS=
-	SPELL_PLUGIN_DIR=
 fi
 
-AC_SUBST(ENCHANT_CFLAGS)
-AC_SUBST(ENCHANT_LIBS)
-AC_SUBST(SPELL_PLUGIN_DIR)
+AM_CONDITIONAL(ENABLE_ENCHANT, test x"$enable_enchant" = "xyes")
 
 dnl ================================================================
 dnl libsocket checks - needed for bacon-connection on solaris.
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 551e12e..8b13a9e 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,9 +1,14 @@
 DIST_SUBDIRS =		\
 	changecase 	\
+	checkupdate	\
 	docinfo 	\
+	externaltools	\
 	filebrowser 	\
 	indent 		\
 	modelines	\
+	pythonconsole	\
+	quickopen	\
+	snippets	\
 	sort 		\
 	spell 		\
 	taglist 	\
@@ -17,16 +22,17 @@ SUBDIRS = 		\
 	modelines	\
 	sort		\
 	taglist		\
-	time		\
-	$(SPELL_PLUGIN_DIR)
+	time
 
 if ENABLE_PYTHON
-DIST_SUBDIRS += externaltools pythonconsole snippets quickopen
 SUBDIRS      += externaltools pythonconsole snippets quickopen
 endif
 
+if ENABLE_ENCHANT
+SUBDIRS      += spell
+endif
+
 if ENABLE_UPDATER
-DIST_SUBDIRS += checkupdate
 SUBDIRS      += checkupdate
 endif
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]