You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2004/11/20 14:17:18 UTC
svn commit: r105961 - apr/apr-util/trunk
Author: jorton
Date: Sat Nov 20 05:17:18 2004
New Revision: 105961
Modified:
apr/apr-util/trunk/CHANGES
apr/apr-util/trunk/Makefile.in
apr/apr-util/trunk/configure.in
Log:
Link libaprutil against the libraries on which it depends (dropping
support for libtool 1.3):
* configure.in: Remove EXTRA_OS_LINK export.
* Makefile.in: Link target against APRUTIL_LIBS.
PR: 11122
Modified: apr/apr-util/trunk/CHANGES
==============================================================================
--- apr/apr-util/trunk/CHANGES (original)
+++ apr/apr-util/trunk/CHANGES Sat Nov 20 05:17:18 2004
@@ -1,5 +1,8 @@
Changes with APR-util 1.1.0
+ *) Link libaprutil against the libraries on which it depends.
+ PR 11122. [Joe Orton]
+
*) Add apr_brigade_insert_file() function, to safely insert a file
into a brigade, regardless of size. [Joe Orton]
Modified: apr/apr-util/trunk/Makefile.in
==============================================================================
--- apr/apr-util/trunk/Makefile.in (original)
+++ apr/apr-util/trunk/Makefile.in Sat Nov 20 05:17:18 2004
@@ -17,7 +17,6 @@
TARGET_LIB = lib@APRUTIL_LIBNAME@.la
INSTALL_SUBDIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
EXTRA_SOURCE_DIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
-EXTRA_OS_LINK=@EXTRA_OS_LINK@
APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION).pc
APU_CONFIG = apu-$(APRUTIL_MAJOR_VERSION)-config
INSTALL = @INSTALL@
@@ -68,7 +67,7 @@
$(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG)
$(TARGET_LIB): $(OBJECTS)
- $(LINK) @lib_target@ $(ALL_LIBS) $(EXTRA_OS_LINK)
+ $(LINK) @lib_target@ $(ALL_LIBS) $(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)
exports.c: $(HEADERS)
$(APR_MKEXPORT) $(HEADERS) > $@
Modified: apr/apr-util/trunk/configure.in
==============================================================================
--- apr/apr-util/trunk/configure.in (original)
+++ apr/apr-util/trunk/configure.in Sat Nov 20 05:17:18 2004
@@ -143,25 +143,6 @@
APRUTIL_LIBNAME="aprutil${libsuffix}"
AC_SUBST(APRUTIL_LIBNAME)
-EXTRA_OS_LINK=""
-host_alias=`uname -s`
-case "$host_alias" in
- dnl ### BeOS requires that ALL symbols resolve at LINK time!
- dnl ###
- dnl ### So, if we're building on BeOS then we need to add in the
- dnl ### apr and expat libraries to the build or it'll die a truly horrible
- dnl ### death. We now use the apr-config tool to determine the correct
- dnl ### library to link against :)
-*AIX*|*Darwin*|*BeOS*)
- dnl need such stuff as -liconv to be specified when building libaprutil.la
- EXTRA_OS_LINK='$(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)'
- ;;
-*)
- ;;
-esac
-
-AC_SUBST(EXTRA_OS_LINK)
-
dnl
dnl Prep all the flags and stuff for compilation and export to other builds
dnl
Re: svn commit: r105961 - apr/apr-util/trunk
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
At 07:41 AM 11/21/2004, Max Bowsher wrote:
>>Author: jorton
>>Date: Sat Nov 20 05:17:18 2004
>>New Revision: 105961
>>Modified:
>> apr/apr-util/trunk/CHANGES
>> apr/apr-util/trunk/Makefile.in
>> apr/apr-util/trunk/configure.in
>>Log:
>>Link libaprutil against the libraries on which it depends (dropping
>>support for libtool 1.3):
>>* configure.in: Remove EXTRA_OS_LINK export.
>>* Makefile.in: Link target against APRUTIL_LIBS.
>>PR: 11122
>
>Could this be backported to 0.9.x, please?
Most unlikely, as we supported libtool 1.3 throughout apr 0.9.
More likely, we add a disclaimer with 1.x.x releases proclaiming
'you must use libtool 1.4'. I don't believe 1.x.x has been around
long enough for this to affect end users. (Developers, yes, but
I don't worry nearly as much about them.)
Offer up a patch that doesn't break libtool 1.3 and I'd review.
Bill
Re: svn commit: r105961 - apr/apr-util/trunk
Posted by Max Bowsher <ma...@ukf.net>.
> Author: jorton
> Date: Sat Nov 20 05:17:18 2004
> New Revision: 105961
>
> Modified:
> apr/apr-util/trunk/CHANGES
> apr/apr-util/trunk/Makefile.in
> apr/apr-util/trunk/configure.in
> Log:
> Link libaprutil against the libraries on which it depends (dropping
> support for libtool 1.3):
>
> * configure.in: Remove EXTRA_OS_LINK export.
>
> * Makefile.in: Link target against APRUTIL_LIBS.
>
> PR: 11122
Could this be backported to 0.9.x, please?
Thanks,
Max.