]>
Commit | Line | Data |
---|---|---|
c93d1bd4 | 1 | diff -aurN djvulibre-3.5.17.orig/config/acinclude.m4 djvulibre-3.5.17/config/acinclude.m4 |
2 | --- djvulibre-3.5.17.orig/config/acinclude.m4 2006-02-22 00:16:17.000000000 +0100 | |
3 | +++ djvulibre-3.5.17/config/acinclude.m4 2006-05-16 19:04:01.600526896 +0200 | |
4 | @@ -79,46 +79,6 @@ | |
4c178625 JB |
5 | [ac_debug=$enableval],[ac_debug=no]) |
6 | OPTS= | |
7 | AC_SUBST(OPTS) | |
8 | - saved_CXXFLAGS="$CXXFLAGS" | |
9 | - saved_CFLAGS="$CFLAGS" | |
10 | - CXXFLAGS= | |
11 | - CFLAGS= | |
12 | - for opt in $saved_CXXFLAGS ; do | |
13 | - case $opt in | |
14 | - -g*) test $ac_debug != no && OPTS="$OPTS $opt" ;; | |
15 | - -O*) ;; | |
16 | - *) CXXFLAGS="$CXXFLAGS $opt" ;; | |
17 | - esac | |
18 | - done | |
19 | - for opt in $saved_CFLAGS ; do | |
20 | - case $opt in | |
21 | - -O*|-g*) ;; | |
22 | - *) CFLAGS="$CFLAGS $opt" ;; | |
23 | - esac | |
24 | - done | |
ff84a788 | 25 | - if test x$ac_debug = xno ; then |
166d9410 | 26 | - OPTS=-DNDEBUG |
4c178625 JB |
27 | - AC_CHECK_CXX_OPT([-Wall],[OPTS="$OPTS -Wall"]) |
28 | - AC_CHECK_CXX_OPT([-O3],[OPTS="$OPTS -O3"], | |
29 | - [ AC_CHECK_CXX_OPT([-O2], [OPTS="$OPTS -O2"] ) ] ) | |
cf98b950 | 30 | - dnl This triggers compiler bugs with gcc-3.2.2: |
2496dc4a | 31 | - dnl AC_CHECK_CXX_OPT([-funroll-loops], [OPTS="$OPTS -funroll-loops"]) |
cf98b950 JB |
32 | - dnl QT3 has plenty of this: |
33 | - AC_CHECK_CXX_OPT([-Wno-non-virtual-dtor],[OPTS="$OPTS -Wno-non-virtual-dtor"]) | |
2496dc4a JB |
34 | - cpu=`uname -m 2>/dev/null` |
35 | - test -z "$cpu" && cpu=${host_cpu} | |
4c178625 JB |
36 | - case "${host_cpu}" in |
37 | - i?86) | |
cf98b950 JB |
38 | - opt="-mtune=${host_cpu}" |
39 | - AC_CHECK_CXX_OPT([$opt], [OPTS="$OPTS $opt"], | |
40 | - [ opt="-mcpu=${host_cpu}" | |
41 | - AC_CHECK_CXX_OPT([$opt], [OPTS="$OPTS $opt"]) ]) | |
4c178625 JB |
42 | - ;; |
43 | - esac | |
ff84a788 JB |
44 | - else |
45 | - AC_CHECK_CXX_OPT([-Wall],[OPTS="$OPTS -Wall"]) | |
c93d1bd4 | 46 | - AC_CHECK_CXX_OPT([-Wno-non-virtual-dtor],[OPTS="$OPTS -Wno-non-virtual-dtor"]) |
4c178625 JB |
47 | - fi |
48 | case x"$ac_debug" in | |
166d9410 | 49 | changequote(<<, >>)dnl |
4c178625 | 50 | x[0-9]) OPTS="$OPTS -DDEBUGLVL=$ac_debug" ;; |