Deprecate blerg.httpd since it's become a hassle

diff --git a/Makefile b/Makefile
index c07dc03..144d942 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ LDFLAGS ?=
 HTTP_LIBDIRS = $(MHD_LIBDIR) $(YAJL_LIBDIR)
 CGI_LIBDIRS = $(CGI_UTIL_LIBDIR) $(YAJL_LIBDIR)
 
-targets = blerg.a blergtool blerglatest blerg.httpd blerg.cgi rss.cgi
+targets = blerg.a blergtool blerglatest blerg.cgi rss.cgi
 blerg_a_objects = database/database.o database/tags.o database/util.o database/subscription.o common/stringbucket.o
 blergtool_objects = tools/blergtool.o blerg.a
 blerglatest_objects = tools/blerglatest.o blerg.a common/json.o

diff --git a/Makefile.am b/Makefile.am
index 2ea41ec..51a8297 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 ACLOCAL_AMFLAGS = -I m4
 cgidir=@CGIBINDIR@
 cgi_PROGRAMS=blerg.cgi rss.cgi
-bin_PROGRAMS=blergtool blerglatest blerg.httpd 
+bin_PROGRAMS=blergtool blerglatest
 
 noinst_LIBRARIES=libblerg.a
 libblerg_a_SOURCES=database/database.c database/tags.c database/util.c database/subscription.c common/stringbucket.c

diff --git a/configure.in b/configure.in
index 148b28c..0c635bb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,9 +17,10 @@ PKG_PROG_PKG_CONFIG
 AC_CHECK_LIB([pthread], [main])
 AX_CHECK_YAJL
 AX_CHECK_CGIUTIL
-PKG_CHECK_MODULES([MICROHTTPD], [libmicrohttpd])
-AC_SUBST([MICROHTTPD_CFLAGS])
-AC_SUBST([MICROHTTPD_LIBS])
+# blerg.httpd deprecated
+#PKG_CHECK_MODULES([MICROHTTPD], [libmicrohttpd])
+#AC_SUBST([MICROHTTPD_CFLAGS])
+#AC_SUBST([MICROHTTPD_LIBS])
 
 
 # Checks for header files.

diff --git a/www/doc/changelog.html b/www/doc/changelog.html
index 30e406a..549505b 100644 (file)
--- a/www/doc/changelog.html
+++ b/www/doc/changelog.html
@@ -11,6 +11,27 @@
 The intent of this changelog is to give an overview of the major changes
 and fixes made to Blërg.  For a detailed changelog, see the git log.
 
+<a name="v1.6.2"><h2>Version 1.6.2 - released Sunday, January 15, 2012</h2>
+
+<h3>Features Deprecated</h3>
+<ul>
+<li>Blerg.httpd (the standalone HTTP Blërg server) is now deprecated.
+It will not get new features and has been removed as a default build
+target.  Libmicrohttpd is just too obtuse to continue to support.  Look
+for a FastCGI version in the future, or maybe a new standalone version
+written using <a href="https://github.com/ellzey/libevhtp">libevhtp</a>.</li>
+</ul>
+
+<a name="v1.6.1"><h2>Version 1.6.1 - released Monday, November 7, 2011</h2>
+
+<h3>Features Added</h3>
+<ul>
+<li>Added support for inline media formats (mp3/ogg) played via the
+audio tag</li>
+<li>Added autoconf build system graciously provided by Boris
+Manojlovic</li>
+</ul>
+
 <a name="v1.6"><h2>Version 1.6 - released Monday, July 18th 2011</h2>
 
 <h3>Features Added</h3>

diff --git a/www/doc/index.html b/www/doc/index.html
index 5a170e6..d910f7d 100644 (file)
--- a/www/doc/index.html
+++ b/www/doc/index.html
@@ -111,6 +111,9 @@ made individually as well, if you, for example, don't want to install
 the prerequisites for <code>blerg.httpd</code> or
 <code>blerg.cgi</code>.
 
+<p><strong>NOTE</strong>: blerg.httpd is deprecated and will not be
+updated with new features.
+
 <h3><a name="installing">Installing</a></h3>
 
 <p>While it's not strictly required, Blërg will be easier to set up if