You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bo...@apache.org on 2009/02/24 04:24:57 UTC
svn commit: r747266 - in /apr/apr/branches/1.3.x: ./ CHANGES build/
buildconf configure.in
Author: bojan
Date: Tue Feb 24 03:24:54 2009
New Revision: 747266
URL: http://svn.apache.org/viewvc?rev=747266&view=rev
Log:
Backport r733052 from the trunk.
Fix buildconf with libtool 2.2:
* buildconf: Use a different Extremely Ugly Hack to extract and copy
the list of .m4 files needed directly from libtoolize.
* configure.in: Include more files which might be needed by libtool.
* build/: Ignore more.
Modified:
apr/apr/branches/1.3.x/ (props changed)
apr/apr/branches/1.3.x/CHANGES
apr/apr/branches/1.3.x/build/ (props changed)
apr/apr/branches/1.3.x/buildconf
apr/apr/branches/1.3.x/configure.in
Propchange: apr/apr/branches/1.3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 03:24:54 2009
@@ -1 +1 @@
-/apr/apr/trunk:712674
+/apr/apr/trunk:712674,733052
Modified: apr/apr/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/CHANGES?rev=747266&r1=747265&r2=747266&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.3.x/CHANGES [utf-8] Tue Feb 24 03:24:54 2009
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes for APR 1.3.4
+ *) Fix buildconf with libtool 2.2. [Joe Orton]
+
*) Fix a bug with the APR_DELONCLOSE flag. Child processes were (also)
unlinking the file. [Greg Stein]
Propchange: apr/apr/branches/1.3.x/build/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Feb 24 03:24:54 2009
@@ -1,6 +1,5 @@
Makefile
libtool.m4
-ltsugar.m4
ltconfig
ltmain.sh
ltcf-c.sh
@@ -15,3 +14,5 @@
*.plg
*.dep
*.mak
+lt*.m4
+argz.m4
Modified: apr/apr/branches/1.3.x/buildconf
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/buildconf?rev=747266&r1=747265&r2=747266&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/buildconf (original)
+++ apr/apr/branches/1.3.x/buildconf Tue Feb 24 03:24:54 2009
@@ -45,6 +45,14 @@
if [ -f libtool.m4 ]; then
ltfile=`pwd`/libtool.m4
+elif grep all_pkgmacro_files $libtoolize > /dev/null; then
+ # libtool 2.x
+ aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize`
+ ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize`
+ for f in $ltfiles; do
+ test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" build
+ done
+ ltfile=$aclocal_dir/libtool.m4
else
ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
< $libtoolize`"
Modified: apr/apr/branches/1.3.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/configure.in?rev=747266&r1=747265&r2=747266&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/configure.in (original)
+++ apr/apr/branches/1.3.x/configure.in Tue Feb 24 03:24:54 2009
@@ -20,6 +20,10 @@
sinclude(build/apr_hints.m4)
sinclude(build/libtool.m4)
sinclude(build/ltsugar.m4)
+sinclude(build/argz.m4)
+sinclude(build/ltoptions.m4)
+sinclude(build/ltversion.m4)
+sinclude(build/lt~obsolete.m4)
dnl Hard-coded inclusion at the tail end of apr_private.h:
AH_BOTTOM([
Re: svn commit: r747266 - in /apr/apr/branches/1.3.x: ./ CHANGES
build/ buildconf configure.in
Posted by Bojan Smojver <bo...@rexursive.com>.
On Tue, 2009-02-24 at 15:57 +1100, Bojan Smojver wrote:
> I'll check before the release.
argz.m4:
----------------------------
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
----------------------------
ltoptions.m4:
----------------------------
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
----------------------------
ltversion.m4:
----------------------------
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
----------------------------
lt~obsolete.m4:
----------------------------
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
----------------------------
So, I think we should be good.
--
Bojan
Re: svn commit: r747266 - in /apr/apr/branches/1.3.x: ./ CHANGES
build/ buildconf configure.in
Posted by Bojan Smojver <bo...@rexursive.com>.
On Mon, 2009-02-23 at 22:14 -0600, William A. Rowe, Jr. wrote:
> But did you check what
> this step now absorbs into the finished package?
No, not really. I'll check before the release. In the meantime, it's in
SVN, which should be OK.
Not sure if this may be relevant:
http://www.gnu.org/software/autoconf/manual/autoconf.html#Distributing
PS. This same revision was backported to 1.4.x as well by Jim. So, if we
release 1.4.x before 1.3.x, same thing applies.
PPS. Is this what we are looking for (example from ltmain.sh distributed
with apr-1.3.3):
-----------------------
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-----------------------
--
Bojan
Re: svn commit: r747266 - in /apr/apr/branches/1.3.x: ./ CHANGES
build/ buildconf configure.in
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Bojan Smojver wrote:
> On Mon, 2009-02-23 at 21:47 -0600, William A. Rowe, Jr. wrote:
>
>> stupid question, but did you validate the licensing implications of
>> this particular commit?
>
> Not sure what you mean. Is our trunk licensed differently than 1.3.x?
No, but I'm just checking; this step absorbs local files... ergo
the finished bundle doesn't resemble svn. Trunk is svn. We tolerate
transitory GPL licenses in our build process. But did you check what
this step now absorbs into the finished package?
Re: svn commit: r747266 - in /apr/apr/branches/1.3.x: ./ CHANGES
build/ buildconf configure.in
Posted by Bojan Smojver <bo...@rexursive.com>.
On Mon, 2009-02-23 at 21:47 -0600, William A. Rowe, Jr. wrote:
> stupid question, but did you validate the licensing implications of
> this particular commit?
Not sure what you mean. Is our trunk licensed differently than 1.3.x?
--
Bojan
Re: svn commit: r747266 - in /apr/apr/branches/1.3.x: ./ CHANGES
build/ buildconf configure.in
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
bojan@apache.org wrote:
> Author: bojan
> Date: Tue Feb 24 03:24:54 2009
> New Revision: 747266
>
> URL: http://svn.apache.org/viewvc?rev=747266&view=rev
> Log:
> Backport r733052 from the trunk.
> Fix buildconf with libtool 2.2:
>
> * buildconf: Use a different Extremely Ugly Hack to extract and copy
> the list of .m4 files needed directly from libtoolize.
>
> * configure.in: Include more files which might be needed by libtool.
stupid question, but did you validate the licensing implications of
this particular commit?