Merge lp:~brianaker/gearmand/remove-dead-target into lp:gearmand

Proposed by Brian Aker on 2013-07-09
Status: Merged
Merged at revision: 818
Proposed branch: lp:~brianaker/gearmand/remove-dead-target
Merge into: lp:gearmand
Diff against target: 106 lines (+16/-21)
4 files modified
configure.ac (+1/-1)
libgearman/include.am (+1/-1)
m4/ax_platform.m4 (+12/-17)
tests/hostile.am (+2/-2)
To merge this branch: bzr merge lp:~brianaker/gearmand/remove-dead-target
Reviewer Review Type Date Requested Status
Tangent Trunk 2013-07-09 Pending
Review via email: mp+173677@code.launchpad.net
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
1=== modified file 'configure.ac'
2--- configure.ac 2013-07-06 00:33:10 +0000
3+++ configure.ac 2013-07-09 09:29:25 +0000
4@@ -13,7 +13,7 @@
5 AC_CONFIG_AUX_DIR([build-aux])
6 AC_CONFIG_MACRO_DIR([m4])
7
8-AC_CANONICAL_TARGET
9+AC_CANONICAL_HOST
10 AC_ARG_PROGRAM
11 AC_USE_SYSTEM_EXTENSIONS
12
13
14=== modified file 'libgearman/include.am'
15--- libgearman/include.am 2013-06-15 07:55:07 +0000
16+++ libgearman/include.am 2013-07-09 09:29:25 +0000
17@@ -143,7 +143,7 @@
18 libgearman_libgearman_la_LIBADD+= @LIBUUID_LIB@
19 libgearman_libgearman_la_LIBADD+= libhashkit/libhashkit.la
20
21-if TARGET_LINUX
22+if HOST_LINUX
23 libgearman_libgearman_la_LIBADD+= @LIBM@
24 endif
25
26
27=== modified file 'm4/ax_platform.m4'
28--- m4/ax_platform.m4 2013-04-27 04:10:37 +0000
29+++ m4/ax_platform.m4 2013-07-09 09:29:25 +0000
30@@ -19,24 +19,19 @@
31 # and this notice are preserved. This file is offered as-is, without any
32 # warranty.
33
34-#serial 3
35+#serial 4
36 #
37 AC_DEFUN([AX_PLATFORM],
38 [AC_REQUIRE([AC_CANONICAL_HOST])
39- AC_REQUIRE([AC_CANONICAL_TARGET])
40
41 AC_DEFINE_UNQUOTED([HOST_VENDOR],["$host_vendor"],[Vendor of Build System])
42 AC_DEFINE_UNQUOTED([HOST_OS],["$host_os"], [OS of Build System])
43 AC_DEFINE_UNQUOTED([HOST_CPU],["$host_cpu"], [CPU of Build System])
44
45- AC_DEFINE_UNQUOTED([TARGET_VENDOR],["$target_vendor"],[Vendor of Target System])
46- AC_DEFINE_UNQUOTED([TARGET_OS],["$target_os"], [OS of Target System])
47- AC_DEFINE_UNQUOTED([TARGET_CPU],["$target_cpu"], [CPU of Target System])
48-
49 AS_CASE([$target_os],
50 [*mingw*],
51- [TARGET_WINDOWS="true"
52- AC_DEFINE([TARGET_OS_WINDOWS], [1], [Whether we are building for Windows])
53+ [HOST_WINDOWS="true"
54+ AC_DEFINE([HOST_OS_WINDOWS], [1], [Whether we are building for Windows])
55 AC_DEFINE([EAI_SYSTEM], [11], [Another magical number])
56 AH_BOTTOM([
57 #ifndef HAVE_SYS_SOCKET_H
58@@ -45,17 +40,17 @@
59 # define SHUT_RDWR SD_BOTH
60 #endif
61 ])],
62- [*freebsd*],[AC_DEFINE([TARGET_OS_FREEBSD],[1],[Whether we are building for FreeBSD])
63+ [*freebsd*],[AC_DEFINE([HOST_OS_FREEBSD],[1],[Whether we are building for FreeBSD])
64 AC_DEFINE([__APPLE_CC__],[1],[Workaround for bug in FreeBSD headers])],
65- [*solaris*],[AC_DEFINE([TARGET_OS_SOLARIS],[1],[Whether we are building for Solaris])],
66+ [*solaris*],[AC_DEFINE([HOST_OS_SOLARIS],[1],[Whether we are building for Solaris])],
67 [*darwin*],
68- [TARGET_OSX="true"],
69+ [HOST_OSX="true"],
70 [*linux*],
71- [TARGET_LINUX="true"
72- AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])])
73+ [HOST_LINUX="true"
74+ AC_DEFINE([HOST_OS_LINUX],[1],[Whether we build for Linux])])
75
76- AM_CONDITIONAL([BUILD_WIN32],[test "x${TARGET_WINDOWS}" = "xtrue"])
77- AM_CONDITIONAL([TARGET_OSX],[test "x${TARGET_OSX}" = "xtrue"])
78- AM_CONDITIONAL([TARGET_LINUX],[test "x${TARGET_LINUX}" = "xtrue"])
79- AM_CONDITIONAL([TARGET_FREEBSD],[test "x${TARGET_OS_FREEBSD}" = "xtrue"])
80+ AM_CONDITIONAL([BUILD_WIN32],[test "x${HOST_WINDOWS}" = "xtrue"])
81+ AM_CONDITIONAL([HOST_OSX],[test "x${HOST_OSX}" = "xtrue"])
82+ AM_CONDITIONAL([HOST_LINUX],[test "x${HOST_LINUX}" = "xtrue"])
83+ AM_CONDITIONAL([HOST_FREEBSD],[test "x${HOST_OS_FREEBSD}" = "xtrue"])
84 ])
85
86=== modified file 'tests/hostile.am'
87--- tests/hostile.am 2013-07-03 03:54:06 +0000
88+++ tests/hostile.am 2013-07-09 09:29:25 +0000
89@@ -18,7 +18,7 @@
90 t_hostile_gearmand_CXXFLAGS+= -DHAVE_LIBHOSTILE=1
91 t_hostile_gearmand_CFLAGS+= -DHAVE_LIBHOSTILE=1
92 t_hostile_gearmand_LDADD+= libhostile/libhostile.la
93-if TARGET_LINUX
94+if HOST_LINUX
95 t_hostile_gearmand_LDADD+= @DL_LIB@
96 t_hostile_gearmand_LDADD+= @RT_LIB@
97 endif
98@@ -49,7 +49,7 @@
99 t_hostile_libgearman_CXXFLAGS+= -DSERVER_TARGET="\"gearmand\""
100 t_hostile_libgearman_CFLAGS+= -DSERVER_TARGET="\"gearmand\""
101 t_hostile_libgearman_LDADD+= libhostile/libhostile.la
102-if TARGET_LINUX
103+if HOST_LINUX
104 t_hostile_libgearman_LDADD+= @DL_LIB@
105 t_hostile_libgearman_LDADD+= @RT_LIB@
106 endif

Subscribers

People subscribed via source and target branches

to all changes: