git-svn: trunk@1094
Tomasz Kojm authored on 2004/11/14 01:03:46... | ... |
@@ -1,3 +1,7 @@ |
1 |
+Sat Nov 13 17:00:28 CET 2004 (tk) |
|
2 |
+--------------------------------- |
|
3 |
+ * configure: do not add needless -I/usr/include |
|
4 |
+ |
|
1 | 5 |
Sat Nov 13 15:45:38 CET 2004 (tk) |
2 | 6 |
--------------------------------- |
3 | 7 |
* libclamav, clamd: readdir_r code: fix compilation error on systems that |
... | ... |
@@ -10204,9 +10204,10 @@ echo "$as_me: error: Installed zlib version contains a security bug. Please inst |
10204 | 10204 |
{ (exit 1); exit 1; }; } |
10205 | 10205 |
fi |
10206 | 10206 |
|
10207 |
- LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib" |
|
10208 |
- CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include" |
|
10209 |
- echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5 |
|
10207 |
+ if test "$ZLIB_HOME" != "/usr"; then |
|
10208 |
+ LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib" |
|
10209 |
+ CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include" |
|
10210 |
+ echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5 |
|
10210 | 10211 |
echo $ECHO_N "checking for inflateEnd in -lz... $ECHO_C" >&6 |
10211 | 10212 |
if test "${ac_cv_lib_z_inflateEnd+set}" = set; then |
10212 | 10213 |
echo $ECHO_N "(cached) $ECHO_C" >&6 |
... | ... |
@@ -10281,6 +10282,83 @@ echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;} |
10281 | 10281 |
{ (exit 1); exit 1; }; } |
10282 | 10282 |
fi |
10283 | 10283 |
|
10284 |
+ else |
|
10285 |
+ echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5 |
|
10286 |
+echo $ECHO_N "checking for inflateEnd in -lz... $ECHO_C" >&6 |
|
10287 |
+if test "${ac_cv_lib_z_inflateEnd+set}" = set; then |
|
10288 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
10289 |
+else |
|
10290 |
+ ac_check_lib_save_LIBS=$LIBS |
|
10291 |
+LIBS="-lz $LIBS" |
|
10292 |
+cat >conftest.$ac_ext <<_ACEOF |
|
10293 |
+/* confdefs.h. */ |
|
10294 |
+_ACEOF |
|
10295 |
+cat confdefs.h >>conftest.$ac_ext |
|
10296 |
+cat >>conftest.$ac_ext <<_ACEOF |
|
10297 |
+/* end confdefs.h. */ |
|
10298 |
+ |
|
10299 |
+/* Override any gcc2 internal prototype to avoid an error. */ |
|
10300 |
+#ifdef __cplusplus |
|
10301 |
+extern "C" |
|
10302 |
+#endif |
|
10303 |
+/* We use char because int might match the return type of a gcc2 |
|
10304 |
+ builtin and then its argument prototype would still apply. */ |
|
10305 |
+char inflateEnd (); |
|
10306 |
+int |
|
10307 |
+main () |
|
10308 |
+{ |
|
10309 |
+inflateEnd (); |
|
10310 |
+ ; |
|
10311 |
+ return 0; |
|
10312 |
+} |
|
10313 |
+_ACEOF |
|
10314 |
+rm -f conftest.$ac_objext conftest$ac_exeext |
|
10315 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
|
10316 |
+ (eval $ac_link) 2>conftest.er1 |
|
10317 |
+ ac_status=$? |
|
10318 |
+ grep -v '^ *+' conftest.er1 >conftest.err |
|
10319 |
+ rm -f conftest.er1 |
|
10320 |
+ cat conftest.err >&5 |
|
10321 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
10322 |
+ (exit $ac_status); } && |
|
10323 |
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
|
10324 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
|
10325 |
+ (eval $ac_try) 2>&5 |
|
10326 |
+ ac_status=$? |
|
10327 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
10328 |
+ (exit $ac_status); }; } && |
|
10329 |
+ { ac_try='test -s conftest$ac_exeext' |
|
10330 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
|
10331 |
+ (eval $ac_try) 2>&5 |
|
10332 |
+ ac_status=$? |
|
10333 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
10334 |
+ (exit $ac_status); }; }; then |
|
10335 |
+ ac_cv_lib_z_inflateEnd=yes |
|
10336 |
+else |
|
10337 |
+ echo "$as_me: failed program was:" >&5 |
|
10338 |
+sed 's/^/| /' conftest.$ac_ext >&5 |
|
10339 |
+ |
|
10340 |
+ac_cv_lib_z_inflateEnd=no |
|
10341 |
+fi |
|
10342 |
+rm -f conftest.err conftest.$ac_objext \ |
|
10343 |
+ conftest$ac_exeext conftest.$ac_ext |
|
10344 |
+LIBS=$ac_check_lib_save_LIBS |
|
10345 |
+fi |
|
10346 |
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5 |
|
10347 |
+echo "${ECHO_T}$ac_cv_lib_z_inflateEnd" >&6 |
|
10348 |
+if test $ac_cv_lib_z_inflateEnd = yes; then |
|
10349 |
+ LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz"; |
|
10350 |
+cat >>confdefs.h <<\_ACEOF |
|
10351 |
+#define HAVE_ZLIB_H 1 |
|
10352 |
+_ACEOF |
|
10353 |
+ |
|
10354 |
+else |
|
10355 |
+ { { echo "$as_me:$LINENO: error: Please install zlib and zlib-devel packages" >&5 |
|
10356 |
+echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;} |
|
10357 |
+ { (exit 1); exit 1; }; } |
|
10358 |
+fi |
|
10359 |
+ |
|
10360 |
+ fi |
|
10284 | 10361 |
fi |
10285 | 10362 |
|
10286 | 10363 |
want_bzip2="yes" |
... | ... |
@@ -105,9 +105,13 @@ else |
105 | 105 |
AC_MSG_ERROR(Installed zlib version contains a security bug. Please install version 1.2.2 or later.) |
106 | 106 |
fi |
107 | 107 |
|
108 |
- LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib" |
|
109 |
- CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include" |
|
110 |
- AC_CHECK_LIB(z, inflateEnd, [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"; AC_DEFINE(HAVE_ZLIB_H,1,zlib installed)], AC_MSG_ERROR(Please install zlib and zlib-devel packages)) |
|
108 |
+ if test "$ZLIB_HOME" != "/usr"; then |
|
109 |
+ LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib" |
|
110 |
+ CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include" |
|
111 |
+ AC_CHECK_LIB(z, inflateEnd, [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"; AC_DEFINE(HAVE_ZLIB_H,1,zlib installed)], AC_MSG_ERROR(Please install zlib and zlib-devel packages)) |
|
112 |
+ else |
|
113 |
+ AC_CHECK_LIB(z, inflateEnd, [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz"; AC_DEFINE(HAVE_ZLIB_H,1,zlib installed)], AC_MSG_ERROR(Please install zlib and zlib-devel packages)) |
|
114 |
+ fi |
|
111 | 115 |
fi |
112 | 116 |
|
113 | 117 |
want_bzip2="yes" |