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

diff --git a/Makefile b/Makefile
index 3c79429d..1618ef5d 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.7 2002/10/22 02:22:18 hal9 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 
@@ -26,6 +26,24 @@
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # $Log: Makefile,v $
+# Revision 1.7  2002/10/22 02:22:18  hal9
+# Look for gmake first, and fall back to make. More Solaris trouble.
+#
+# Revision 1.6  2002/09/05 14:35:17  oes
+# Change make to gmake to fix auto-build on Solaris
+#
+# Revision 1.5  2002/04/11 12:51:34  oes
+# Bugfix
+#
+# Revision 1.4  2002/04/09 16:38:10  oes
+# Added option to run the whole build process
+#
+# Revision 1.3  2002/03/26 22:29:54  swa
+# we have a new homepage!
+#
+# Revision 1.2  2002/03/24 13:25:42  swa
+# name change related issues
+#
 # Revision 1.1  2001/12/01 11:24:29  jongfoster
 # Will display a warning if non-GNU make is used
 #
@@ -33,26 +51,54 @@
 
 #############################################################################
 
-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
-
-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
+# This script will first try to use the GNU make command, then the standard
+# make command, checking whether the command returns 'GNU' as part of its
+# version string. Amend this to point to your GNU make command if it is
+# not in your path.
+# Further tests; Solaris 'make' sets the HOST_ARCH variable, GNU  'make'
+# sets the MAKE_VERSION variable, so a test is made that the former is
+# non-zero and the latter is zero, if so we bail out with an error message.
+
+
+GNU_MAKE_CMD = gmake
+MAKE_CMD     = make
+
+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 directory?"; \
+	    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 ; \
+	 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!" ; \
+		   exit 1 ; \
+		fi ;\
+	    fi; \
+	 fi
 
 .PHONY: error
 
+
 #############################################################################
 
 ## Local Variables: