X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=Makefile;h=b353f447c5906282e34c11684a37d3a1d19934c3;hp=3c79429da6d8868363ebf98efe270512b9513bb6;hb=c79bcf8fae8bb73f7c5a61c387fcbb2db2690536;hpb=b3ee70e4ee07171ad5cc5050748d53db7228f232

diff --git a/Makefile b/Makefile
index 3c79429d..b353f447 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.1 2001/12/01 11:24:29 jongfoster Exp $
+# $Id: Makefile,v 1.11 2006/07/18 14:48:45 david__schmidt Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
-# Privoxy team.  http://ijbswa.sourceforge.net
+# Privoxy team. http://www.privoxy.org/
 #
 # Based on the Internet Junkbuster originally written
 # by and Copyright (C) 1997 Anonymous Coders and 
@@ -25,31 +25,50 @@
 # or write to the Free Software Foundation, Inc., 59
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-# $Log: Makefile,v $
-# Revision 1.1  2001/12/01 11:24:29  jongfoster
-# Will display a warning if non-GNU make is used
-#
-#
-
 #############################################################################
 
-error: GNUmakefile
-	@echo
-	@echo "ERROR!"
-	@echo "To build this program, you must run ./configure and then run GNU make."
-	@echo
-	@echo "You are not using the GNU version of Make - maybe it's called gmake"
-	@echo "or it's in a different directory?"
-	@echo
+GNU_MAKE_CMD = gmake
+MAKE_CMD     = make
 
-GNUmakefile:
-	@echo
-	@echo "ERROR!"
-	@echo "To build this program, you must run ./configure and then run GNU make."
-	@echo
-	@echo "You haven't run ./configure yet."
-	@echo
-	@false
+error:
+	@if [ -f GNUmakefile ]; then \
+	    echo "***"; \
+	    echo "*** You are not using the GNU version of Make - maybe it's called gmake"; \
+	    echo "*** or it's in a different PATH? Please read INSTALL." ; \
+	    echo "***"; \
+	    exit 1; \
+	 elif test -n "$(HOST_ARCH)"  && test -z "$(MAKE_VERSION)" ; then \
+	    echo "***"; \
+	    echo "*** You are not using GNU Make on Solaris, please make sure you do" ; \
+	    echo "*** and re-run 'make' "; \
+	    echo "***"; \
+	    exit 1 ; \
+	 elif test -n "$(MACHINE_ARCH)"  && test -z "$(MAKE_VERSION)" ; then \
+	    echo "***"; \
+	    echo "*** You are not using GNU Make on FreeBSD, please make sure you do" ; \
+	    echo "*** and re-run 'make' "; \
+	    echo "***"; \
+	    exit 1 ; \
+	 else \
+	    echo "***"; \
+	    echo "*** To build this program, you must run"; \
+	    echo "*** autoheader && autoconf && ./configure and then run GNU make."; \
+	    echo "***"; \
+	    echo -n "*** Shall I do this for you now? (y/n) "; \
+	    read answer; \
+	    if [ "$$answer" = "y" ]; then \
+		autoheader && autoconf && ./configure || exit 1; \
+	  	if $(GNU_MAKE_CMD) -v |grep GNU >/dev/null 2>/dev/null; then \
+		   $(GNU_MAKE_CMD) ;\
+		elif $(MAKE_CMD) -v |grep GNU >/dev/null 2>/dev/null; then \
+		   $(MAKE_CMD) ;\
+		else \
+		   echo "Neither 'make' nor 'gmake' are GNU compatible!" ; \
+		   echo "Please read INSTALL." ; \
+		   exit 1 ; \
+		fi ;\
+	    fi; \
+	 fi
 
 .PHONY: error