some fixes regarding libtre includes

6 files changed, 5 insertions, 11 deletions

diff --git a/HISTORY b/HISTORY
index ef278bd..0a955e3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -76,7 +76,7 @@ fixes:
 - fixed some memory leaks, thanks to Bittor Corl for providing a patch
 - some fixes to compile with gcc-4.4, thanks to firefly@vdrportal for providing a patch
 - fixed wrong man section of some man pages, thanks to Ville Skyttä for providing a patch
-
+- some fixes regarding libtre includes, thanks to Ville Skyttä for providing a patch
 
 2008-04-29: Version 0.9.24
 new:
diff --git a/HISTORY.DE b/HISTORY.DE
index 17e8898..a5f7c3b 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -81,6 +81,7 @@ fixes:
 - Einige Korrekturen damit es mit gcc-4.4 compiliert, Danke an firefly@vdrportal für einen 
   Patch.
 - Falsche Man-Sektion einiger Man-Pages korrigiert, Danke an Ville Skyttä für den Patch.
+- Einige Korrekturen bzgl. libtre-Includes, Danke an Ville Skyttä für den Patch.
 
 
 2008-04-29: Version 0.9.24
diff --git a/Makefile b/Makefile
index 7a3506d..51c4c19 100644
--- a/Makefile
+++ b/Makefile
@@ -147,6 +147,7 @@ ifdef HAVE_LIBTRE
 LIBS += -L$(shell pkg-config --variable=libdir tre) $(shell pkg-config --libs tre)
 #LIBS += -L/usr/lib -ltre
 DEFINES += -DHAVE_LIBTRE
+INCLUDE += $(shell pkg-config --cflags tre)
 endif
 
 ifdef USE_PINPLUGIN
diff --git a/blacklist.c b/blacklist.c
index 5780182..eca9e35 100644
--- a/blacklist.c
+++ b/blacklist.c
@@ -32,11 +32,6 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include "menu_searchedit.h"
 #include "menu_searchresults.h"
 #include <math.h>
-#ifdef HAVE_PCREPOSIX
-#include <pcreposix.h>
-#else
-#include <regex.h>
-#endif
 
 cBlacklists Blacklists;
 
diff --git a/epgsearchext.c b/epgsearchext.c
index a2b30a2..32e9c40 100644
--- a/epgsearchext.c
+++ b/epgsearchext.c
@@ -38,11 +38,6 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include "uservars.h"
 #include "blacklist.h"
 #include <math.h>
-#ifdef HAVE_PCREPOSIX
-#include <pcreposix.h>
-#else
-#include <regex.h>
-#endif
 
 cSearchExts SearchExts;
 cSearchExts SearchTemplates;
diff --git a/epgsearchtools.c b/epgsearchtools.c
index 7a08a9f..3748ba5 100644
--- a/epgsearchtools.c
+++ b/epgsearchtools.c
@@ -44,6 +44,8 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 
 #ifdef HAVE_PCREPOSIX
 #include <pcreposix.h>
+#elif defined(HAVE_LIBTRE)
+#include <tre/regex.h>
 #else
 #include <regex.h>
 #endif