clean up linking -lpcre to libucw

diff --git a/ucw/Makefile b/ucw/Makefile
index 27a7ac8354abd4e40495e057fa6a653747b33f81..41ca1c3f9bbcbfe0b7474faaac606128293f41d2 100644 (file)
--- 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 e2e8e084ed9b14a3c355c361a67e08813fd658c2..5e6801fa7869b47aef8f613c74062bab5403c432 100644 (file)
--- 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}