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

diff --git a/Makefile.am b/Makefile.am
index 7c54cfe11873a8644cafb9fd9308b167e2400c0c..5793262ddc7a49823b534dd9c0c7d89f2c165c44 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,8 +22,8 @@ libchime_la_SOURCES = chime.c buddy.c rooms.c chat.c messages.c conversations.c
        protobuf/rt_message.pb-c.c protobuf/rt_message.pb-c.h \
        chime-call-audio.h chime-call-transport.c
 
-libchime_la_CFLAGS = $(PURPLE_CFLAGS) $(SOUP_CFLAGS) $(JSON_CFLAGS) $(LIBXML_CFLAGS) $(PROTOBUF_CFLAGS) $(OPUS_CFLAGS) $(FARSTREAM_CFLAGS)
-libchime_la_LIBADD = $(PURPLE_LIBS) $(SOUP_LIBS) $(JSON_LIBS) $(LIBXML_LIBS) $(PROTOBUF_LIBS) $(OPUS_LIBS) $(FARSTREAM_LIBS)
+libchime_la_CFLAGS = $(PURPLE_CFLAGS) $(SOUP_CFLAGS) $(JSON_CFLAGS) $(LIBXML_CFLAGS) $(PROTOBUF_CFLAGS) $(OPUS_CFLAGS) $(FARSTREAM_CFLAGS) $(MARKDOWN_CFLAGS)
+libchime_la_LIBADD = $(PURPLE_LIBS) $(SOUP_LIBS) $(JSON_LIBS) $(LIBXML_LIBS) $(PROTOBUF_LIBS) $(OPUS_LIBS) $(FARSTREAM_LIBS) $(MARKDOWN_LIBS)
 libchime_la_LDFLAGS = -module -avoid-version -no-undefined
 
 POTFILES = $(libchime_la_SOURCES)

diff --git a/configure.ac b/configure.ac
index 281b4125b2a889d1ac39c5ac3a5e239fac4733e6..0a7ddc74202e43771cd787c381d71fb403695dd9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,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"])
 
 AC_PATH_PROG(MSGFMT, msgfmt)
 if test "$MSGFMT" = ""; then