]>
Commit | Line | Data |
---|---|---|
1aac2a37 JB |
1 | diff -Nur DjVu3.orig/config/cc.sh DjVu3/config/cc.sh |
2 | --- DjVu3.orig/config/cc.sh Tue Jan 9 18:29:22 2001 | |
3 | +++ DjVu3/config/cc.sh Mon Jul 9 00:58:27 2001 | |
4 | @@ -89,27 +89,6 @@ | |
5 | fi | |
6 | CCFLAGS=`echo "${CCPIPE}" "${CCFLAGS}"` | |
7 | ||
8 | - CCMMX="" | |
9 | - m=`${uname} -m` | |
10 | - if [ "${m}" = i686 ] | |
11 | - then | |
12 | - echon "Chesking whether ${CC} -mpentiumpro and -mmx work ... " | |
13 | - if ( run $CC ${CCFLAGS} -mpentiumpro -c $temp.c) | |
14 | - then | |
15 | - CCMMX="-mpentiumpro" | |
16 | - if ( run $CC ${CCFLAGS} ${CCMMX} -mmx -c $temp.c ) | |
17 | - then | |
18 | - CCMMX="$CCMMX -mmx" | |
19 | - echo "yes, both work" | |
20 | - else | |
21 | - echo "just $CCMMX works" | |
22 | - fi | |
23 | - else | |
24 | - echo no | |
25 | - fi | |
26 | - CCFLAGS=`echo "${CCMMX}" "${CCFLAGS}"` | |
27 | - fi | |
28 | - | |
29 | echon "Checking whether ${CC} is gcc ... " | |
30 | echo 'int main(void) { return __GNUC__;}' | testfile $temp.c | |
31 | CCOPT="" | |
32 | @@ -120,19 +99,11 @@ | |
33 | echo yes | |
34 | cc_is_gcc=yes | |
35 | CCWARN="-Wall" | |
36 | - echon "Checking whether ${CC} -O3 works ... " | |
37 | - if ( run $CC ${CCFLAGS} -O3 -c $temp.c ) | |
38 | - then | |
39 | - echo yes | |
40 | - CCOPT="-O3" | |
41 | - else | |
42 | - echo no | |
43 | - fi | |
44 | - echon "Checking whether ${CC} -funroll-loops works ... " | |
45 | - if ( run $CC ${CCFLAGS} ${CCOPT} -funroll-loops -c $temp.c ) | |
46 | + echon "Checking whether ${CC} ${OPT} works ... " | |
47 | + if ( run $CC ${CCFLAGS} ${OPT} -c $temp.c ) | |
48 | then | |
49 | echo yes | |
50 | - CCUNROLL="-funroll-loops" | |
51 | + CCOPT="${OPT}" | |
52 | else | |
53 | echo no | |
54 | fi | |
55 | diff -Nur DjVu3.orig/config/cxx.sh DjVu3/config/cxx.sh | |
56 | --- DjVu3.orig/config/cxx.sh Tue Jan 9 18:29:22 2001 | |
57 | +++ DjVu3/config/cxx.sh Mon Jul 9 01:00:18 2001 | |
58 | @@ -94,19 +94,6 @@ | |
59 | fi | |
60 | CXXFLAGS=`echo "${CXXPIPE}" "${CXXFLAGS}"` | |
61 | ||
62 | - CXXMMX="" | |
63 | - if [ `uname -m` = i686 ] | |
64 | - then | |
65 | - echon "Checking ${CXX} supports pentium optimizations ... " | |
66 | - check_compile_flags CXXMMX $temp.cpp "-mpentiumpro -mmx" "-mpentiumpro" | |
67 | - if [ -z "$CXXMMX" ] ; then | |
68 | - echo "none" | |
69 | - else | |
70 | - echo "$CXXMMX" | |
71 | - CXXFLAGS="${CXXMMX} ${CXXFLAGS}" | |
72 | - fi | |
73 | - fi | |
74 | - | |
75 | echon "Checking whether ${CXX} is gcc ... " | |
76 | echo 'int main(void) { return __GNUG__;}' | testfile $temp.cpp | |
77 | CXXOPT="" | |
78 | @@ -117,18 +104,10 @@ | |
79 | echo yes | |
80 | cxx_is_gcc=yes | |
81 | CXXWARN="-Wall" | |
82 | - echon "Checking whether ${CXX} -O3 works ... " | |
83 | - if ( run $CXX ${CXXFLAGS} -O3 -c $temp.cpp ) ; then | |
84 | - echo yes | |
85 | - CXXOPT="-O3" | |
86 | - else | |
87 | - echo no | |
88 | - fi | |
89 | - echon "Checking whether ${CXX} -funroll-loops works ... " | |
90 | - if ( run $CXX ${CXXFLAGS} ${CXXOPT} -funroll-loops -c $temp.cpp ) | |
91 | - then | |
92 | + echon "Checking whether ${CXX} ${OPTXX} works ... " | |
93 | + if ( run $CXX ${CXXFLAGS} ${OPTXX} -c $temp.cpp ) ; then | |
94 | echo yes | |
95 | - CXXUNROLL="-funroll-loops" | |
96 | + CXXOPT="${OPTXX}" | |
97 | else | |
98 | echo no | |
99 | fi | |
100 | diff -Nur DjVu3.orig/configure DjVu3/configure | |
101 | --- DjVu3.orig/configure Thu Nov 9 21:15:05 2000 | |
102 | +++ DjVu3/configure Mon Jul 9 00:56:09 2001 | |
103 | @@ -1,4 +1,4 @@ | |
104 | -#!/bin/ksh | |
105 | +#!/bin/sh | |
106 | #C- | |
107 |