diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 2acca795e91f..c919f4092518 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -111,6 +111,8 @@ BROKEN= "apr is installed and may conflict with apache one\ . endif .endif +WITH_PTHREAD_LIBS?= ${PTHREAD_LIBS:S/-l//} + .include "${APACHEDIR}/Makefile.doc" .include "${APACHEDIR}/Makefile.modules" diff --git a/www/apache2/Makefile.modules b/www/apache2/Makefile.modules index 59eba703fe77..d172ac3e8175 100644 --- a/www/apache2/Makefile.modules +++ b/www/apache2/Makefile.modules @@ -172,6 +172,9 @@ _APACHE_MODULES+= ${LDAP_MODULES} .if defined(WITH_THREADS) CONFIGURE_ARGS+= --enable-threads CFLAGS+= -DFREEBSD_THREAD_HACK +. if defined(WITH_EXPERIMENTAL_THREADS) +CONFIGURE_ARGS+= ac_cv_pthreads_lib=${WITH_PTHREAD_LIBS} +. endif . if !defined(WITH_CUSTOM_THREADS) _APACHE_MODULES+= ${THREAD_MODULES} . else diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 2acca795e91f..c919f4092518 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -111,6 +111,8 @@ BROKEN= "apr is installed and may conflict with apache one\ . endif .endif +WITH_PTHREAD_LIBS?= ${PTHREAD_LIBS:S/-l//} + .include "${APACHEDIR}/Makefile.doc" .include "${APACHEDIR}/Makefile.modules" diff --git a/www/apache20/Makefile.modules b/www/apache20/Makefile.modules index 59eba703fe77..d172ac3e8175 100644 --- a/www/apache20/Makefile.modules +++ b/www/apache20/Makefile.modules @@ -172,6 +172,9 @@ _APACHE_MODULES+= ${LDAP_MODULES} .if defined(WITH_THREADS) CONFIGURE_ARGS+= --enable-threads CFLAGS+= -DFREEBSD_THREAD_HACK +. if defined(WITH_EXPERIMENTAL_THREADS) +CONFIGURE_ARGS+= ac_cv_pthreads_lib=${WITH_PTHREAD_LIBS} +. endif . if !defined(WITH_CUSTOM_THREADS) _APACHE_MODULES+= ${THREAD_MODULES} . else