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

This reverts commit dd552aaa62564c210d2757d06d9125a115401951.

diff --git a/Makefile.am b/Makefile.am
index 3af15a180ad0b30c6869cfcab2ccea9b61b3f760..f987a2a9e5405a5ad97be740c1b746edaa149c08 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,13 +33,13 @@ CHIME_SRCS =        chime/chime-connection.c chime/chime-connection.h \
 noinst_LTLIBRARIES = libchime.la
 
 libchime_la_SOURCES = $(CHIME_SRCS) $(WEBSOCKET_SRCS) $(PROTOBUF_SRCS)
-libchime_la_CFLAGS = $(SOUP_CFLAGS) $(JSON_CFLAGS) $(LIBXML_CFLAGS) $(PROTOBUF_CFLAGS) $(MARKDOWN_CFLAGS) $(GSTREAMER_CFLAGS) $(GNUTLS_CFLAGS) -Ichime
-libchime_la_LIBADD = $(SOUP_LIBS) $(JSON_LIBS) $(LIBXML_LIBS) $(PROTOBUF_LIBS) $(MARKDOWN_LIBS) $(GSTREAMER_LIBS) $(GNUTLS_LIBS)
+libchime_la_CFLAGS = $(SOUP_CFLAGS) $(JSON_CFLAGS) $(LIBXML_CFLAGS) $(PROTOBUF_CFLAGS) $(GSTREAMER_CFLAGS) $(GNUTLS_CFLAGS) -Ichime
+libchime_la_LIBADD = $(SOUP_LIBS) $(JSON_LIBS) $(LIBXML_LIBS) $(PROTOBUF_LIBS) $(GSTREAMER_LIBS) $(GNUTLS_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) $(MARKDOWN_CFLAGS) $(GSTREAMER_CFLAGS) -Ichime -Iprpl
-libchimeprpl_la_LIBADD = $(PURPLE_LIBS) $(SOUP_LIBS) $(JSON_LIBS) $(LIBXML_LIBS) $(MARKDOWN_LIBS) $(GSTREAMER_LIBS) libchime.la
+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) 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 becf7269cb310736b217d2867063c89088faf2fa..303a86609786213709d3ad499e1fd0d4961490a2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -58,17 +58,6 @@ 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"])
 
 gstplugindir="$($PKG_CONFIG --variable=pluginsdir gstreamer-1.0)"
 AC_SUBST(gstplugindir, ${gstplugindir})