Lines 25-31
Link Here
|
25 |
DEFAULT_CFLAGS += -I. -I$(top_srcdir) |
25 |
DEFAULT_CFLAGS += -I. -I$(top_srcdir) |
26 |
DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) |
26 |
DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) |
27 |
+DEFAULT_CFLAGS += $(SOLARINC) |
27 |
+DEFAULT_CFLAGS += $(SOLARINC) |
28 |
+DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/zlib -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DZLIB_FIX |
28 |
+DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/external/zlib -I$(SOLARVER)/$(INPATH)/inc/external/libpng |
29 |
|
29 |
|
30 |
CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS) |
30 |
CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS) |
31 |
|
31 |
|
Lines 76-192
Link Here
|
76 |
lt_cv_file_magic_cmd='func_win32_libid' |
76 |
lt_cv_file_magic_cmd='func_win32_libid' |
77 |
else |
77 |
else |
78 |
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
78 |
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
79 |
@@ -25304,19 +25304,39 @@ |
79 |
@@ -25304,13 +25304,13 @@ |
80 |
rm -f confcache |
80 |
rm -f confcache |
81 |
|
81 |
|
82 |
|
82 |
|
83 |
-{ echo "$as_me:$LINENO: checking for compress in -lz" >&5 |
83 |
-{ echo "$as_me:$LINENO: checking for compress in -lz" >&5 |
84 |
-echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6; } |
84 |
-echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6; } |
85 |
-if test "${ac_cv_lib_z_compress+set}" = set; then |
85 |
+{ echo "$as_me:$LINENO: checking for compress in $ZLIB3RDLIB" >&5 |
86 |
+save_libs="$LIBS" |
86 |
+echo $ECHO_N "checking for compress in $ZLIB3RDLIB... $ECHO_C" >&6; } |
87 |
+LIBS="$LIBS $ZLIB3RDLIB" |
87 |
if test "${ac_cv_lib_z_compress+set}" = set; then |
88 |
+ |
|
|
89 |
+for ac_func in $COMPRESS |
90 |
+do |
91 |
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
92 |
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 |
93 |
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } |
94 |
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then |
95 |
echo $ECHO_N "(cached) $ECHO_C" >&6 |
88 |
echo $ECHO_N "(cached) $ECHO_C" >&6 |
96 |
else |
89 |
else |
97 |
- ac_check_lib_save_LIBS=$LIBS |
90 |
ac_check_lib_save_LIBS=$LIBS |
98 |
-LIBS="-lz $LIBS" |
91 |
-LIBS="-lz $LIBS" |
99 |
-cat >conftest.$ac_ext <<_ACEOF |
92 |
+LIBS="$ZLIB3RDLIB $LIBS" |
100 |
+ cat >conftest.$ac_ext <<_ACEOF |
93 |
cat >conftest.$ac_ext <<_ACEOF |
101 |
/* confdefs.h. */ |
94 |
/* confdefs.h. */ |
102 |
_ACEOF |
95 |
_ACEOF |
103 |
cat confdefs.h >>conftest.$ac_ext |
96 |
@@ -34097,7 +34097,7 @@ |
104 |
cat >>conftest.$ac_ext <<_ACEOF |
|
|
105 |
/* end confdefs.h. */ |
106 |
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. |
107 |
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ |
108 |
+#define $ac_func innocuous_$ac_func |
109 |
+ |
110 |
+/* System header to define __stub macros and hopefully few prototypes, |
111 |
+ which can conflict with char $ac_func (); below. |
112 |
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
113 |
+ <limits.h> exists even on freestanding compilers. */ |
114 |
+ |
115 |
+#ifdef __STDC__ |
116 |
+# include <limits.h> |
117 |
+#else |
118 |
+# include <assert.h> |
119 |
+#endif |
120 |
+ |
121 |
+#undef $ac_func |
122 |
|
123 |
/* Override any GCC internal prototype to avoid an error. |
124 |
Use char because int might match the return type of a GCC |
125 |
@@ -25324,11 +25344,18 @@ |
126 |
#ifdef __cplusplus |
127 |
extern "C" |
128 |
#endif |
129 |
-char compress (); |
130 |
+char $ac_func (); |
131 |
+/* The GNU C library defines this for functions which it implements |
132 |
+ to always fail with ENOSYS. Some functions are actually named |
133 |
+ something starting with __ and the normal name is an alias. */ |
134 |
+#if defined __stub_$ac_func || defined __stub___$ac_func |
135 |
+choke me |
136 |
+#endif |
137 |
+ |
138 |
int |
139 |
main () |
140 |
{ |
141 |
-return compress (); |
142 |
+return $ac_func (); |
143 |
; |
144 |
return 0; |
145 |
} |
146 |
@@ -25351,22 +25378,25 @@ |
147 |
test ! -s conftest.err |
148 |
} && test -s conftest$ac_exeext && |
149 |
$as_test_x conftest$ac_exeext; then |
150 |
- ac_cv_lib_z_compress=yes |
151 |
+ eval "$as_ac_var=yes" |
152 |
else |
153 |
echo "$as_me: failed program was:" >&5 |
154 |
sed 's/^/| /' conftest.$ac_ext >&5 |
155 |
|
156 |
- ac_cv_lib_z_compress=no |
157 |
+ eval "$as_ac_var=no" |
158 |
fi |
159 |
|
160 |
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
161 |
conftest$ac_exeext conftest.$ac_ext |
162 |
-LIBS=$ac_check_lib_save_LIBS |
163 |
fi |
164 |
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5 |
165 |
-echo "${ECHO_T}$ac_cv_lib_z_compress" >&6; } |
166 |
-if test $ac_cv_lib_z_compress = yes; then |
167 |
- if test "${ac_cv_header_zlib_h+set}" = set; then |
168 |
+ac_res=`eval echo '${'$as_ac_var'}'` |
169 |
+ { echo "$as_me:$LINENO: result: $ac_res" >&5 |
170 |
+echo "${ECHO_T}$ac_res" >&6; } |
171 |
+if test `eval echo '${'$as_ac_var'}'` = yes; then |
172 |
+ cat >>confdefs.h <<_ACEOF |
173 |
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
174 |
+_ACEOF |
175 |
+ if test "${ac_cv_header_zlib_h+set}" = set; then |
176 |
{ echo "$as_me:$LINENO: checking for zlib.h" >&5 |
177 |
echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } |
178 |
if test "${ac_cv_header_zlib_h+set}" = set; then |
179 |
@@ -25506,7 +25536,9 @@ |
180 |
else |
181 |
have_libz="no (requires zlib http://www.gzip.org/zlib/)" |
182 |
fi |
183 |
+done |
184 |
|
185 |
+LIBS="$save_libs" |
186 |
|
187 |
|
188 |
{ echo "$as_me:$LINENO: checking for X" >&5 |
189 |
@@ -34097,7 +34129,7 @@ |
190 |
|
97 |
|
191 |
# The ps backend requires zlib. |
98 |
# The ps backend requires zlib. |
192 |
use_ps=$have_libz |
99 |
use_ps=$have_libz |
Lines 195-201
Link Here
|
195 |
|
102 |
|
196 |
cairo_cv_ps_use=$use_ps |
103 |
cairo_cv_ps_use=$use_ps |
197 |
cairo_cv_ps_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" |
104 |
cairo_cv_ps_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" |
198 |
@@ -34444,7 +34476,7 @@ |
105 |
@@ -34444,7 +34444,7 @@ |
199 |
|
106 |
|
200 |
# The pdf backend requires zlib. |
107 |
# The pdf backend requires zlib. |
201 |
use_pdf=$have_libz |
108 |
use_pdf=$have_libz |
Lines 204-251
Link Here
|
204 |
|
111 |
|
205 |
cairo_cv_pdf_use=$use_pdf |
112 |
cairo_cv_pdf_use=$use_pdf |
206 |
cairo_cv_pdf_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" |
113 |
cairo_cv_pdf_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" |
207 |
diff -ur misc/build/cairo-1.8.0.org/src/cairo-deflate-stream.c misc/build/cairo-1.8.0/src/cairo-deflate-stream.c |
|
|