passenger 4.0.20 → 4.0.21

data/ext/common/agents/LoggingAgent/RemoteSender.h

@@ -255,7 +255,7 @@ private:
 		}
 	};
 	
-	typedef shared_ptr<Server> ServerPtr;
+	typedef boost::shared_ptr<Server> ServerPtr;
 	
 	string gatewayAddress;
 	unsigned short gatewayPort;
@@ -316,7 +316,7 @@ private:
 		P_INFO(ips.size() << " Union Station gateway servers found");
 		
 		for (it = ips.begin(); it != ips.end(); it++) {
-			ServerPtr server = make_shared<Server>(*it, gatewayAddress, gatewayPort,
+			ServerPtr server = boost::make_shared<Server>(*it, gatewayAddress, gatewayPort,
 				certificate, &proxyInfo);
 			if (server->ping()) {
 				servers.push_back(server);
@@ -372,7 +372,7 @@ private:
 	}
 	
 	void sendOut(const Item &item) {
-		unique_lock<boost::mutex> l(syncher);
+		boost::unique_lock<boost::mutex> l(syncher);
 		bool sent = false;
 		bool someServersWentDown = false;
 		

data/ext/common/agents/SpawnPreparer.cpp

@@ -39,6 +39,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <string>
 #include <Utils/Base64.h>
 

data/ext/common/agents/Watchdog/AgentWatcher.cpp

@@ -26,12 +26,12 @@
 /**
  * Abstract base class for watching agent processes.
  */
-class AgentWatcher: public enable_shared_from_this<AgentWatcher> {
+class AgentWatcher: public boost::enable_shared_from_this<AgentWatcher> {
 private:
 	/** The watcher thread. */
 	oxt::thread *thr;
 	
-	void threadMain(shared_ptr<AgentWatcher> self) {
+	void threadMain(boost::shared_ptr<AgentWatcher> self) {
 		try {
 			pid_t pid, ret;
 			int status, e;
@@ -448,16 +448,17 @@ public:
 			name(), 256 * 1024);
 	}
 	
-	static void stopWatching(vector< shared_ptr<AgentWatcher> > &watchers) {
-		vector< shared_ptr<AgentWatcher> >::const_iterator it;
-		oxt::thread *threads[watchers.size()];
+	static void stopWatching(vector< boost::shared_ptr<AgentWatcher> > &watchers) {
+		vector< boost::shared_ptr<AgentWatcher> >::const_iterator it;
+		vector<oxt::thread *> threads;
 		unsigned int i = 0;
 		
 		for (it = watchers.begin(); it != watchers.end(); it++, i++) {
+			threads.push_back((*it)->thr);
 			threads[i] = (*it)->thr;
 		}
 		
-		oxt::thread::interrupt_and_join_multiple(threads, watchers.size());
+		oxt::thread::interrupt_and_join_multiple(&threads[0], threads.size());
 		for (it = watchers.begin(); it != watchers.end(); it++, i++) {
 			delete (*it)->thr;
 			(*it)->thr = NULL;
@@ -508,4 +509,4 @@ public:
 	}
 };
 
-typedef shared_ptr<AgentWatcher> AgentWatcherPtr;
+typedef boost::shared_ptr<AgentWatcher> AgentWatcherPtr;

data/ext/common/agents/Watchdog/Main.cpp

@@ -106,7 +106,7 @@ struct WorkingObjects {
 	string adminToolManipulationPassword;
 };
 
-typedef shared_ptr<WorkingObjects> WorkingObjectsPtr;
+typedef boost::shared_ptr<WorkingObjects> WorkingObjectsPtr;
 
 static string oldOomScore;
 
@@ -310,79 +310,87 @@ cleanupAgentsInBackground(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &
 	pid = fork();
 	if (pid == 0) {
 		// Child
-		vector<AgentWatcherPtr>::const_iterator it;
-		Timer timer(false);
-		fd_set fds, fds2;
-		int max, agentProcessesDone;
-		unsigned long long deadline = 30000; // miliseconds
-
-		#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(sun)
-			// Change process title.
-			strcpy(argv[0], "PassengerWatchdog (cleaning up...)");
-		#endif
-		
-		// Wait until all agent processes have exited. The starter
-		// process is responsible for telling the individual agents
-		// to exit.
-		
-		max = 0;
-		FD_ZERO(&fds);
-		for (it = watchers.begin(); it != watchers.end(); it++) {
-			FD_SET((*it)->getFeedbackFd(), &fds);
-			if ((*it)->getFeedbackFd() > max) {
-				max = (*it)->getFeedbackFd();
-			}
-		}
-		
-		timer.start();
-		agentProcessesDone = 0;
-		while (agentProcessesDone != -1
-		    && agentProcessesDone < (int) watchers.size()
-		    && timer.elapsed() < deadline)
-		{
-			struct timeval timeout;
-			
-			#ifdef FD_COPY
-				FD_COPY(&fds, &fds2);
-			#else
-				FD_ZERO(&fds2);
-				for (it = watchers.begin(); it != watchers.end(); it++) {
-					FD_SET((*it)->getFeedbackFd(), &fds2);
-				}
+		try {
+			vector<AgentWatcherPtr>::const_iterator it;
+			Timer timer(false);
+			fd_set fds, fds2;
+			int max, agentProcessesDone;
+			unsigned long long deadline = 30000; // miliseconds
+
+			#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(sun)
+				// Change process title.
+				strcpy(argv[0], "PassengerWatchdog (cleaning up...)");
 			#endif
 			
-			timeout.tv_sec = 0;
-			timeout.tv_usec = 10000;
-			agentProcessesDone = syscalls::select(max + 1, &fds2, NULL, NULL, &timeout);
-			if (agentProcessesDone > 0 && timer.elapsed() < deadline) {
-				usleep(10000);
+			// Wait until all agent processes have exited. The starter
+			// process is responsible for telling the individual agents
+			// to exit.
+			
+			max = 0;
+			FD_ZERO(&fds);
+			for (it = watchers.begin(); it != watchers.end(); it++) {
+				FD_SET((*it)->getFeedbackFd(), &fds);
+				if ((*it)->getFeedbackFd() > max) {
+					max = (*it)->getFeedbackFd();
+				}
 			}
+
+			timer.start();
+			agentProcessesDone = 0;
+			while (agentProcessesDone != -1
+			    && agentProcessesDone < (int) watchers.size()
+			    && timer.elapsed() < deadline)
+			{
+				struct timeval timeout;
+				
+				#ifdef FD_COPY
+					FD_COPY(&fds, &fds2);
+				#else
+					FD_ZERO(&fds2);
+					for (it = watchers.begin(); it != watchers.end(); it++) {
+						FD_SET((*it)->getFeedbackFd(), &fds2);
+					}
+				#endif
+				
+				timeout.tv_sec = 0;
+				timeout.tv_usec = 10000;
+				agentProcessesDone = syscalls::select(max + 1, &fds2, NULL, NULL, &timeout);
+				if (agentProcessesDone > 0 && timer.elapsed() < deadline) {
+					usleep(10000);
+				}
+			}
+
+			if (agentProcessesDone == -1 || timer.elapsed() >= deadline) {
+				// An error occurred or we've waited long enough. Kill all the
+				// processes.
+				P_WARN("Some Phusion Passenger agent processes did not exit " <<
+					"in time, forcefully shutting down all.");
+			} else {
+				P_DEBUG("All Phusion Passenger agent processes have exited. Forcing all subprocesses to shut down.");
+			}
+			for (it = watchers.begin(); it != watchers.end(); it++) {
+				(*it)->forceShutdown();
+			}
+
+			// Now clean up the server instance directory.
+			wo->generation->destroy();
+			wo->serverInstanceDir->destroy();
+
+			// Notify given PIDs about our shutdown.
+			foreach (pid_t pid, cleanupPids) {
+				P_DEBUG("Sending SIGTERM to cleanup PID " << pid);
+				kill(pid, SIGTERM);
+			}
+			strcpy(argv[0], "PassengerWatchdog (cleaning up 6...)");
+			_exit(0);
+		} catch (const std::exception &e) {
+			P_CRITICAL("An exception occurred during cleaning up: " << e.what());
+			_exit(1);
+		} catch (...) {
+			P_CRITICAL("An unknown exception occurred during cleaning up");
+			_exit(1);
 		}
 		
-		if (agentProcessesDone == -1 || timer.elapsed() >= deadline) {
-			// An error occurred or we've waited long enough. Kill all the
-			// processes.
-			P_WARN("Some Phusion Passenger agent processes did not exit " <<
-				"in time, forcefully shutting down all.");
-		} else {
-			P_DEBUG("All Phusion Passenger agent processes have exited. Forcing all subprocesses to shut down.");
-		}
-		for (it = watchers.begin(); it != watchers.end(); it++) {
-			(*it)->forceShutdown();
-		}
-		
-		// Now clean up the server instance directory.
-		delete wo->generation.get();
-		delete wo->serverInstanceDir.get();
-
-		// Notify given PIDs about our shutdown.
-		foreach (pid_t pid, cleanupPids) {
-			P_DEBUG("Sending SIGTERM to cleanup PID " << pid);
-			kill(pid, SIGTERM);
-		}
-		
-		_exit(0);
-		
 	} else if (pid == -1) {
 		// Error
 		e = errno;
@@ -521,11 +529,11 @@ lookupDefaultUidGid(uid_t &uid, gid_t &gid) {
 static void
 initializeWorkingObjects(WorkingObjectsPtr &wo, ServerInstanceDirToucherPtr &serverInstanceDirToucher) {
 	TRACE_POINT();
-	wo = make_shared<WorkingObjects>();
-	wo->resourceLocator = make_shared<ResourceLocator>(agentsOptions.get("passenger_root"));
+	wo = boost::make_shared<WorkingObjects>();
+	wo->resourceLocator = boost::make_shared<ResourceLocator>(agentsOptions.get("passenger_root"));
 
 	UPDATE_TRACE_POINT();
-	// Must not used make_shared() here because Watchdog.cpp
+	// Must not used boost::make_shared() here because Watchdog.cpp
 	// deletes the raw pointer in cleanupAgentsInBackground().
 	if (agentsOptions.get("server_instance_dir", false).empty()) {
 		/* We embed the super structure version in the server instance directory name
@@ -549,7 +557,7 @@ initializeWorkingObjects(WorkingObjectsPtr &wo, ServerInstanceDirToucherPtr &ser
 	agentsOptions.setInt("generation_number", wo->generation->getNumber());
 
 	UPDATE_TRACE_POINT();
-	serverInstanceDirToucher = make_shared<ServerInstanceDirToucher>(wo);
+	serverInstanceDirToucher = boost::make_shared<ServerInstanceDirToucher>(wo);
 
 	UPDATE_TRACE_POINT();
 	lookupDefaultUidGid(wo->defaultUid, wo->defaultGid);

data/ext/common/agents/Watchdog/ServerInstanceDirToucher.cpp

@@ -113,4 +113,4 @@ public:
 	}
 };
 
-typedef shared_ptr<ServerInstanceDirToucher> ServerInstanceDirToucherPtr;
+typedef boost::shared_ptr<ServerInstanceDirToucher> ServerInstanceDirToucherPtr;

data/ext/libev/Changes

@@ -2,6 +2,63 @@ Revision history for libev, a high-performance and full-featured event loop.
 
 TODO: ev_loop_wakeup
 TODO: EV_STANDALONE == NO_HASSEL (do not use clock_gettime in ev_standalone)
+TODO: faq, process a thing in each iteration
+TODO: dbeugging tips, ev_verify, ev_init twice
+TODO: ev_break for immediate exit (EVBREAK_NOW?)
+TODO: ev_feed_child_event
+TODO: document the special problem of signals around fork.
+TODO: store pid for each signal
+TODO: document file descriptor usage per loop
+TODO: store loop pid_t and compare isndie signal handler,store 1 for same, 2 for differign pid, clean up in loop_fork
+TODO: embed watchers need updating when fd changes
+TODO: document portbaility requirements for atomic pointer access
+
+4.15 Fri Mar  1 12:04:50 CET 2013
+        - destroying a non-default loop would stop the global waitpid
+          watcher (Denis Bilenko).
+	- queueing pending watchers of higher priority from a watcher now invokes
+          them in a timely fashion (reported by Denis Bilenko).
+	- add throw() to all libev functions that cannot throw exceptions, for
+          further code size decrease when compiling for C++.
+        - add throw () to callbacks that must not throw exceptions (allocator,
+          syserr, loop acquire/release, periodic reschedule cbs).
+	- fix event_base_loop return code, add event_get_callback, event_base_new,
+          event_base_get_method calls to improve libevent 1.x emulation and add
+          some libevent 2.x functionality (based on a patch by Jeff Davey).
+        - add more memory fences to fix a bug reported by Jeff Davey. Better
+          be overfenced than underprotected.
+	- ev_run now returns a boolean status (true meaning watchers are
+          still active).
+	- ev_once: undef EV_ERROR in ev_kqueue.c, to avoid clashing with
+          libev's EV_ERROR (reported by 191919).
+	- (ecb) add memory fence support for xlC (Darin McBride).
+	- (ecb) add memory fence support for gcc-mips (Anton Kirilov).
+	- (ecb) add memory fence support for gcc-alpha (Christian Weisgerber).
+        - work around some kernels losing file descriptors by leaking
+          the kqueue descriptor in the child.
+        - work around linux inotify not reporting IN_ATTRIB changes for directories
+          in many cases.
+        - include sys/syscall.h instead of plain syscall.h.
+        - check for io watcher loops in ev_verify, check for the most
+          common reported usage bug in ev_io_start.
+        - chose socket vs. WSASocket at compiletime using EV_USE_WSASOCKET.
+        - always use WSASend/WSARecv directly on windows, hoping that this
+          works in all cases (unlike read/write/send/recv...).
+        - try to detect signals around a fork faster (test program by
+          Denis Bilenko).
+        - work around recent glibc versions that leak memory in realloc.
+        - rename ev::embed::set to ev::embed::set_embed to avoid clashing
+          the watcher base set (loop) method.
+        - rewrite the async/signal pipe logic to always keep a valid fd, which
+          simplifies (and hopefuly correctifies :) the race checking
+          on fork, at the cost of one extra fd.
+        - add fat, msdos, jffs2, ramfs, ntfs and btrfs to the list of
+          inotify-supporting filesystems.
+        - move orig_CFLAGS assignment to after AC_INIT, as newer autoconf
+          versions ignore it before
+          (https://bugzilla.redhat.com/show_bug.cgi?id=908096).
+        - add some untested android support.
+        - enum expressions must be of type int (reported by Juan Pablo L).
 
 4.11 Sat Feb  4 19:52:39 CET 2012
 	- INCOMPATIBLE CHANGE: ev_timer_again now clears the pending status, as

data/ext/libev/LICENSE

@@ -1,4 +1,5 @@
-All files in libev are Copyright (C)2007,2008,2009 Marc Alexander Lehmann.
+All files in libev are
+Copyright (c)2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are

data/ext/libev/Makefile.in

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +17,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -72,6 +89,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" \
 	"$(DESTDIR)$(includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -96,6 +119,11 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libev_la_SOURCES)
 DIST_SOURCES = $(libev_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 man3dir = $(mandir)/man3
 NROFF = nroff
 MANS = $(man_MANS)
@@ -106,12 +134,16 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -128,6 +160,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -152,6 +185,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -177,6 +211,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -209,7 +244,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -242,7 +276,7 @@ all: config.h
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -278,10 +312,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -295,7 +327,6 @@ distclean-hdr:
 	-rm -f config.h stamp-h1
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -303,6 +334,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -324,7 +357,7 @@ clean-libLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libev.la: $(libev_la_OBJECTS) $(libev_la_DEPENDENCIES) 
+libev.la: $(libev_la_OBJECTS) $(libev_la_DEPENDENCIES) $(EXTRA_libev_la_DEPENDENCIES) 
 	$(libev_la_LINK) -rpath $(libdir) $(libev_la_OBJECTS) $(libev_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -367,11 +400,18 @@ distclean-libtool:
 	-rm -f libtool config.lt
 install-man3: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
-	@list=''; test -n "$(man3dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.3[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man3dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.3[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -400,13 +440,14 @@ uninstall-man3:
 	  sed -n '/\.3[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man3dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man3dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -420,9 +461,7 @@ uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(includedir)" && rm -f $$files
+	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -533,7 +572,11 @@ dist-gzip: distdir
 	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__remove_distdir)
 
 dist-lzma: distdir
@@ -541,7 +584,7 @@ dist-lzma: distdir
 	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -572,6 +615,8 @@ distcheck: dist
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -581,7 +626,7 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
@@ -591,6 +636,7 @@ distcheck: dist
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -619,8 +665,16 @@ distcheck: dist
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -653,10 +707,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -749,21 +808,22 @@ uninstall-man: uninstall-man3
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
-	dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
-	dist-xz dist-zip distcheck distclean distclean-compile \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-includeHEADERS install-info install-info-am \
-	install-libLTLIBRARIES install-man install-man3 install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-includeHEADERS \
-	uninstall-libLTLIBRARIES uninstall-man uninstall-man3
+	dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-compile distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-includeHEADERS install-info \
+	install-info-am install-libLTLIBRARIES install-man \
+	install-man3 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-includeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-man uninstall-man3
 
 
 ev.3: ev.pod