Skip to content

Commit 0757a9f

Browse files
committed
Added -R option to libtool with pcre lib path
1 parent 3bca8d4 commit 0757a9f

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

apache2/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ mod_security2_la_LDFLAGS = -module -avoid-version \
4343
endif
4444

4545
if LINUX
46-
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
46+
mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version -R @PCRE_LD_PATH@ \
4747
@APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
4848
@PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
4949
endif

build/find_pcre.m4

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ PCRE_CPPFLAGS=""
1010
PCRE_CFLAGS=""
1111
PCRE_LDFLAGS=""
1212
PCRE_LDADD=""
13+
PCRE_LD_PATH=""
1314

1415
AC_DEFUN([CHECK_PCRE],
1516
[dnl
@@ -65,6 +66,8 @@ if test -n "${pcre_path}"; then
6566
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(pcre CFLAGS: $PCRE_CFLAGS); fi
6667
PCRE_LDADD="`${PCRE_CONFIG} --libs`"
6768
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(pcre LDADD: $PCRE_LDADD); fi
69+
PCRE_LD_PATH="/`${PCRE_CONFIG} --libs | cut -d"/" -f2,3,4,5,6 | cut -d " " -f1`"
70+
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(pcre PCRE_LD_PATH: $PCRE_LD_PATH); fi
6871
else
6972
AC_MSG_RESULT([no])
7073
fi
@@ -75,6 +78,7 @@ AC_SUBST(PCRE_CPPFLAGS)
7578
AC_SUBST(PCRE_CFLAGS)
7679
AC_SUBST(PCRE_LDFLAGS)
7780
AC_SUBST(PCRE_LDADD)
81+
AC_SUBST(PCRE_LD_PATH)
7882
7983
if test -z "${PCRE_VERSION}"; then
8084
AC_MSG_NOTICE([*** pcre library not found.])

0 commit comments

Comments
 (0)