From 1cc2918c6d89fb426be819b2891f68600f94528b Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 8 Mar 2012 11:04:46 -0700 Subject: [PATCH 1/2] Updated ax_count_cpus.m4 to version9 * fixed bug on recent fedora (http://savannah.gnu.org/patch/?7697) --- config/ax_count_cpus.m4 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/config/ax_count_cpus.m4 b/config/ax_count_cpus.m4 index 04dabd8120d..4de1f273437 100644 --- a/config/ax_count_cpus.m4 +++ b/config/ax_count_cpus.m4 @@ -15,7 +15,6 @@ # # LICENSE # -# Copyright (C) 2012 The ESPResSo project # Copyright (c) 2008 Michael Paul Bailey # Copyright (c) 2008 Christophe Tournayre # @@ -24,7 +23,7 @@ # 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]) @@ -32,8 +31,10 @@ AC_DEFUN([AX_COUNT_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 From 5261b7f65d769e40790cf2931c452a65eea3c991 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 8 Mar 2012 11:13:51 -0700 Subject: [PATCH 2/2] fixed install issue related to name transformation --- src/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index a9fc581f6b8..eb267c1f970 100644 --- a/src/Makefile.am +++ b/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