You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@apr.apache.org by Joe Orton <jo...@manyfish.co.uk> on 2001/02/19 23:14:13 UTC

[PATCH] allow using GNU make on BSDi

Hi,

This copes with BSDi installations where the default make has been
replaced with GNU make:

--- configure.in	2001/02/18 15:52:12	1.228
+++ configure.in	2001/02/19 22:10:05
@@ -920,7 +920,13 @@
 dnl
 case "$host_alias" in
 *bsdi*)
-    INCLUDE_RULES=".include \"$apr_builders/rules.mk\""
+    # Check whether they've installed GNU make
+    if make --version > /dev/null 2>&1; then 
+	INCLUDE_RULES="include $apr_builders/rules.mk"
+    else
+	# BSDi make
+	INCLUDE_RULES=".include \"$apr_builders/rules.mk\""
+    fi
     ;;
 *)
     INCLUDE_RULES="include $apr_builders/rules.mk"

Re: [PATCH] allow using GNU make on BSDi

Posted by "Roy T. Fielding" <fi...@ebuilt.com>.
I think you need to use the special MAKE variable as defined by
the AC_PROG_MAKE_SET macro, but otherwise it looks fine.
The real test is to see if it works for Ben Laurie's machine.

....Roy

On Mon, Feb 19, 2001 at 06:01:44PM -0500, Jeff Trawick wrote:
> will this work for Apache without making anyone hurl?
> 
> Index: configure.in
> ===================================================================
> RCS file: /home/cvspublic/httpd-2.0/configure.in,v
> retrieving revision 1.123
> diff -u -r1.123 configure.in
> --- configure.in        2001/02/18 16:07:31     1.123
> +++ configure.in        2001/02/19 23:01:22
> @@ -274,7 +274,13 @@
>  BSD_MAKEFILE=no
>  case "$host_alias" in
>  *bsdi*)
> -    BSD_MAKEFILE=yes;;
> +    # Check whether they've installed GNU make
> +    if make --version > /dev/null 2>&1; then
> +        true
> +    else
> +        BSD_MAKEFILE=yes
> +    fi
> +    ;;
>  esac
>  
>  AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl,,[

Re: [PATCH] allow using GNU make on BSDi

Posted by Greg Stein <gs...@lyra.org>.
On Mon, Feb 19, 2001 at 06:01:44PM -0500, Jeff Trawick wrote:
> Joe Orton <jo...@manyfish.co.uk> writes:
> 
> > Hi,
> > 
> > This copes with BSDi installations where the default make has been
> > replaced with GNU make:
> 
> committed;
> 
> will this work for Apache without making anyone hurl?

I wouldn't worry about it right now. I believe Roy is intending to use the
APR(UTIL) scheme for BSD Makefile handling. That will obsolete the detection
stuff in Apache.

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/

Re: [PATCH] allow using GNU make on BSDi

Posted by Jeff Trawick <tr...@bellsouth.net>.
Joe Orton <jo...@manyfish.co.uk> writes:

> Hi,
> 
> This copes with BSDi installations where the default make has been
> replaced with GNU make:

committed;

will this work for Apache without making anyone hurl?

Index: configure.in
===================================================================
RCS file: /home/cvspublic/httpd-2.0/configure.in,v
retrieving revision 1.123
diff -u -r1.123 configure.in
--- configure.in        2001/02/18 16:07:31     1.123
+++ configure.in        2001/02/19 23:01:22
@@ -274,7 +274,13 @@
 BSD_MAKEFILE=no
 case "$host_alias" in
 *bsdi*)
-    BSD_MAKEFILE=yes;;
+    # Check whether they've installed GNU make
+    if make --version > /dev/null 2>&1; then
+        true
+    else
+        BSD_MAKEFILE=yes
+    fi
+    ;;
 esac
 
 AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl,,[

-- 
Jeff Trawick | trawickj@bellsouth.net | PGP public key at web site:
       http://www.geocities.com/SiliconValley/Park/9289/
             Born in Roswell... married an alien...