Merge lp://qastaging/~brianaker/libdrizzle/versioned-include-path into lp://qastaging/libdrizzle
Proposed by
Brian Aker
| Status: | Merged |
|---|---|
| Approved by: | Andrew Hutchings |
| Approved revision: | 48 |
| Merged at revision: | 47 |
| Proposed branch: | lp://qastaging/~brianaker/libdrizzle/versioned-include-path |
| Merge into: | lp://qastaging/libdrizzle |
| Diff against target: |
591 lines (+146/-79) 31 files modified
configure.ac (+2/-2) libdrizzle-5.0/constants.h (+2/-2) libdrizzle-5.0/drizzle.h (+6/-6) libdrizzle-5.0/drizzle_client.h (+13/-13) libdrizzle-5.0/include.am (+27/-0) libdrizzle-5.0/structs.h (+48/-0) libdrizzle/binlog.c (+2/-1) libdrizzle/column.c (+2/-1) libdrizzle/command.c (+2/-1) libdrizzle/common.h (+3/-2) libdrizzle/conn.c (+2/-1) libdrizzle/conn_uds.c (+2/-1) libdrizzle/drizzle.c (+2/-1) libdrizzle/field.c (+2/-1) libdrizzle/handshake.c (+2/-1) libdrizzle/include.am (+5/-30) libdrizzle/pack.c (+2/-1) libdrizzle/result.c (+2/-1) libdrizzle/row.c (+2/-1) libdrizzle/sha1.c (+2/-1) libdrizzle/ssl.c (+4/-2) libdrizzle/state.c (+2/-1) tests/unit/binlog.c (+2/-1) tests/unit/connect.c (+1/-1) tests/unit/escape.c (+1/-1) tests/unit/hex.c (+1/-1) tests/unit/insert_id.c (+1/-1) tests/unit/passwd.c (+1/-1) tests/unit/query.c (+1/-1) tests/unit/unbuffered_query.c (+1/-1) tests/unit/version.c (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~brianaker/libdrizzle/versioned-include-path |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrew Hutchings | Approve | ||
|
Review via email:
|
|||
Description of the change
Version the include path. Lowers version of autoconf require so that FC17 and Ubuntu 12.04 can build.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
damn, something I ran must have switched AC_PREREQ. Thanks for fixing that!