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
6 CCFLAGS=`echo "${CCPIPE}" "${CCFLAGS}"`
10 - if [ "${m}" = i686 ]
12 - echon "Chesking whether ${CC} -mpentiumpro and -mmx work ... "
13 - if ( run $CC ${CCFLAGS} -mpentiumpro -c $temp.c)
15 - CCMMX="-mpentiumpro"
16 - if ( run $CC ${CCFLAGS} ${CCMMX} -mmx -c $temp.c )
19 - echo "yes, both work"
21 - echo "just $CCMMX works"
26 - CCFLAGS=`echo "${CCMMX}" "${CCFLAGS}"`
29 echon "Checking whether ${CC} is gcc ... "
30 echo 'int main(void) { return __GNUC__;}' | testfile $temp.c
36 - echon "Checking whether ${CC} -O3 works ... "
37 - if ( run $CC ${CCFLAGS} -O3 -c $temp.c )
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 )
50 - CCUNROLL="-funroll-loops"
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
60 CXXFLAGS=`echo "${CXXPIPE}" "${CXXFLAGS}"`
63 - if [ `uname -m` = i686 ]
65 - echon "Checking ${CXX} supports pentium optimizations ... "
66 - check_compile_flags CXXMMX $temp.cpp "-mpentiumpro -mmx" "-mpentiumpro"
67 - if [ -z "$CXXMMX" ] ; then
71 - CXXFLAGS="${CXXMMX} ${CXXFLAGS}"
75 echon "Checking whether ${CXX} is gcc ... "
76 echo 'int main(void) { return __GNUG__;}' | testfile $temp.cpp
82 - echon "Checking whether ${CXX} -O3 works ... "
83 - if ( run $CXX ${CXXFLAGS} -O3 -c $temp.cpp ) ; then
89 - echon "Checking whether ${CXX} -funroll-loops works ... "
90 - if ( run $CXX ${CXXFLAGS} ${CXXOPT} -funroll-loops -c $temp.cpp )
92 + echon "Checking whether ${CXX} ${OPTXX} works ... "
93 + if ( run $CXX ${CXXFLAGS} ${OPTXX} -c $temp.cpp ) ; then
95 - CXXUNROLL="-funroll-loops"
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
107 #C- DjVu® Reference Library (v. 3.0)
113 -if [ ! -d "$TOPSRCDIR/src/3rd-party/libjpeg" ]
118 if [ -z "$without_jpeg" ]
121 A_DEFS="$A_DEFS -DNEED_JPEG_DECODER"
123 - A_INCS="$A_INCS -I./TOPDIR/src/3rd-party/libjpeg -I./TOPDIR/SRCDIR/src/3rd-party/libjpeg"
124 - LIBJPEG='$(LIBPATH)/libdjpeg.a'
125 + A_INCS="$A_INCS -I/usr/include"
131 generate_makefile src/libdjvu++/Test
132 generate_makefile src/djvutools/reference
134 -if [ -z "$without_jpeg" ]
136 - ## This is the version with JPEG
137 - generate_makefile src/3rd-party/libjpeg
138 - generate_main_makefile src/3rd-party/libjpeg src/libdjvu++ <<\EOF
140 - ( cd src/3rd-party/libjpeg; $(MAKE) lib prog)
141 - ( cd src/libdjvu++; $(MAKE) lib )
142 - ( cd src/djvutools/reference; $(MAKE) prog )
145 - echo Rule not supported...
149 ## This is the regular version
150 generate_main_makefile src/libdjvu++ <<\EOF
154 echo Rule not supported...