You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2009/01/03 14:37:05 UTC
svn commit: r730984 - /httpd/httpd/trunk/configure.in
Author: rjung
Date: Sat Jan 3 05:37:05 2009
New Revision: 730984
URL: http://svn.apache.org/viewvc?rev=730984&view=rev
Log:
Fix correct linking against PCRE.
r730882 broke builds on MacOSX.
Now we put the PCRE libs into a new variable PCRE_LIBS
and add it to HTTPD_LDFLAGS.
That way the detected libs for PCRE could be reused in
other parts of the build system if necessary.
Side effect: I had to change the handling of HTTPD_FLAGS on
AIX and OS390 from hard setting of teh variable to using
APR_ADDTO(). I hope that macro works on those platforms.
Modified:
httpd/httpd/trunk/configure.in
Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=730984&r1=730983&r2=730984&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Sat Jan 3 05:37:05 2009
@@ -182,11 +182,14 @@
fi
AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG])
APR_ADDTO(CFLAGS, [`$PCRE_CONFIG --cflags`])
- APR_ADDTO(LTLIBRARY_LIBADD, [`$PCRE_CONFIG --libs`])
- APACHE_SUBST(LTLIBRARY_LIBADD)
+ APR_ADDTO(PCRE_LIBS, [`$PCRE_CONFIG --libs`])
else
AC_MSG_ERROR([pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/])
fi
+APACHE_SUBST(PCRE_LIBS)
+
+dnl Add PCRE_LIBS to HTTPD_LDFLAGS
+APR_ADDTO(HTTPD_LDFLAGS, [\$(PCRE_LIBS)])
echo $ac_n "${nl}Configuring Apache httpd ...${nl}"
@@ -568,9 +571,9 @@
if test "$enable_so" = "yes"; then
case $host in
*-ibm-aix*)
- HTTPD_LDFLAGS="$HTTPD_LDFLAGS -Wl,-uXML_Parse -Wl,-bE:$abs_builddir/server/httpd.exp"
- SH_LDFLAGS="$SH_LDFLAGS \$(EXTRA_LDFLAGS) \$(EXTRA_LIBS)"
- UTIL_LDFLAGS="$UTIL_LDFLAGS -Wl,-uXML_Parse"
+ APR_ADDTO(HTTPD_LDFLAGS, [-Wl,-uXML_Parse -Wl,-bE:$abs_builddir/server/httpd.exp])
+ APR_ADDTO(SH_LDFLAGS, [\$(EXTRA_LDFLAGS) \$(EXTRA_LIBS)])
+ APR_ADDTO(UTIL_LDFLAGS, [-Wl,-uXML_Parse])
;;
*beos)
SH_LDFLAGS='$(top_builddir)/_APP_'
@@ -578,8 +581,8 @@
POST_SHARED_CMDS='rm $(top_builddir)/_APP_'
;;
*os390)
- HTTPD_LDFLAGS="$HTTPD_LDFLAGS --main=$abs_srcdir/server/main.o --core-dll=$abs_srcdir/apachecore.dll"
- SH_LDFLAGS="$SH_LDFLAGS --core-dll=$abs_srcdir/apachecore.dll"
+ APR_ADDTO(HTTPD_LDFLAGS, [--main=$abs_srcdir/server/main.o --core-dll=$abs_srcdir/apachecore.dll])
+ APR_ADDTO(SH_LDFLAGS, [--core-dll=$abs_srcdir/apachecore.dll])
esac
MOD_SO_ENABLED=yes
fi
Re: svn commit: r730984 - /httpd/httpd/trunk/configure.in
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
On Sat, Jan 3, 2009 at 5:37 AM, <rj...@apache.org> wrote:
> Author: rjung
> Date: Sat Jan 3 05:37:05 2009
> New Revision: 730984
>
> URL: http://svn.apache.org/viewvc?rev=730984&view=rev
> Log:
> Fix correct linking against PCRE.
> r730882 broke builds on MacOSX.
Works fine now on Mac OS X w/jlibtool. Thanks. -- justin