You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Joe Orton <jo...@redhat.com> on 2005/05/19 17:02:26 UTC
Re: svn commit: r170920 - /httpd/httpd/trunk/Makefile.in
On Thu, May 19, 2005 at 12:38:58PM -0000, Jean-Frederic Clere wrote:
> Author: jfclere
> Date: Thu May 19 05:38:57 2005
> New Revision: 170920
>
> URL: http://svn.apache.org/viewcvs?rev=170920&view=rev
> Log:
> Fix 32787 and the problems I have when using
> --enable-experimental-libtool. (libtool is
> an excutable in this case).
This is going to break the more common in-tree-apr build, right?
APR_CONFIG will refer to the apr-config script in the *build* tree at
this point, and hence will report the location of the libtool script in
the build tree. Which exactly defeats the point of that line in the
Makefile. Something more complex is needed, methinks...
>
> Modified:
> httpd/httpd/trunk/Makefile.in
>
> Modified: httpd/httpd/trunk/Makefile.in
> URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/Makefile.in?rev=170920&r1=170919&r2=170920&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/Makefile.in (original)
> +++ httpd/httpd/trunk/Makefile.in Thu May 19 05:38:57 2005
> @@ -95,7 +95,7 @@
> @test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir)
> @cp $(top_srcdir)/build/*.mk $(DESTDIR)$(installbuilddir); \
> cp build/*.mk $(DESTDIR)$(installbuilddir); \
> - sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
> + sed "/^LIBTOOL/s#/[^ ]*/libtool \(.*\)#`$(APR_CONFIG) --apr-libtool` $(LTFLAGS)#" \
> build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk; \
> cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); \
> cp $(top_builddir)/config.nice $(DESTDIR)$(installbuilddir);
>
Re: svn commit: r170920 - /httpd/httpd/trunk/Makefile.in
Posted by Joe Orton <jo...@redhat.com>.
On Thu, May 19, 2005 at 07:56:46PM -0700, Bill Barker wrote:
> "Joe Orton" <jo...@redhat.com> wrote in message
> news:20050519150226.GA22013@redhat.com...
> > On Thu, May 19, 2005 at 12:38:58PM -0000, Jean-Frederic Clere wrote:
> >> Author: jfclere
> >> Date: Thu May 19 05:38:57 2005
> >> New Revision: 170920
> >>
> >> URL: http://svn.apache.org/viewcvs?rev=170920&view=rev
> >> Log:
> >> Fix 32787 and the problems I have when using
> >> --enable-experimental-libtool. (libtool is
> >> an excutable in this case).
> >
> > This is going to break the more common in-tree-apr build, right?
> > APR_CONFIG will refer to the apr-config script in the *build* tree at
> > this point, and hence will report the location of the libtool script in
> > the build tree. Which exactly defeats the point of that line in the
> > Makefile. Something more complex is needed, methinks...
>
> Nope. 'make install' in src/apr has already fixed it up by the time the
> make gets to here.
Ah, I forgot that APR_CONFIG does always point to the *installed*
apr-config script rather than the one in the build tree. And
fortunately it's arranged that "make install" has run in srclib/apr
*before* install-build runs, so this does seem to work. Nice...
joe
Re: svn commit: r170920 - /httpd/httpd/trunk/Makefile.in
Posted by Bill Barker <wb...@wilshire.com>.
"Joe Orton" <jo...@redhat.com> wrote in message
news:20050519150226.GA22013@redhat.com...
> On Thu, May 19, 2005 at 12:38:58PM -0000, Jean-Frederic Clere wrote:
>> Author: jfclere
>> Date: Thu May 19 05:38:57 2005
>> New Revision: 170920
>>
>> URL: http://svn.apache.org/viewcvs?rev=170920&view=rev
>> Log:
>> Fix 32787 and the problems I have when using
>> --enable-experimental-libtool. (libtool is
>> an excutable in this case).
>
> This is going to break the more common in-tree-apr build, right?
> APR_CONFIG will refer to the apr-config script in the *build* tree at
> this point, and hence will report the location of the libtool script in
> the build tree. Which exactly defeats the point of that line in the
> Makefile. Something more complex is needed, methinks...
>
Nope. 'make install' in src/apr has already fixed it up by the time the
make gets to here.
>>
>> Modified:
>> httpd/httpd/trunk/Makefile.in
>>
>> Modified: httpd/httpd/trunk/Makefile.in
>> URL:
>> http://svn.apache.org/viewcvs/httpd/httpd/trunk/Makefile.in?rev=170920&r1=170919&r2=170920&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/Makefile.in (original)
>> +++ httpd/httpd/trunk/Makefile.in Thu May 19 05:38:57 2005
>> @@ -95,7 +95,7 @@
>> @test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS)
>> $(DESTDIR)$(installbuilddir)
>> @cp $(top_srcdir)/build/*.mk $(DESTDIR)$(installbuilddir); \
>> cp build/*.mk $(DESTDIR)$(installbuilddir); \
>> - sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool
>> $(LTFLAGS)#' \
>> + sed "/^LIBTOOL/s#/[^ ]*/libtool \(.*\)#`$(APR_CONFIG) --apr-libtool`
>> $(LTFLAGS)#" \
>> build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk;
>> \
>> cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); \
>> cp $(top_builddir)/config.nice $(DESTDIR)$(installbuilddir);
>>
>