[geany/geany-plugins] 601eca: geanyvc: Remove AM_CONDITIONAL

[Quentin Glidic]

Branch:      refs/heads/master
Author:      Quentin Glidic <sardemff7+git at sardemff7.net>
Committer:   Chow Loong Jin <hyperair at debian.org>
Date:        Sat, 16 Jun 2012 16:23:06
Commit:      601eca1b016331ca9a621620b37f6f8fbde258c6
             https://github.com/geany/geany-plugins/commit/601eca1b016331ca9a621620b37f6f8fbde258c6

Log Message:
-----------
geanyvc: Remove AM_CONDITIONAL


Modified Paths:
--------------
    build/geanyvc.m4
    geanyvc/src/Makefile.am

Modified: build/geanyvc.m4
4 files changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -13,12 +13,14 @@ AC_DEFUN([GP_CHECK_GEANYVC],
     elif [[ x"$enable_gtkspell" = "xyes" ]]; then
         PKG_CHECK_MODULES(GTKSPELL, [gtkspell-2.0])
     fi
+    if [[ x"$enable_gtkspell" = "xyes" ]]; then
+        AC_DEFINE(USE_GTKSPELL, 1, [GtkSpell support])
+    fi
 
     if [[ "$enable_gtkspell" = yes -a "$enable_geanyvc" = no ]]; then
        AC_MSG_WARN([GtkSpell support for GeanyVC enabled, but GeanyVC itself not enabled.])
     fi
 
-    AM_CONDITIONAL(USE_GTKSPELL, test $enable_gtkspell = yes)
     GP_STATUS_FEATURE_ADD([GeanyVC GtkSpell support], [$enable_gtkspell])
 
     AC_CONFIG_FILES([


Modified: geanyvc/src/Makefile.am
14 files changed, 6 insertions(+), 8 deletions(-)
===================================================================
@@ -18,14 +18,12 @@ geanyvc_la_SOURCES = \
 	vc_svn.c \
 	geanyvc.h
 
-geanyvc_la_CFLAGS = $(AM_CFLAGS)
-geanyvc_la_LIBADD = $(COMMONLIBS)
-
-if USE_GTKSPELL
-geanyvc_la_CFLAGS += \
-	-DUSE_GTKSPELL=1 \
+geanyvc_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(GTKSPELL_CFLAGS)
-geanyvc_la_LIBADD += $(GTKSPELL_LIBS)
-endif
+
+geanyvc_la_LIBADD = \
+	$(GTKSPELL_LIBS) \
+	$(COMMONLIBS)
 
 include $(top_srcdir)/build/cppcheck.mk


@@ Diff output truncated at 100000 characters. @@


--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).