Removed special handling of zlib in the configure script

Now it's handled like all other libraries, and no longer adds an
useless -I/usr/include option

Signed-off-by: Haru <haru@dotalux.com>

2 files changed, 5 insertions, 59 deletions

diff --git a/configure b/configure
index d343d11a4..d558217c6 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 730fede.
+# From configure.in 8ca4506.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -708,7 +708,6 @@ with_maxconn
 with_mysql
 with_MYSQL_CFLAGS
 with_MYSQL_LIBS
-with_zlib
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1387,10 +1386,6 @@ Optional Packages:
                           "mysql_config --include")
   --with-MYSQL_LIBS=ARG   specify MYSQL_LIBS manually (instead of using
                           "mysql_config --libs")
-  --with-zlib=DIR         root directory path of zlib installation (defaults
-                          to /usr/local or /usr if not found in /usr/local).
-                          Assumes that the header files are in DIR/include and
-                          the library files are in DIR/lib
 
 Some influential environment variables:
   CC          C compiler command
@@ -3811,26 +3806,6 @@ fi
 
 
 
-#
-# Specify the path of the zlib library (required library)
-#
-
-# Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then :
-  withval=$with_zlib;
-		test -n "$withval" && ZLIB_HOME="$withval"
-
-else
-
-		ZLIB_HOME=/usr/local
-		test ! -f "${ZLIB_HOME}/include/zlib.h" && ZLIB_HOME=/usr
-
-
-fi
-
-
-
-
 ###############################################################################
 # Check for programs and types.
 #
@@ -7275,10 +7250,6 @@ fi
 #
 # zlib library (required)
 #
-if test -n "${ZLIB_HOME}" ; then
-	LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
-	CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
-fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inflateEnd" >&5
 $as_echo_n "checking for library containing inflateEnd... " >&6; }
 if ${ac_cv_search_inflateEnd+:} false; then :
@@ -7334,14 +7305,14 @@ if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 else
-  as_fn_error $? "zlib library not found or incompatible, please specify the correct path with --with-zlib=DIR... stopping" "$LINENO" 5
+  as_fn_error $? "zlib library not found or incompatible... stopping" "$LINENO" 5
 fi
 
 ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
 if test "x$ac_cv_header_zlib_h" = xyes; then :
 
 else
-  as_fn_error $? "zlib header not found, please specify the correct path with --with-zlib=DIR... stopping" "$LINENO" 5
+  as_fn_error $? "zlib header not found, please specify the correct path with... stopping" "$LINENO" 5
 fi
 
 
diff --git a/configure.in b/configure.in
index 729a8f38e..c8bc3a864 100644
--- a/configure.in
+++ b/configure.in
@@ -443,27 +443,6 @@ AC_ARG_WITH(
 )
 
 
-#
-# Specify the path of the zlib library (required library)
-#
-AC_ARG_WITH(
-	[zlib],
-	AC_HELP_STRING(
-		[--with-zlib=DIR],
-		[root directory path of zlib installation (defaults to /usr/local or /usr if not found in /usr/local).
-		 Assumes that the header files are in DIR/include and the library files are in DIR/lib]
-	),
-	[
-		test -n "$withval" && ZLIB_HOME="$withval"
-	],
-	[
-		ZLIB_HOME=/usr/local
-		test ! -f "${ZLIB_HOME}/include/zlib.h" && ZLIB_HOME=/usr
-	]
-)
-
-
-
 ###############################################################################
 # Check for programs and types.
 #
@@ -1173,12 +1152,8 @@ fi
 #
 # zlib library (required)
 #
-if test -n "${ZLIB_HOME}" ; then
-	LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
-	CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
-fi
-AC_SEARCH_LIBS([inflateEnd], [z], [],[AC_MSG_ERROR([zlib library not found or incompatible, please specify the correct path with --with-zlib=DIR... stopping])])
-AC_CHECK_HEADER([zlib.h], [], [AC_MSG_ERROR([zlib header not found, please specify the correct path with --with-zlib=DIR... stopping])])
+AC_SEARCH_LIBS([inflateEnd], [z], [],[AC_MSG_ERROR([zlib library not found or incompatible... stopping])])
+AC_CHECK_HEADER([zlib.h], [], [AC_MSG_ERROR([zlib header not found, please specify the correct path with... stopping])])
 
 
 #