ensure only one regex lib is used and finnish translation update

7 files changed, 33 insertions, 33 deletions

diff --git a/HISTORY b/HISTORY
index 05d6af9..6300127 100644
--- a/HISTORY
+++ b/HISTORY
@@ -33,7 +33,7 @@ new:
     direct links e.g. in the search timer mails.
 - in memory to pat: french translation update, thanks to Patrice Staudt
 - italian translation update, thanks to Diego Pierotto
-- finnish translation update, thanks to Rolf Ahrenberg
+- finnish translation update, thanks to Rolf Ahrenberg and Ville Skyttä
 - new SVDRP command 'MENU [NOW|PRG|SUM]' to call one of the main OSD menus or 
   the summary of the current event. If any epgsearch menu is open a subsequent
   SVDRP call will close it again.
@@ -104,6 +104,8 @@ fixes:
   a patch
 - fixed a crash when adding huge episode names to the timer's file name, thanks to Lari 
   Tuononen for reporting
+- make sure only one regular expression library is linked against epgsearch, 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 34c963c..abe0b19 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -33,7 +33,7 @@ neu:
     Damit können nun z.B. in den Suchtimer-Mails direkte Links angegeben werden.
 - Im Gedenken an pat: Update der französischen Übersetzung, Danke an Patrice Staudt
 - Update der italienischen Ãœbersetzung, Danke an Diego Pierotto
-- Update der finnischen Ãœbersetzung, Danke an Rolf Ahrenberg
+- Update der finnischen Übersetzung, Danke an Rolf Ahrenberg und Ville Skyttä
 - neues SVDRP-Kommando 'MENU [NOW|PRG|SUM]' zum Aufruf eines der OSD-Hauptmenüs
   oder der Inhaltsangabe der aktuellen Sendung. Falls irgendein epgsearch-Menü 
   geöffnet ist, schließt ein weiteres SVDRP-Kommando dieses wieder.
@@ -109,6 +109,8 @@ fixes:
   den Patch.
 - Absturz beim Hinzufügen sehr langer Episodentexte zum Verzeichnis eines Timers behoben, 
   Danke an Lari Tuononen für den Hinweis.
+- Sichergestellt, dass nur noch ein Library für reguläre Ausdrücke von epgsearch benutzt 
+  wird, Danke an Ville Skyttä für den Patch.
 
 
 2008-04-29: Version 0.9.24
diff --git a/INSTALL b/INSTALL
index 777e04c..7e7944e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -8,8 +8,8 @@ libpcre
 -------
 For support of Perl compatible regular expressions in a search you have to use
 libpcre:  
-simply edit the plugins Makefile and uncomment '#HAVE_PCREPOSIX=1' to
-'HAVE_PCREPOSIX=1' or append 'HAVE_PCREPOSIX=1' to your 'make plugins'
+simply edit the plugins Makefile and uncomment '#REGEXLIB = pcre' to
+'REGEXLIB = pcre' or append 'REGEXLIB=pcre' to your 'make plugins'
 call. (you will need pcreposix installed, comes with libpcre from
 www.pcre.org, but it's already part of most distributions
 HINT: if all compiles well, but after starting VDR you get:
@@ -20,7 +20,7 @@ update libpcre from www.pcre.org and recompile the plugin.
 
 There seems to be a problem with PCRE on some systems, that produce a crash
 when using regexp. Til now, I could not find the reason. So perhaps dont use
-HAVE_PCREPOSIX=1, if you don't really need it.
+REGEXLIB=pcre, if you don't really need it.
 
 libtre
 ------
@@ -29,7 +29,7 @@ search patterns with a maximum of 31 characters. This results in empty results
 if more than 31 characters are used. To avoid this limitation you can use the
 TRE package (http://laurikari.net/tre/). Install tre (on debian: 
 apt-get install tre-agrep libtre4 libtre-dev) and activate epgsearch's support
-for it in the Makefile by uncommenting '#HAVE_LIBTRE=1' to 'HAVE_LIBTRE=1' or append
+for it in the Makefile by uncommenting '#REGEXLIB = pcre' to 'REGEXLIB = tre' or append
 it to your 'make plugins' call. After recompiling epgsearch will now use an
 algorithm similiar to 'agrep' with no limits.
 
diff --git a/INSTALL.DE b/INSTALL.DE
index 1d871df..25e92c7 100644
--- a/INSTALL.DE
+++ b/INSTALL.DE
@@ -2,8 +2,8 @@ Hier gibt es nichts besonderes. Bitte wie jedes andere Standard-Plugin
 installieren (entpacken, soft link, make plugins). Eine kleine
 Besonderheit: Wer lieber mit Perl compatible regular expressions in
 der Suche arbeitet, sollte einfach im Makefile des Plugins
-#HAVE_PCREPOSIX=1 in HAVE_PCREPOSIX=1 ändern oder einfach
-HAVE_PCREPOSIX an den 'make plugins'-Aufruf anhängen. Hierzu muss pcreposix
+'#REGEXLIB = pcre' in 'REGEXLIB = pcre' ändern oder einfach
+REGEXLIB=pcre an den 'make plugins'-Aufruf anhängen. Hierzu muss pcreposix
 installiert sein, das in der libpcre von www.pcre.org enthalten ist.
 Dies sollte aber in den meisten Distributionen bereits enthalten sein.
 
@@ -18,5 +18,5 @@ kompilieren.
 Scheinbar gibt es auf manchen Systemen Probleme mit PCRE, die sich in einem
 Crash äußern, wenn man reg. Ausdrücke benutzt. Da ich die Ursache bisher
 nicht
-finden konnte, empfehle ich deshalb auf HAVE_PCREPOSIX=1 zu verzichten, wenn
+finden konnte, empfehle ich deshalb auf REGEXLIB=pcre zu verzichten, wenn
 es nicht unbedingt notwendig ist.
diff --git a/Makefile b/Makefile
index c88bb8d..a54270d 100644
--- a/Makefile
+++ b/Makefile
@@ -23,15 +23,11 @@ AUTOCONFIG=1
 ### if AUTOCONFIG is not active (i.e. commented) you can manually enable the 
 ### optional modules or patches for other plugins
 ifndef AUTOCONFIG
-# uncomment this if you want to use Perl compatible regular expressions (PCRE),
+# if you want to use Perl compatible regular expressions (PCRE) or libtre for
+# unlimited fuzzy searching, uncomment this and set the value to pcre or tre
 # also have a look at INSTALL for further notes on this
 
-#HAVE_PCREPOSIX=1
-
-# uncomment this if you want to use libtre for unlimited fuzzy searching,
-# also have a look at INSTALL for further notes on this
-
-#HAVE_LIBTRE=1
+#REGEXLIB = pcre
 
 # uncomment this to enable support for the pin plugin.
 
@@ -76,10 +72,9 @@ TMPDIR = /tmp
 ### auto configuring modules
 ifdef AUTOCONFIG
 	ifeq (exists, $(shell pkg-config libpcre && echo exists))
-		HAVE_PCREPOSIX = 1
-	endif
-	ifeq (exists, $(shell pkg-config tre && echo exists))
-		HAVE_LIBTRE = 1
+		REGEXLIB = pcre
+	else ifeq (exists, $(shell pkg-config tre && echo exists))
+		REGEXLIB = tre
 	endif
 	ifeq (exists, $(shell test -e ../pin && echo exists))
 		USE_PINPLUGIN = 1
@@ -136,14 +131,12 @@ DEFINES4 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN4)"'
 
 OBJS = afuzzy.o blacklist.o changrp.o confdloader.o conflictcheck.o conflictcheck_thread.o distance.o $(PLUGIN).o epgsearchcats.o epgsearchcfg.o epgsearchext.o epgsearchsetup.o  epgsearchsvdrp.o epgsearchtools.o i18n.o mail.o md5.o menu_announcelist.o menu_blacklistedit.o menu_blacklists.o menu_commands.o menu_conflictcheck.o menu_deftimercheckmethod.o menu_dirselect.o menu_event.o menu_favorites.o menu_main.o menu_myedittimer.o menu_quicksearch.o menu_recsdone.o menu_search.o menu_searchactions.o menu_searchedit.o menu_searchresults.o menu_searchtemplate.o menu_switchtimers.o menu_templateedit.o menu_timersdone.o menu_whatson.o noannounce.o pending_notifications.o rcfile.o  recdone.o recstatus.o searchtimer_thread.o services.o switchtimer.o switchtimer_thread.o templatefile.o timer_thread.o timerdone.o timerstatus.o uservars.o varparser.o  
 
-ifdef HAVE_PCREPOSIX
+ifeq ($(REGEXLIB), pcre)
 LIBS += $(shell pcre-config --libs-posix)
 #LIBS += -L/usr/lib -lpcreposix -lpcre
 INCLUDE += $(shell pcre-config --cflags)
 DEFINES += -DHAVE_PCREPOSIX
-endif
-
-ifdef HAVE_LIBTRE
+else ifeq ($(REGEXLIB), tre)
 LIBS += -L$(shell pkg-config --variable=libdir tre) $(shell pkg-config --libs tre)
 #LIBS += -L/usr/lib -ltre
 DEFINES += -DHAVE_LIBTRE
diff --git a/doc-src/en/epgsearch.1.txt b/doc-src/en/epgsearch.1.txt
index 8a38f6a..16afcf8 100644
--- a/doc-src/en/epgsearch.1.txt
+++ b/doc-src/en/epgsearch.1.txt
@@ -208,8 +208,8 @@ With 'Regular expression' you can setup a regular expression as
 search term. You don't need a leading and trailing '/' in the
 expression. By default these are POSIX extended regular expressions.
 If you like to have Herl compatible regular expression, simply edit
-the plugins Makefile and uncomment #HAVE_PCREPOSIX=1 to
-HAVE_PCREPOSIX=1 (you will need pcreposix installed, comes with
+the plugins Makefile and uncomment '#REGEXLIB = pcre' to
+'REGEXLIB = pcre' (you will need pcreposix installed, comes with
 libpcre from www.pcre.org, but it's already part of most distributions).
 
 See also C<epgsearch(4)> 'Description of the search process'.
diff --git a/po/fi_FI.po b/po/fi_FI.po
index f43dbfb..ce89afe 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
 "POT-Creation-Date: 2009-09-21 19:28+0200\n"
-"PO-Revision-Date: 2009-07-19 23:22+0200\n"
+"PO-Revision-Date: 2009-10-15 20:52+0200\n"
 "Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
@@ -495,7 +495,7 @@ msgid "Help$Set this to 'yes' if you want to get an email notification about the
 msgstr "Tällä asetuksella saat ilmoitukset automaattisesti lisätyistä hakuajastimista sähköpostiisi."
 
 msgid "Time between mails [h]"
-msgstr ""
+msgstr "Sähköpostin lähetysväli [h]"
 
 msgid ""
 "Help$Specifiy how much time in [h] you would\n"
@@ -503,6 +503,10 @@ msgid ""
 "With '0' you get a new mail after each\n"
 "search timer update with new results."
 msgstr ""
+"Vähimmäisväliaika tunteina sähköpostien\n"
+"lähetykselle. Mikäli 0, uusi sähköposti\n"
+"lähetetään aina hakuajastimen päivittyessä\n"
+"uusilla tuloksilla."
 
 msgid "Timer conflict notification"
 msgstr "Ilmoitukset päällekkäisistä ajastimista"
@@ -588,7 +592,7 @@ msgid "No timers were deleted."
 msgstr "Yhtään ajastinta ei poistettu."
 
 msgid "No new events to announce."
-msgstr ""
+msgstr "Ei uusia ilmoitettavia tapahtumia."
 
 msgid "This version of EPGSearch does not support this service!"
 msgstr "EPGSearch-laajennos ei tarjoa vaadittavaa palvelua!"
@@ -954,9 +958,8 @@ msgstr "Muokkaa hakua"
 msgid "Record"
 msgstr "Tallenna"
 
-#, fuzzy
 msgid "Announce by OSD"
-msgstr "muistutus"
+msgstr "muistutus kuvaruutunäytölle"
 
 msgid "Switch only"
 msgstr "kanavanvaihto"
@@ -964,9 +967,8 @@ msgstr "kanavanvaihto"
 msgid "Announce and switch"
 msgstr "muistutus ja kanavanvaihto"
 
-#, fuzzy
 msgid "Announce by mail"
-msgstr "muistutus"
+msgstr "muistutus sähköpostitse"
 
 msgid "Selection"
 msgstr "valittu"
@@ -1237,3 +1239,4 @@ msgstr "%02ldh"
 #, c-format
 msgid "in %02ldm"
 msgstr "%02ldm"
+