]> www.infradead.org Git - pidgin-chime.git/commitdiff
Merge pull request #17 from ajorg-aws/master
authorDavid Woodhouse <dwmw2@infradead.org>
Sat, 28 Apr 2018 09:31:02 +0000 (10:31 +0100)
committerGitHub <noreply@github.com>
Sat, 28 Apr 2018 09:31:02 +0000 (10:31 +0100)
Add RPM .spec file and make evolution optional

1  2 
Makefile.am
configure.ac

diff --cc Makefile.am
Simple merge
diff --cc configure.ac
index 4ed3794b08be86ddd649f80442f19ffef8cc5082,ef8c300c773a79328169138cba00a344f3332bd5..d5ace19ba63aff306fa68a71e802c92d8f01456b
@@@ -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})