You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pq...@apache.org on 2006/07/16 00:05:02 UTC
svn commit: r422298 - in /httpd/httpd/trunk/support: ./ Makefile.in
Author: pquerna
Date: Sat Jul 15 15:05:02 2006
New Revision: 422298
URL: http://svn.apache.org/viewvc?rev=422298&view=rev
Log:
Makefile.in: Don't try to compile checkgid and fcgistarter on win32 when using the autotools build system.
/support: Update svn:ignore for generated exe files
Modified:
httpd/httpd/trunk/support/ (props changed)
httpd/httpd/trunk/support/Makefile.in
Propchange: httpd/httpd/trunk/support/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jul 15 15:05:02 2006
@@ -38,3 +38,4 @@
*.vcproj.*
httxt2dbm
fcgistarter
+*.exe
Modified: httpd/httpd/trunk/support/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/Makefile.in?rev=422298&r1=422297&r2=422298&view=diff
==============================================================================
--- httpd/httpd/trunk/support/Makefile.in (original)
+++ httpd/httpd/trunk/support/Makefile.in Sat Jul 15 15:05:02 2006
@@ -3,7 +3,12 @@
CLEAN_TARGETS = suexec
-PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm htcacheclean httxt2dbm fcgistarter
+PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm
+
+ifneq (win32,${OS})
+ PROGRAMS += checkgid fcgistarter
+endif
+
TARGETS = $(PROGRAMS)
PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
Re: svn commit: r422298 - in /httpd/httpd/trunk/support: ./ Makefile.in
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Joe Orton wrote:
> On Sun, Jul 16, 2006 at 12:22:32AM +0200, André Malo wrote:
>> * pquerna@apache.org wrote:
>>
>>> Modified: httpd/httpd/trunk/support/Makefile.in
>>> +ifneq (win32,${OS})
>>> + PROGRAMS += checkgid fcgistarter
>>> +endif
>>> +
>> I'm not a Makefile guru, but that doesn't look really portable (or do we
>> require a particular make version?). I'd think anyway, that such stuff
>> should be done by configure (but I've got not much fu there either...)
>
> It's not, ifneq is a GNU make extension; yes, it needs to be done in
> configure.
Aside from which, it seems silly (after a pass through configure) to make
deterministic choices like this at make time :)
Re: svn commit: r422298 - in /httpd/httpd/trunk/support: ./ Makefile.in
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
On 7/17/06, Paul Querna <ch...@force-elite.com> wrote:
> I have reverted the ifneq in r422925. Any suggestions on how to best go
> around making this configured from configure?
EXTRA_PROGRAMS=
case $host in
*mingw*)
;;
*)
EXTRA_PROGRAMS="fcgisupport blah blah blah"
;;
esac
AC_SUBST(EXTRA_PROGRAMS)
Makefile.in
PROGRAMS = ... httpd @EXTRA_PROGRAMS@
That's the 30-second off-the-top-of-my-head version. HTH. -- justin
Re: svn commit: r422298 - in /httpd/httpd/trunk/support: ./ Makefile.in
Posted by Paul Querna <ch...@force-elite.com>.
Joe Orton wrote:
> On Sun, Jul 16, 2006 at 12:22:32AM +0200, André Malo wrote:
>> * pquerna@apache.org wrote:
>>
>>> Modified: httpd/httpd/trunk/support/Makefile.in
>>> +ifneq (win32,${OS})
>>> + PROGRAMS += checkgid fcgistarter
>>> +endif
>>> +
>> I'm not a Makefile guru, but that doesn't look really portable (or do we
>> require a particular make version?). I'd think anyway, that such stuff
>> should be done by configure (but I've got not much fu there either...)
>
> It's not, ifneq is a GNU make extension; yes, it needs to be done in
> configure.
I have reverted the ifneq in r422925. Any suggestions on how to best go
around making this configured from configure?
Thanks,
-Paul
Re: svn commit: r422298 - in /httpd/httpd/trunk/support: ./ Makefile.in
Posted by Joe Orton <jo...@redhat.com>.
On Sun, Jul 16, 2006 at 12:22:32AM +0200, André Malo wrote:
> * pquerna@apache.org wrote:
>
> > Modified: httpd/httpd/trunk/support/Makefile.in
>
> > +ifneq (win32,${OS})
> > + PROGRAMS += checkgid fcgistarter
> > +endif
> > +
>
> I'm not a Makefile guru, but that doesn't look really portable (or do we
> require a particular make version?). I'd think anyway, that such stuff
> should be done by configure (but I've got not much fu there either...)
It's not, ifneq is a GNU make extension; yes, it needs to be done in
configure.
joe
Re: svn commit: r422298 - in /httpd/httpd/trunk/support: ./ Makefile.in
Posted by André Malo <nd...@perlig.de>.
* pquerna@apache.org wrote:
> Modified: httpd/httpd/trunk/support/Makefile.in
> +ifneq (win32,${OS})
> + PROGRAMS += checkgid fcgistarter
> +endif
> +
I'm not a Makefile guru, but that doesn't look really portable (or do we
require a particular make version?). I'd think anyway, that such stuff
should be done by configure (but I've got not much fu there either...)
nd
--
package Hacker::Perl::Another::Just;print
qq~@{[reverse split/::/ =>__PACKAGE__]}~;
# André Malo # http://www.perlig.de #