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

Proposed by Brian Aker
Status: Merged
Approved by: Andrew Hutchings
Approved revision: 87
Merged at revision: 87
Proposed branch: lp:~brianaker/libdrizzle/autoreconf-zlib-fixes
Merge into: lp:libdrizzle
Diff against target: 29 lines (+2/-3)
2 files modified
.bootstrap (+0/-1)
m4/zlib.m4 (+2/-2)
To merge this branch: bzr merge lp:~brianaker/libdrizzle/autoreconf-zlib-fixes
Reviewer Review Type Date Requested Status
Andrew Hutchings Approve
Review via email: mp+142817@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andrew Hutchings (linuxjedi) wrote :

Yay! No autotools warnings! :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bootstrap'
2--- .bootstrap 2012-12-19 12:07:00 +0000
3+++ .bootstrap 2013-01-11 00:29:24 +0000
4@@ -15,4 +15,3 @@
5 # WARNINGS=
6 BOOTSTRAP_SNAPSHOT=true
7 BOOTSTRAP_SNAPSHOT_CHECK='configure'
8-WARNINGS='all'
9
10=== modified file 'm4/zlib.m4'
11--- m4/zlib.m4 2012-12-29 17:31:57 +0000
12+++ m4/zlib.m4 2013-01-11 00:29:24 +0000
13@@ -1,6 +1,6 @@
14 AC_DEFUN([AC_PATH_ZLIB], [
15 AC_ARG_WITH(zlib,
16- AC_HELP_STRING([--with-zlib=DIR],
17+ AS_HELP_STRING([--with-zlib=DIR],
18 [search for ZLIB in DIR/include and DIR/lib]),
19 [for dir in `echo "$withval" | tr : ' '`; do
20 if test -d $dir/include; then
21@@ -12,7 +12,7 @@
22 done[]])
23
24 AC_ARG_WITH(zlib-includes,
25- AC_HELP_STRING([--with-zlib-includes=DIR],
26+ AS_HELP_STRING([--with-zlib-includes=DIR],
27 [search for ZLIB includes in DIR]),
28 [for dir in `echo "$withval" | tr : ' '`; do
29 if test -d $dir; then

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: