From 7a618c2e7e80b87b6462efd9b953e3297029c39e Mon Sep 17 00:00:00 2001 From: Chip Black Date: Sun, 15 Jan 2012 17:13:43 -0600 Subject: [PATCH 1/1] Deprecate blerg.httpd since it's become a hassle --- Makefile | 2 +- Makefile.am | 2 +- configure.in | 7 ++++--- www/doc/changelog.html | 21 +++++++++++++++++++++ www/doc/index.html | 3 +++ 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c07dc03..144d942 100644 --- 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 --- 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 --- 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 --- 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. +

Version 1.6.2 - released Sunday, January 15, 2012

+ +

Features Deprecated

+
+ +

Version 1.6.1 - released Monday, November 7, 2011

+ +

Features Added

+ +

Version 1.6 - released Monday, July 18th 2011

Features Added

diff --git a/www/doc/index.html b/www/doc/index.html index 5a170e6..d910f7d 100644 --- 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 blerg.httpd or blerg.cgi. +

NOTE: blerg.httpd is deprecated and will not be +updated with new features. +

Installing

While it's not strictly required, Blërg will be easier to set up if -- 2.34.1