From e2eac235f4864fd3e4eb8fbd92aad44a267b6ba5 Mon Sep 17 00:00:00 2001 From: Robert Spalek Date: Thu, 27 Nov 2008 07:39:50 -0800 Subject: [PATCH] allow libucw to depend on other libraries I need it when CONFIG_PCRE is enabled. After the internal copy of a reliable regexp library has been deleted from Sherlock source codes, I cannot compile Sherlock on Darwin with the default libraries. Therefore I have installed pcre, but it isn't automatically linked to everything yet. --- ucw/Makefile | 6 ++++++ ucw/libucw.pc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ucw/Makefile b/ucw/Makefile index 41ca1c3f..27a7ac83 100644 --- a/ucw/Makefile +++ b/ucw/Makefile @@ -58,6 +58,8 @@ LIBUCW_MAIN_INCLUDES= \ kmp.h kmp-search.h binsearch.h \ partmap.h +export LIBUCW_LIBS= + ifdef CONFIG_UCW_THREADS # Some modules require threading LIBUCW_MODS+=threads-conf workqueue asio fb-direct @@ -68,6 +70,10 @@ ifdef CONFIG_OWN_GETOPT include $(s)/ucw/getopt/Makefile endif +ifdef CONFIG_PCRE +LIBUCW_LIBS+=-lpcre +endif + LIBUCW_INCLUDES=$(LIBUCW_MAIN_INCLUDES) include $(s)/ucw/sorter/Makefile diff --git a/ucw/libucw.pc b/ucw/libucw.pc index d96850d7..e2e8e084 100644 --- a/ucw/libucw.pc +++ b/ucw/libucw.pc @@ -17,4 +17,4 @@ Name: libucw Description: A library of utility functions and data structures Version: @SHERLOCK_VERSION@ Cflags: -I${incdir} -Libs: -L${libdir} -lucw ${threads} +Libs: -L${libdir} -lucw ${threads} @LIBUCW_LIBS@ -- 2.39.2