Merge lp:~brianaker/libdrizzle/autoreconf-zlib-fixes into lp:libdrizzle

[Brian Aker]

[Andrew Hutchings (linuxjedi)]

Yay! No autotools warnings! :)

review: Approve

=== modified file '.bootstrap'
--- .bootstrap	2012-12-19 12:07:00 +0000
+++ .bootstrap	2013-01-11 00:29:24 +0000
@@ -15,4 +15,3 @@
 # WARNINGS=
 BOOTSTRAP_SNAPSHOT=true
 BOOTSTRAP_SNAPSHOT_CHECK='configure'
-WARNINGS='all'
 
=== modified file 'm4/zlib.m4'
--- m4/zlib.m4	2012-12-29 17:31:57 +0000
+++ m4/zlib.m4	2013-01-11 00:29:24 +0000
@@ -1,6 +1,6 @@
  AC_DEFUN([AC_PATH_ZLIB], [
 	AC_ARG_WITH(zlib,
-                    AC_HELP_STRING([--with-zlib=DIR],
+                    AS_HELP_STRING([--with-zlib=DIR],
                                  [search for ZLIB in DIR/include and DIR/lib]),
                     [for dir in `echo "$withval" | tr : ' '`; do
     if test -d $dir/include; then
@@ -12,7 +12,7 @@
   done[]])
 
         AC_ARG_WITH(zlib-includes,
-                    AC_HELP_STRING([--with-zlib-includes=DIR],
+                    AS_HELP_STRING([--with-zlib-includes=DIR],
 	                           [search for ZLIB includes in DIR]),
 	            [for dir in `echo "$withval" | tr : ' '`; do
     if test -d $dir; then