projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r4085: .bashrc
[ctsim.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 4ad6678a5978025ac2001a0a8e1c09d2e7c95acf..1f4c7b3a00a3dd63680e3776f106fef34908e43e 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-5,7
+5,7
@@
dnl CDPATH=
AC_INIT
AC_CONFIG_SRCDIR([src/ctsim.cpp])
AC_INIT
AC_CONFIG_SRCDIR([src/ctsim.cpp])
-AM_INIT_AUTOMAKE(ctsim,4.0.
0
)
+AM_INIT_AUTOMAKE(ctsim,4.0.
2
)
AM_CONFIG_HEADER(config.h)
dnl Checks for programs.
AM_CONFIG_HEADER(config.h)
dnl Checks for programs.
@@
-159,7
+159,7
@@
AC_ARG_ENABLE(verbose-warnings,
AC_MSG_CHECKING(static executables)
AC_ARG_ENABLE(static,
[ --enable-static
AC_MSG_CHECKING(static executables)
AC_ARG_ENABLE(static,
[ --enable-static
- Enable static executables.],
+
Enable static executables.],
[ case "$enableval" in
yes)
AC_MSG_RESULT(yes)
[ case "$enableval" in
yes)
AC_MSG_RESULT(yes)
@@
-173,7
+173,7
@@
AC_ARG_ENABLE(static,
dnl Set LAM path
AC_ARG_WITH(lam,
dnl Set LAM path
AC_ARG_WITH(lam,
-[ --with-lam[=PATH] Set path of LAM MPI ],
+[ --with-lam[=PATH]
Set path of LAM MPI ],
[ if test "$withval" != "no" ; then
trylamdir=$withval
fi ]
[ if test "$withval" != "no" ; then
trylamdir=$withval
fi ]
@@
-207,7
+207,7
@@
fi
dnl Set CTN path
AC_ARG_WITH(ctn,
dnl Set CTN path
AC_ARG_WITH(ctn,
-[ --with-ctn[=PATH] Set path of CTN DICOM library ],
+[ --with-ctn[=PATH]
Set path of CTN DICOM library ],
[ if test "$withval" != "no" ; then
tryctndir=$withval
fi ]
[ if test "$withval" != "no" ; then
tryctndir=$withval
fi ]
@@
-242,14
+242,15
@@
else
fi
dnl Set CPU
fi
dnl Set CPU
-AC_ARG_WITH(cpu,
-[ --with-cpu[=CPU] Set name of CPU for gcc -mcpu=])
+AC_MSG_CHECKING([for CPU specification])
+AC_ARG_WITH(mcpu,
+[ --with-mcpu[=CPU] Set name of CPU for gcc -mcpu])
-if test "$withval" == "pentium4" -o "$withval" == "athlon-mp" ; then
- AC_MSG_CHECKING([Setting CPU to $withval])
- CFLAGS="$CFLAGS -mcpu=$withval"
+if test "$withval" == "no" -o "$withval" == "yes" -o "$withval" == ""; then
+ AC_MSG_RESULT([no])
else
else
- AC_MSG_CHECKING([Unknown CPU $withval])
+ AC_MSG_RESULT([$withval])
+ CFLAGS="$CFLAGS -mcpu=$withval"
fi
AC_MSG_CHECKING([for web access])
fi
AC_MSG_CHECKING([for web access])