From: David Woodhouse <dwmw2@infradead.org>
Date: Sat, 28 Apr 2018 09:31:02 +0000 (+0100)
Subject: Merge pull request #17 from ajorg-aws/master
X-Git-Tag: v0.9~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=01899d171e31ae545ffc019faf936f83e83db9b8;p=pidgin-chime.git

Merge pull request #17 from ajorg-aws/master

Add RPM .spec file and make evolution optional
---

01899d171e31ae545ffc019faf936f83e83db9b8
diff --cc configure.ac
index 4ed3794,ef8c300..d5ace19
--- a/configure.ac
+++ b/configure.ac
@@@ -62,22 -58,7 +62,11 @@@ PKG_CHECK_MODULES(SOUP, [libsoup-2.4 >
  if $PKG_CONFIG --atleast-version 2.59 libsoup-2.4; then
     AC_DEFINE(USE_LIBSOUP_WEBSOCKETS, 1, [Use libsoup websockets])
  fi
- PKG_CHECK_MODULES(MARKDOWN, [libmarkdown], [],
- 		  [oldLIBS="$LIBS"
- 		   LIBS="$LIBS -lmarkdown"
- 		   AC_MSG_CHECKING([for libmarkdown without pkg-config])
- 		   AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <mkdio.h>],[mkd_initialize();])],
- 				  [AC_MSG_RESULT(yes)
- 				   AC_SUBST([MARKDOWN_LIBS], ["-lmarkdown"])
- 				   AC_SUBST([MARKDOWN_CFLAGS], [])],
- 				  [AC_MSG_RESULT(no)
- 				   AC_ERROR([Could not build against libmarkdown])])
- 		   LIBS="$oldLIBS"])
  
 +LIBS="$LIBS $PURPLE_LIBS"
 +AC_CHECK_FUNC(purple_request_screenshare_media, [AC_DEFINE(HAVE_SCREENSHARE, 1, [Have purple_request_screenshare_media()])], [])
 +LIBS="$oldLIBS"
 +
  gstplugindir="$($PKG_CONFIG --variable=pluginsdir gstreamer-1.0)"
  AC_SUBST(gstplugindir, ${gstplugindir})