summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhorchi <vdr@jwendel.de>2020-02-09 17:10:07 +0100
committerhorchi <vdr@jwendel.de>2020-02-09 17:10:07 +0100
commit527e08a3d8d21ba170154ec4bb6c2f4264a26ea8 (patch)
tree51212c23ebad036aad14d4d154f521a8d3b295f3
parent35395e6bf84581526e17f8b4c966ac9f39e437bc (diff)
parentd98e035db5e57dc2286edfc76683280ec9a8b26a (diff)
downloadvdr-epg-daemon-527e08a3d8d21ba170154ec4bb6c2f4264a26ea8.tar.gz
vdr-epg-daemon-527e08a3d8d21ba170154ec4bb6c2f4264a26ea8.tar.bz2
2020-02-09: version 1.1.151 (horchi)\n - bugfix: Added missing commit after timer cleanup\n - added: Debug messages for alter table\n\n1.1.151
-rw-r--r--HISTORY.h12
-rw-r--r--Make.config2
-rw-r--r--Makefile4
3 files changed, 11 insertions, 7 deletions
diff --git a/HISTORY.h b/HISTORY.h
index a9b00ba..9a9c391 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -4,8 +4,8 @@
* -----------------------------------
*/
-#define _VERSION "1.1.150"
-#define VERSION_DATE "22.12.2019"
+#define _VERSION "1.1.151"
+#define VERSION_DATE "09.02.2020"
#define DB_API 7
#ifdef GIT_REV
@@ -17,9 +17,13 @@
/*
* ------------------------------------
*
-
-2019-12-22: version 1.1.150 (horchi)
+ *
+2020-02-09: version 1.1.151 (horchi)
- bugfix: Added missing commit after timer cleanup
+ - added: Debug messages for alter table
+
+2020-01-28: version 1.1.150 (horchi)
+ - added: Using pkg-config for libxml2 (by Alexander Grothe)
2019-12-15: version 1.1.149 (horchi)
- added: Added cleanup for old wasted timers
diff --git a/Make.config b/Make.config
index db65ba0..b2e1794 100644
--- a/Make.config
+++ b/Make.config
@@ -73,7 +73,7 @@ ifdef SYSD_NOTIFY
endif
ifdef USELIBXML
- DEFINES += $(shell xml2-config --cflags) $(shell xslt-config --cflags)
+ DEFINES += $(shell pkg-config libxml-2.0 --cflags) $(shell pkg-config libxslt --cflags)
endif
ifdef USEPYTHON
diff --git a/Makefile b/Makefile
index c440fb7..807ab83 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,8 @@ BASELIBS += $(shell pkg-config --cflags --libs jansson)
HLIB = -L./lib -lhorchi
-DLIBS = $(HLIB) $(BASELIBS) -lcurl $(shell xml2-config --libs) $(shell xslt-config --libs) -lexslt
-HTTPLIBS = $(HLIB) -lmicrohttpd $(BASELIBS) -lcurl $(shell xml2-config --libs) $(shell xslt-config --libs) -lexslt -ljpeg $(shell imlib2-config --libs)
+DLIBS = $(HLIB) $(BASELIBS) -lcurl $(shell pkg-config libxml-2.0 --libs) $(shell pkg-config libxslt --libs) -lexslt
+HTTPLIBS = $(HLIB) -lmicrohttpd $(BASELIBS) -lcurl $(shell pkg-config libxml-2.0 --libs) $(shell pkg-config libxslt --libs) -lexslt -ljpeg $(shell pkg-config imlib2 --libs)
CFLAGS += $(shell mysql_config --include)
VERSION = $(shell grep 'define _VERSION ' $(HISTFILE) | awk '{ print $$3 }' | sed -e 's/[";]//g')