Changeset 92644b in git for m4

Timestamp:

Jun 4, 2013, 6:44:20 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

4fb517c2abf52c3388acf86b567442ce177a47ad

Parents:

502dd5528b44d6832fd6972089729d9108c820de

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-06-04 18:44:20+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-06-04 18:46:06+02:00

Message:

fix: version checks for header

removed Singular/version.h (define now in config.h)
new check for S_UNAME: uname -m uname -s
remmoved feVersionId

File:

• m4/cpu-check.m4 (modified) (2 diffs)

m4/cpu-check.m4

@@ -14 +14 @@
 AC_MSG_RESULT($ac_cv_singcpuname)
 
-if test "$ac_cv_singuname" = ix86-Win; then
-  EXEC_EXT=".exe"
-  AC_DEFINE(SI_CPU_I386,1,"ix86 under Windows")
-  AC_SUBST(SI_CPU_I386)
-fi
-AC_SUBST(EXEC_EXT)
-if test "$ac_cv_singuname" = x86_64-Linux; then
-  AC_DEFINE(SI_CPU_X86_64,1,"ix86-64 under GNU/Linux")
-  AC_SUBST(SI_CPU_X86_64)
-fi
-if test "$ac_cv_singuname" = ix86-Linux; then
-  AC_DEFINE(SI_CPU_I386,1,"ix86 under GNU/Linux")
-  AC_SUBST(SI_CPU_I386)
-fi
-if test "$ac_cv_singuname" = IA64-Linux; then
-  AC_DEFINE(SI_CPU_IA64,1,"ia64 under GNU/Linux")
-  AC_SUBST(SI_CPU_IA64)
-fi
-if test "$ac_cv_singuname" = ppc-Linux; then
-  AC_DEFINE(SI_CPU_PPC,1,"PPC under GNU/Linux")
-  AC_SUBST(SI_CPU_PPC)
-fi
-if test "$ac_cv_singuname" = ppcMac-darwin; then
-  AC_DEFINE(SI_CPU_PPC,1,"PPC under MacOS")
-  AC_SUBST(SI_CPU_PPC)
-fi
-# test again with CPU names
 if test "$ac_cv_singcpuname" = i386; then
   AC_DEFINE(SI_CPU_I386,1,"i386")
@@ -69 +42 @@
 AC_MSG_CHECKING(uname for Singular)
 
-#ac_cv_singuname=`singuname.sh`
+#ac_cv_singuname=`./config.guess`
+ac_cv_singuname=`uname -m`-`uname -s`
 AC_MSG_RESULT($ac_cv_singuname)
-if test "$ac_cv_singuname" = unknown; then
-  AC_MSG_WARN(Unknown architecture: Check singuname.sh)
-  ac_cv_singuname="unknown"
-fi
 AC_DEFINE_UNQUOTED(S_UNAME, "$ac_cv_singuname", Singular\'s own uname\, believe it or not)