Permalink
Browse files

geanyvc: Remove AM_CONDITIONAL

  • Loading branch information...
sardemff7 authored and hyperair committed May 19, 2012
1 parent 9c70e23 commit 601eca1b016331ca9a621620b37f6f8fbde258c6
Showing with 9 additions and 9 deletions.
  1. +3 −1 build/geanyvc.m4
  2. +6 −8 geanyvc/src/Makefile.am
View
@@ -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([
View
@@ -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

0 comments on commit 601eca1

Please sign in to comment.