Add libmarkdown (not used yet, but it's being worked on)

diff --git a/Makefile.am b/Makefile.am
index d88adf74ce035cf40e907a6c1a914d2fed91080b..e6cd9d95a278c8e13c3c1064bf03af8571103e0e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,8 +55,8 @@ libchime_la_LIBADD = $(SOUP_LIBS) $(JSON_LIBS) $(LIBXML_LIBS) $(PROTOBUF_LIBS) $
 libchime_la_LDFLAGS = -module -avoid-version -no-undefined
 
 libchimeprpl_la_SOURCES = $(PRPL_SRCS) $(LOGIN_SRCS)
-libchimeprpl_la_CFLAGS = $(PURPLE_CFLAGS) $(SOUP_CFLAGS) $(JSON_CFLAGS) $(LIBXML_CFLAGS) $(GSTREAMER_CFLAGS) -Ichime -Iprpl
-libchimeprpl_la_LIBADD = $(PURPLE_LIBS) $(SOUP_LIBS) $(JSON_LIBS) $(LIBXML_LIBS) $(GSTREAMER_LIBS) $(DLOPEN_LIBS) libchime.la
+libchimeprpl_la_CFLAGS = $(PURPLE_CFLAGS) $(SOUP_CFLAGS) $(JSON_CFLAGS) $(LIBXML_CFLAGS) $(GSTREAMER_CFLAGS) $(MARKDOWN_CFLAGS) -Ichime -Iprpl
+libchimeprpl_la_LIBADD = $(PURPLE_LIBS) $(SOUP_LIBS) $(JSON_LIBS) $(LIBXML_LIBS) $(GSTREAMER_LIBS) $(DLOPEN_LIBS) $(MARKDOWN_LIBS) libchime.la
 libchimeprpl_la_LDFLAGS = -module -avoid-version -no-undefined
 
 POTFILES = $(libchime_la_SOURCES) $(libchimeprpl_la_SOURCES)

diff --git a/configure.ac b/configure.ac
index 6a6e6a992fce11455f064818bf2e4bd755248fbc..b24b5f3d4b6b1dd8d3b251a1284bfb29fd3dd0ba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,17 @@ PKG_CHECK_MODULES(SOUP, [libsoup-2.4 >= 2.50])
 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()])], [])