From 4cea6c405bcf56c67be7d1d680c4686a4411f3ae Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Fri, 16 Oct 2009 18:30:18 +0200 Subject: ensure only one regex lib is used and finnish translation update --- Makefile | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'Makefile') 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 -- cgit v1.2.3