Merge branch '3.1'

config/ax_count_cpus.m4

@@ -15,7 +15,6 @@
 #
 # LICENSE
 #
-#   Copyright (C) 2012 The ESPResSo project
 #   Copyright (c) 2008 Michael Paul Bailey <jinxidoru@byu.net>
 #   Copyright (c) 2008 Christophe Tournayre <turn3r@users.sourceforge.net>
 #
@@ -24,16 +23,18 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 8
+#serial 9
 
 AC_DEFUN([AX_COUNT_CPUS], [
     AC_REQUIRE([AC_PROG_EGREP])
     AC_MSG_CHECKING(the number of available CPUs)
     CPU_COUNT="0"
 
     #On MacOS
-    if test -x /usr/sbin/sysctl -a `/sbin/sysctl -a 2>/dev/null| grep -c hw.cpu`; then
-        CPU_COUNT=`/usr/sbin/sysctl -n hw.ncpu`
+    if test -x /usr/sbin/sysctl; then
+        if test `/usr/sbin/sysctl -a 2>/dev/null| grep -c hw.cpu`; then
+            CPU_COUNT=`/usr/sbin/sysctl -n hw.ncpu`
+        fi
     fi
 
     #On Linux

src/Makefile.am

@@ -247,14 +247,16 @@ Espresso_install_CPPFLAGS = -D ESPRESSO_SCRIPTS_DEFAULT=\"$(scriptsdir)\"
 Espresso_install_SOURCES = tcl/scriptsdir.c tcl/main.c
 Espresso_install_LDADD = libEspresso.a
 
+ESPRESSO = `echo Espresso | sed '$(transform)'`$(EXEEXT)
+ESPRESSO_INSTALL = `echo Espresso.install | sed '$(transform)'`$(EXEEXT)
 # rename Espresso after installation
 install-exec-hook:
 	$(am__mv) \
-		$(DESTDIR)$(bindir)/Espresso.install \
-		$(DESTDIR)$(bindir)/Espresso
+		$(DESTDIR)$(bindir)/$(ESPRESSO_INSTALL) \
+		$(DESTDIR)$(bindir)/$(ESPRESSO)
 
 uninstall-local:
-	-rm -f $(DESTDIR)$(bindir)/Espresso
+	-rm -f $(DESTDIR)$(bindir)/$(ESPRESSO)
 
 endif