do not add needless -I/usr/include

git-svn: trunk@1094

clamav-devel/ChangeLog

@@ -1,3 +1,7 @@
+Sat Nov 13 17:00:28 CET 2004 (tk)
+---------------------------------
+  * configure: do not add needless -I/usr/include
+
 Sat Nov 13 15:45:38 CET 2004 (tk)
 ---------------------------------
   * libclamav, clamd: readdir_r code: fix compilation error on systems that

clamav-devel/configure

@@ -10204,9 +10204,10 @@ echo "$as_me: error: Installed zlib version contains a security bug. Please inst
    { (exit 1); exit 1; }; }
     fi
 
-    LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
-    CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"
-    echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
+    if test "$ZLIB_HOME" != "/usr"; then
+	LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
+	CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"
+	echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
 echo $ECHO_N "checking for inflateEnd in -lz... $ECHO_C" >&6
 if test "${ac_cv_lib_z_inflateEnd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10281,6 +10282,83 @@ echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
+    else
+	echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
+echo $ECHO_N "checking for inflateEnd in -lz... $ECHO_C" >&6
+if test "${ac_cv_lib_z_inflateEnd+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char inflateEnd ();
+int
+main ()
+{
+inflateEnd ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_z_inflateEnd=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_z_inflateEnd=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5
+echo "${ECHO_T}$ac_cv_lib_z_inflateEnd" >&6
+if test $ac_cv_lib_z_inflateEnd = yes; then
+  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ZLIB_H 1
+_ACEOF
+
+else
+  { { echo "$as_me:$LINENO: error: Please install zlib and zlib-devel packages" >&5
+echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+    fi
 fi
 
 want_bzip2="yes"

clamav-devel/configure.in

@@ -105,9 +105,13 @@ else
 	AC_MSG_ERROR(Installed zlib version contains a security bug. Please install version 1.2.2 or later.)
     fi
 
-    LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
-    CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"
-    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))
+    if test "$ZLIB_HOME" != "/usr"; then
+	LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
+	CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"
+	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))
+    else
+	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))
+    fi
 fi
 
 want_bzip2="yes"