1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
--- configure.ac.orig 2010-11-17 23:51:53.000000000 +0000
+++ configure.ac 2010-11-17 23:54:58.000000000 +0000
@@ -20,51 +20,18 @@
AC_SUBST(DATE3, "$date3")
# Include macros
-sinclude(acx_prog_cc_optim.m4)
sinclude(acx_urbi_resolve_dir.m4)
# Display pakage and version number
AC_MSG_RESULT([*********** Configuring: $PACKAGE $VERSION ($date) **********])
-# Initialize the list of compilers to consider
-cclist="cc gcc"
-
-# Provide special option for choosing automatically the compilation flags.
-AC_MSG_CHECKING([if compilation flags are set automatically])
-AC_ARG_ENABLE(auto-flags,
- [AC_HELP_STRING([--enable-auto-flags],
- [Let the configure script choose the compilation flags \
-(off by default)])],
- use_autoflag="yes"
- AC_MSG_RESULT([yes]),
- use_autoflag="no"
- AC_MSG_RESULT([no]))
-
-# Provide special option for the Linux Intel C compiler
-AC_MSG_CHECKING([for Linux Intel C compiler mode])
-AC_ARG_ENABLE(icc,
- [AC_HELP_STRING([--enable-icc],
- [Enable special mode for compilation with the Intel compiler \
-(off by default)])],
- use_icc="yes"
- cclist="icc $cclist"
- AC_MSG_RESULT([yes]),
- use_icc="no"
- AC_MSG_RESULT([no]))
-
# Checks for programs.
# GCC is chosen last because it is likely to yield less optimized code
-AC_PROG_CC([$cclist])
+AC_PROG_CC
# C Compiler: Check that it is ANSI C
AM_PROG_CC_STDC
# C Compiler: Check that it is POSIX-compliant
AC_ISC_POSIX
-# Override automatic CFLAGS and LDFLAGS with those of user
-if test "$use_autoflag" = "yes"; then
- CFLAGS=""
- LDFLAGS =""
- ACX_PROG_CC_OPTIM
-fi
AC_PROG_RANLIB
AC_PROG_INSTALL
@@ -75,7 +42,7 @@
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h sys/mman.h])
-if test $use_icc = "yes" -a $CC = "icc"; then
+if test $CC = "icc"; then
AC_CHECK_HEADERS(mathimf.h)
fi
@@ -115,43 +82,6 @@
AC_DEFINE_UNQUOTED([XSL_URL], "$xsl_url",[Default URL of the XSLT filter])
-# Provide special option for gprof profiling
-AC_MSG_CHECKING([for gprof profiler mode])
-AC_ARG_ENABLE(gprof,
- [AC_HELP_STRING([--enable-gprof],
- [Enable special mode for compilation with the gprof profiler \
-(off by default)])],
- use_gprof="yes"
- AC_MSG_RESULT([yes]),
- use_gprof="no"
- AC_MSG_RESULT([no]))
-
-# Enable linking options for making the executable as portable as possible.
-AC_MSG_CHECKING([best linking option])
-AC_ARG_ENABLE(best-link,
- [AC_HELP_STRING([--enable-best-link],
- [Choose the right combination of static and dynamic linking to make \
-the executable as portable as possible (off by default)])],
- use_best="yes"
- AC_MSG_RESULT([yes]),
- use_best="no"
- AC_MSG_RESULT([no]))
-
-# Link with gprof option
-if test "$use_gprof" = "yes"; then
- if test "$use_icc" = "yes"; then
- AM_CFLAGS="$AM_CFLAGS -pq"
- else
- AM_CFLAGS="$AM_CFLAGS -pg"
- fi
- use_best="no"
-fi
-
-# "Best" linking option
-if test "$use_best" = "yes"; then
- AM_LDFLAGS="-shared-libgcc -static-libtool-libs $AM_LDFLAGS"
-fi
-
# Display compiler and linker flags
AC_MSG_RESULT([***************************************************************])
AC_MSG_RESULT([Compile cmdline: $CC $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS])
|
GitWeb