1 |
nieder |
1.1 |
diff -ruN dclib-0.3.7-orig/admin/cvs.sh dclib-0.3.7/admin/cvs.sh
|
2 |
|
|
--- dclib-0.3.7-orig/admin/cvs.sh Wed Jan 5 10:34:15 2005
|
3 |
|
|
+++ dclib-0.3.7/admin/cvs.sh Mon Jan 16 14:52:01 2006
|
4 |
|
|
@@ -27,7 +27,7 @@
|
5 |
|
|
|
6 |
|
|
check_autotool_versions()
|
7 |
|
|
{
|
8 |
|
|
-AUTOCONF_VERSION=`$AUTOCONF --version | head -1`
|
9 |
|
|
+AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
|
10 |
|
|
case $AUTOCONF_VERSION in
|
11 |
|
|
Autoconf*2.5* | autoconf*2.5* ) : ;;
|
12 |
|
|
"" )
|
13 |
|
|
@@ -42,7 +42,7 @@
|
14 |
|
|
;;
|
15 |
|
|
esac
|
16 |
|
|
|
17 |
|
|
-AUTOHEADER_VERSION=`$AUTOHEADER --version | head -1`
|
18 |
|
|
+AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
|
19 |
|
|
case $AUTOHEADER_VERSION in
|
20 |
|
|
Autoconf*2.5* | autoheader*2.5* ) : ;;
|
21 |
|
|
"" )
|
22 |
|
|
@@ -57,7 +57,7 @@
|
23 |
|
|
;;
|
24 |
|
|
esac
|
25 |
|
|
|
26 |
|
|
-AUTOMAKE_STRING=`$AUTOMAKE --version | head -1`
|
27 |
|
|
+AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
|
28 |
|
|
case $AUTOMAKE_STRING in
|
29 |
|
|
automake*1.5d* )
|
30 |
|
|
echo "*** YOU'RE USING $AUTOMAKE_STRING."
|
31 |
|
|
@@ -242,10 +242,10 @@
|
32 |
|
|
echo "AC_OUTPUT" >> configure.in.new
|
33 |
|
|
modulename=
|
34 |
|
|
if test -f configure.in.in; then
|
35 |
|
|
- if head -2 configure.in.in | egrep "^#MIN_CONFIG\(.*\)$" > /dev/null; then
|
36 |
|
|
+ if head -n 2 configure.in.in | egrep "^#MIN_CONFIG\(.*\)$" > /dev/null; then
|
37 |
|
|
kde_use_qt_param=`cat configure.in.in | sed -n -e "s/#MIN_CONFIG(\(.*\))/\1/p"`
|
38 |
|
|
fi
|
39 |
|
|
- if head -2 configure.in.in | egrep "^#MIN_CONFIG" > /dev/null; then
|
40 |
|
|
+ if head -n 2 configure.in.in | egrep "^#MIN_CONFIG" > /dev/null; then
|
41 |
|
|
line=`grep "^AM_INIT_AUTOMAKE(" configure.in.in`
|
42 |
|
|
if test -n "$line"; then
|
43 |
|
|
modulename=`echo $line | sed -e "s#AM_INIT_AUTOMAKE(\([^,]*\),.*#\1#"`
|
44 |
|
|
@@ -285,7 +285,7 @@
|
45 |
|
|
done
|
46 |
|
|
rm -f configure.files
|
47 |
|
|
touch configure.files
|
48 |
|
|
-if test -f configure.in.in && head -2 configure.in.in | grep "^#MIN_CONFIG" > /dev/null; then
|
49 |
|
|
+if test -f configure.in.in && head -n 2 configure.in.in | grep "^#MIN_CONFIG" > /dev/null; then
|
50 |
|
|
echo $admindir/configure.in.min >> configure.files
|
51 |
|
|
fi
|
52 |
|
|
test -f configure.in.in && echo configure.in.in >> configure.files
|
53 |
|
|
@@ -300,8 +300,8 @@
|
54 |
|
|
subdirs()
|
55 |
|
|
{
|
56 |
|
|
dirs=
|
57 |
|
|
-compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' $makefile_am | head -1`
|
58 |
|
|
-compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' $makefile_am | head -1`
|
59 |
|
|
+compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' $makefile_am | head -n 1`
|
60 |
|
|
+compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' $makefile_am | head -n 1`
|
61 |
|
|
for i in `ls -1`; do
|
62 |
|
|
if test -f $i/Makefile.am; then
|
63 |
|
|
case " $compilefirst $compilelast " in
|
64 |
|
|
@@ -318,11 +318,11 @@
|
65 |
|
|
done
|
66 |
|
|
|
67 |
|
|
(for d in $dirs; do
|
68 |
|
|
- list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" $makefile_am | head -1`
|
69 |
|
|
+ list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" $makefile_am | head -n 1`
|
70 |
|
|
for s in $list; do
|
71 |
|
|
echo $s $d
|
72 |
|
|
done
|
73 |
|
|
- list=`sed -ne "s#^COMPILE_AFTER_$d""[ ]*=[ ]*##p" $makefile_am | head -1`
|
74 |
|
|
+ list=`sed -ne "s#^COMPILE_AFTER_$d""[ ]*=[ ]*##p" $makefile_am | head -n 1`
|
75 |
|
|
for s in $list; do
|
76 |
|
|
echo $d $s
|
77 |
|
|
done
|
78 |
|
|
diff -ruN dclib-0.3.7-orig/admin/ltcf-c.sh dclib-0.3.7/admin/ltcf-c.sh
|
79 |
|
|
--- dclib-0.3.7-orig/admin/ltcf-c.sh Tue Nov 12 14:40:13 2002
|
80 |
|
|
+++ dclib-0.3.7/admin/ltcf-c.sh Mon Jan 16 14:52:14 2006
|
81 |
|
|
@@ -151,7 +151,7 @@
|
82 |
|
|
# If the export-symbols file already is a .def file (1st line
|
83 |
|
|
# is EXPORTS), use it as is.
|
84 |
|
|
# If DATA tags from a recent dlltool are present, honour them!
|
85 |
|
|
- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
|
86 |
|
|
+ archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
|
87 |
|
|
cp $export_symbols $output_objdir/$soname-def;
|
88 |
|
|
else
|
89 |
|
|
echo EXPORTS > $output_objdir/$soname-def;
|
90 |
|
|
diff -ruN dclib-0.3.7-orig/admin/ltcf-gcj.sh dclib-0.3.7/admin/ltcf-gcj.sh
|
91 |
|
|
--- dclib-0.3.7-orig/admin/ltcf-gcj.sh Tue Nov 12 14:40:13 2002
|
92 |
|
|
+++ dclib-0.3.7/admin/ltcf-gcj.sh Mon Jan 16 14:52:28 2006
|
93 |
|
|
@@ -154,7 +154,7 @@
|
94 |
|
|
# If the export-symbols file already is a .def file (1st line
|
95 |
|
|
# is EXPORTS), use it as is.
|
96 |
|
|
# If DATA tags from a recent dlltool are present, honour them!
|
97 |
|
|
- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
|
98 |
|
|
+ archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
|
99 |
|
|
cp $export_symbols $output_objdir/$soname-def;
|
100 |
|
|
else
|
101 |
|
|
echo EXPORTS > $output_objdir/$soname-def;
|
102 |
|
|
diff -ruN dclib-0.3.7-orig/configure.in dclib-0.3.7/configure.in
|
103 |
|
|
--- dclib-0.3.7-orig/configure.in Thu Feb 17 03:02:58 2005
|
104 |
|
|
+++ dclib-0.3.7/configure.in Mon Jan 16 14:49:03 2006
|
105 |
|
|
@@ -172,6 +172,8 @@
|
106 |
|
|
|
107 |
|
|
AC_STRUCT_SA_LEN
|
108 |
|
|
|
109 |
|
|
+AC_C_BIGENDIAN
|
110 |
|
|
+
|
111 |
|
|
dnl define datapath
|
112 |
|
|
AC_MSG_CHECKING([for DCLib-datapath])
|
113 |
|
|
DCLIB_DATAPATH=`echo $prefix/share`
|
114 |
|
|
diff -ruN dclib-0.3.7-orig/dclib/hash/tiger.cpp dclib-0.3.7/dclib/hash/tiger.cpp
|
115 |
|
|
--- dclib-0.3.7-orig/dclib/hash/tiger.cpp Thu Aug 12 08:44:35 2004
|
116 |
|
|
+++ dclib-0.3.7/dclib/hash/tiger.cpp Mon Jan 16 14:49:03 2006
|
117 |
|
|
@@ -18,7 +18,7 @@
|
118 |
|
|
#ifdef WORDS_BIGENDIAN
|
119 |
|
|
# define USE_BIG_ENDIAN 1
|
120 |
|
|
#else
|
121 |
|
|
-# define USE_BIG_ENDIAN 0
|
122 |
|
|
+# define USE_BIG_ENDIAN 1
|
123 |
|
|
#endif
|
124 |
|
|
|
125 |
|
|
/* The following macro denotes that an optimization */
|
126 |
|
|
diff -ruN dclib-0.3.7-orig/dclib/hash/tigertree.cpp dclib-0.3.7/dclib/hash/tigertree.cpp
|
127 |
|
|
--- dclib-0.3.7-orig/dclib/hash/tigertree.cpp Thu Aug 12 08:44:35 2004
|
128 |
|
|
+++ dclib-0.3.7/dclib/hash/tigertree.cpp Mon Jan 16 14:49:03 2006
|
129 |
|
|
@@ -34,7 +34,7 @@
|
130 |
|
|
#ifdef WORDS_BIGENDIAN
|
131 |
|
|
# define USE_BIG_ENDIAN 1
|
132 |
|
|
#else
|
133 |
|
|
-# define USE_BIG_ENDIAN 0
|
134 |
|
|
+# define USE_BIG_ENDIAN 1
|
135 |
|
|
#endif
|
136 |
|
|
void tt_endian(byte *s);
|
137 |
|
|
|