*** /scratch/evo-src/Makefile.orig	2007-10-03 00:23:39.000000000 +0200
--- Makefile	2007-10-25 19:00:20.000000000 +0200
***************
*** 58,66 ****
--- 58,81 ----
  # Comment this out if you don't want to use ccache
  CCACHE :=	ccache
  
+ # Set this to "true" if you have to build without root priviliges.
+ # Beware that file locking of a local mailbox file may be affected!
+ # Installing without root priviliges is not recommended if you
+ # get email from a local file.
+ # SUDO := true
+ SUDO :=		sudo
+ 
  # Set this to empty if you want to see the rules being run
  V :=		@
  
+ # Optional packages which are not to be built, e.g.:
+ # IGNORE_PACKAGES := evolution-exchange evolution-webcal
+ IGNORE_PACKAGES :=
+ 
+ # Optional features which are not to be enabled, e.g.:
+ # IGNORE_FEATURES := --enable-exchange=yes
+ IGNORE_FEATURES :=
+ 
  # You can override the above by creating local.mk setting these vars
  # if you don't want to modify this makefile.
  
***************
*** 76,92 ****
  # These are the prerequisite packages needed on the system before we can build
  # Evo.  There are different ways to check for them, based on distro.
  
! DISTROS :=	ubuntu
  ubuntu-PREREQS := \
  		gtk-doc-tools subversion libldap2-dev libnss-dev libnspr-dev \
  		libgail-dev flex bison build-essential evolution-dev \
  		icon-naming-utils $(CCACHE)
  
  # These are the packages we need to build from SVN, and any config/make/etc.
  # customized options we need to provide.
  
! PACKAGES :=	libsoup gtkhtml gnome-icon-theme evolution-data-server \
! 		evolution evolution-exchange evolution-webcal
  
  CONFIG_VARS =	CC='$(CC)' CFLAGS=-g
  CONFIG_OPTS =	--prefix='$(prefix)'
--- 91,114 ----
  # These are the prerequisite packages needed on the system before we can build
  # Evo.  There are different ways to check for them, based on distro.
  
! DISTROS :=	ubuntu debian-etch
  ubuntu-PREREQS := \
  		gtk-doc-tools subversion libldap2-dev libnss-dev libnspr-dev \
  		libgail-dev flex bison build-essential evolution-dev \
  		icon-naming-utils $(CCACHE)
  
+ debian-etch-PREREQS := \
+ 		gtk-doc-tools subversion libldap2-dev libnss3-dev libnspr4-dev \
+ 		libgail-dev flex bison build-essential evolution-dev \
+ 		icon-naming-utils gnome-doc-utils \
+ 		$(CCACHE)
+ 
  # These are the packages we need to build from SVN, and any config/make/etc.
  # customized options we need to provide.
  
! PACKAGES := $(filter-out $(IGNORE_PACKAGES), \
! 		libsoup gtkhtml gnome-icon-theme evolution-data-server \
! 		evolution evolution-exchange evolution-webcal )
  
  CONFIG_VARS =	CC='$(CC)' CFLAGS=-g
  CONFIG_OPTS =	--prefix='$(prefix)'
***************
*** 96,102 ****
  INSTALL_OPTS =
  
  CCACHE_DIR :=	$(CURDIR)/ccache
! PKG_CONFIG_PATH := $(prefix)/lib/pkgconfig:$(prefix)/share/pkgconfig
  export CCACHE_DIR PKG_CONFIG_PATH
  
  # ----- Per-package configuration and build options
--- 118,124 ----
  INSTALL_OPTS =
  
  CCACHE_DIR :=	$(CURDIR)/ccache
! PKG_CONFIG_PATH := $(prefix)/lib/pkgconfig:$(prefix)/share/pkgconfig:$(PKG_CONFIG_PATH)
  export CCACHE_DIR PKG_CONFIG_PATH
  
  # ----- Per-package configuration and build options
***************
*** 151,157 ****
  MKDIR :=	mkdir -p
  RM :=		rm -f
  RMDIR :=	rm -rf
- SUDO :=		sudo
  SVN :=		svn
  TOUCH :=	touch
  UNPACK :=	tar xjf
--- 173,178 ----
***************
*** 255,261 ****
  $(STAMPDIR)/%.config: $(STAMPDIR)/%.patch
  	$V cd '$*' \
  		&& $(CONFIG_VARS) $($*_CONFIG_VARS) \
! 			./autogen.sh $(CONFIG_OPTS) $($*_CONFIG_OPTS)
  	@ $(MKSTAMP)
  
  # ----- patch SVN workspaces
--- 276,284 ----
  $(STAMPDIR)/%.config: $(STAMPDIR)/%.patch
  	$V cd '$*' \
  		&& $(CONFIG_VARS) $($*_CONFIG_VARS) \
! 			./autogen.sh \
! 				$(filter-out $(IGNORE_FEATURES), \
! 					$(CONFIG_OPTS) $($*_CONFIG_OPTS))
  	@ $(MKSTAMP)
  
  # ----- patch SVN workspaces
***************
*** 341,347 ****
  
  # This is for DPKG systems.  Someone else will have to write the
  # equivalent RPM code.
! .PHONY: check-prereqs- check-prereqs-ubuntu
  check-prereqs-:
  	@$(ECHO) "Cannot verify system package prerequisites."; \
  	 $(ECHO) "I'm trying to build anyway..."; \
--- 364,370 ----
  
  # This is for DPKG systems.  Someone else will have to write the
  # equivalent RPM code.
! .PHONY: check-prereqs- check-prereqs-ubuntu check-prereqs-debian-etch
  check-prereqs-:
  	@$(ECHO) "Cannot verify system package prerequisites."; \
  	 $(ECHO) "I'm trying to build anyway..."; \
***************
*** 353,363 ****
  	 $(ECHO) "Or to force a build, set 'distro' empty in the makefile."; \
  	 exit 1
  
! check-prereqs-ubuntu:
  	@log="/tmp/evo-chk-prereqs.$$$$" \
  	  && $(RM) "$$log" \
  	  && $(TOUCH) "$$log" \
! 	  && $(DPKG) -l $(sort $(ubuntu-PREREQS)) \
  		| while read s n rest; do \
  		    case $$s in \
  			ii) echo "$$n" >> "$$log" ;; \
--- 376,386 ----
  	 $(ECHO) "Or to force a build, set 'distro' empty in the makefile."; \
  	 exit 1
  
! check-prereqs-ubuntu check-prereqs-debian-etch: check-prereqs-%:
  	@log="/tmp/evo-chk-prereqs.$$$$" \
  	  && $(RM) "$$log" \
  	  && $(TOUCH) "$$log" \
! 	  && $(DPKG) -l $(sort $($*-PREREQS)) \
  		| while read s n rest; do \
  		    case $$s in \
  			ii) echo "$$n" >> "$$log" ;; \
***************
*** 367,373 ****
  		  done; \
  	num=`wc -l < "$$log"`; \
  	$(RM) "$$log"; \
! 	if [ "$$num" != "$(words $(sort $(ubuntu-PREREQS)))" ]; then \
  	    $(ECHO); \
  	    $(ECHO) "Not all prerequisites are installed!"; \
  	    $(ECHO) "Use 'aptitude install ...' on the above missing packages."; \
--- 390,396 ----
  		  done; \
  	num=`wc -l < "$$log"`; \
  	$(RM) "$$log"; \
! 	if [ "$$num" != "$(words $(sort $($*-PREREQS)))" ]; then \
  	    $(ECHO); \
  	    $(ECHO) "Not all prerequisites are installed!"; \
  	    $(ECHO) "Use 'aptitude install ...' on the above missing packages."; \