34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
|
diff --git a/Makefile.in b/Makefile.in
|
||
|
|
index ea8366e..06b8c5a 100644
|
||
|
|
--- a/Makefile.in
|
||
|
|
+++ b/Makefile.in
|
||
|
|
@@ -4,7 +4,7 @@ CLEAN_SUBDIRS = test
|
||
|
|
|
||
|
|
PROGRAM_NAME = $(progname)
|
||
|
|
PROGRAM_SOURCES = modules.c
|
||
|
|
-PROGRAM_LDADD = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
|
||
|
|
+PROGRAM_LDADD = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(HTTPD_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
|
||
|
|
PROGRAM_PRELINK = $(COMPILE) -c $(top_srcdir)/server/buildmark.c
|
||
|
|
PROGRAM_DEPENDENCIES = \
|
||
|
|
server/libmain.la \
|
||
|
|
diff --git a/configure.in b/configure.in
|
||
|
|
index f276550..a63eada 100644
|
||
|
|
--- a/configure.in
|
||
|
|
+++ b/configure.in
|
||
|
|
@@ -234,6 +234,7 @@ if test "$PCRE_CONFIG" != "false"; then
|
||
|
|
AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG])
|
||
|
|
APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`])
|
||
|
|
APR_ADDTO(PCRE_LIBS, [`$PCRE_CONFIG --libs`])
|
||
|
|
+ APR_ADDTO(HTTPD_LIBS, [\$(PCRE_LIBS)])
|
||
|
|
else
|
||
|
|
AC_MSG_ERROR([pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/])
|
||
|
|
fi
|
||
|
|
@@ -679,6 +682,7 @@ APACHE_SUBST(OS_DIR)
|
||
|
|
APACHE_SUBST(BUILTIN_LIBS)
|
||
|
|
APACHE_SUBST(SHLIBPATH_VAR)
|
||
|
|
APACHE_SUBST(OS_SPECIFIC_VARS)
|
||
|
|
+APACHE_SUBST(HTTPD_LIBS)
|
||
|
|
|
||
|
|
PRE_SHARED_CMDS='echo ""'
|
||
|
|
POST_SHARED_CMDS='echo ""'
|