Revision: 942 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=942&view=rev Author: hyperair Date: 2009-09-20 16:10:16 +0000 (Sun, 20 Sep 2009)
Log Message: ----------- Add HAVE_ENCHANT_1_5 conditional and define
Modified Paths: -------------- trunk/geany-plugins/build/spellcheck.m4 trunk/geany-plugins/spellcheck/src/Makefile.am
Modified: trunk/geany-plugins/build/spellcheck.m4 =================================================================== --- trunk/geany-plugins/build/spellcheck.m4 2009-09-17 06:39:23 UTC (rev 941) +++ trunk/geany-plugins/build/spellcheck.m4 2009-09-20 16:10:16 UTC (rev 942) @@ -6,16 +6,26 @@ enable_spellcheck=auto)
ENCHANT_VERSION=1.3 + OPT_ENCHANT_VERSION=1.5
if [[ x"$enable_spellcheck" = "xauto" ]]; then - PKG_CHECK_MODULES(ENCHANT, [enchant >= $ENCHANT_VERSION], - [enable_spellcheck=yes], - [enable_spellcheck=no]) + PKG_CHECK_MODULES(ENCHANT, [enchant >= $OPT_ENCHANT_VERSION], + [have_enchant_1_5=yes; enable_spellcheck=yes], + [have_enchant_1_5=no; enable_spellcheck=auto]) + if [[ "$enable_spellcheck" = "auto" ]]; then + PKG_CHECK_MODULES(ENCHANT, [enchant >= $ENCHANT_VERSION], + [enable_spellcheck=yes], + [enable_spellcheck=no]) + fi elif [[ x"$enable_spellcheck" = "xyes" ]]; then - PKG_CHECK_MODULES(ENCHANT, [enchant >= $ENCHANT_VERSION]) + PKG_CHECK_MODULES(ENCHANT, [enchant >= $OPT_ENCHANT_VERSION], + [have_enchant_1_5=yes], + [have_enchant_1_5=no; + PKG_CHECK_MODULES(ENCHANT, [enchant >= $ENCHANT_VERSION])]) fi
AM_CONDITIONAL(ENABLE_SPELLCHECK, test $enable_spellcheck = yes) + AM_CONDITIONAL(HAVE_ENCHANT_1_5, test $have_enchant_1_5 = yes) GP_STATUS_PLUGIN_ADD([Spellcheck], [$enable_spellcheck])
AC_CONFIG_FILES([
Modified: trunk/geany-plugins/spellcheck/src/Makefile.am =================================================================== --- trunk/geany-plugins/spellcheck/src/Makefile.am 2009-09-17 06:39:23 UTC (rev 941) +++ trunk/geany-plugins/spellcheck/src/Makefile.am 2009-09-20 16:10:16 UTC (rev 942) @@ -18,6 +18,10 @@ $(AM_CFLAGS) \ $(ENCHANT_CFLAGS)
+if HAVE_ENCHANT_1_5 +spellcheck_la_CFLAGS += -DHAVE_ENCHANT_1_5 +endif + spellcheck_la_LIBADD = \ $(COMMONLIBS) \ $(ENCHANT_LIBS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.