From 6173bd651a7dbcfecf9e55fbb9c3d4940a040c3b Mon Sep 17 00:00:00 2001
From: Robert Spalek <robert@ucw.cz>
Date: Thu, 27 Nov 2008 09:58:10 -0800
Subject: [PATCH] clean up linking -lpcre to libucw

---
 ucw/Makefile  | 6 ------
 ucw/libucw.pc | 8 +++++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ucw/Makefile b/ucw/Makefile
index 27a7ac83..41ca1c3f 100644
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -58,8 +58,6 @@ 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
@@ -70,10 +68,6 @@ 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 e2e8e084..5e6801fa 100644
--- a/ucw/libucw.pc
+++ b/ucw/libucw.pc
@@ -9,6 +9,12 @@ threads=-lpthread
 threads=
 #endif
 
+#ifdef CONFIG_PCRE
+regex=-lpcre
+#else
+regex=
+#endif
+
 perl_modules_dir=@INSTALL_PERL_DIR@
 perl_module_flags=-I${perl_modules_dir}
 build_system=@INSTALL_SHARE_DIR@/ucw/build
@@ -17,4 +23,4 @@ Name: libucw
 Description: A library of utility functions and data structures
 Version: @SHERLOCK_VERSION@
 Cflags: -I${incdir}
-Libs: -L${libdir} -lucw ${threads} @LIBUCW_LIBS@
+Libs: -L${libdir} -lucw ${threads} ${regex}
-- 
2.39.5