build system: Actually link with libxnet and use CPPFLAGS.

(Instead of CFLAGS.)

diff --git a/configure.ac b/configure.ac
index c6153792d7616d9b5cf175f277837e6a854ef395..631e72d5293bc432209f0057ad2597309e5479ab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -169,11 +169,13 @@ AC_CHECK_FUNCS(socket, [],
                AC_MSG_ERROR(cannot find socket)))
 AM_CONDITIONAL(BUILD_WITH_LIBSOCKET, test "x$socket_needs_socket" = "xyes")
 
+# Under Solaris, the `xnet' library provides `recvmsg' which complies with the
+# X/Open CAE Specification.
 with_libxnet="no"
 AC_CHECK_LIB(xnet, __xnet_recvmsg, [with_libxnet="yes"],[])
 if test "x$with_libxnet" = "xyes"
 then
-       CFLAGS="$CFLAGS -D_XPG4_2 -D__EXTENSIONS__"
+       CPPFLAGS="$CPPFLAGS -D_XPG4_2 -D__EXTENSIONS__"
 fi
 AM_CONDITIONAL(BUILD_WITH_LIBXNET, test "x$with_libxnet" = "xyes")
 

diff --git a/src/Makefile.am b/src/Makefile.am
index f773f87f01fb1c403c317722416f0568bc46e9db..8bd885c946ce71211fd4cd9c4a9fb92c2124a0f2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,6 +25,10 @@ liboping_la_LDFLAGS = -version-info @LIBOPING_CURRENT@:@LIBOPING_REVISION@:@LIBO
 if BUILD_WITH_LIBSOCKET
 liboping_la_LDFLAGS += -lsocket
 endif
+if BUILD_WITH_LIBXNET
+liboping_la_LDFLAGS += -lxnet
+endif
+
 liboping_la_SOURCES = oping.h liboping.c
 
 bin_PROGRAMS = oping