1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
diff -ruN argus-3.0.8.2.orig/common/Makefile.in argus-3.0.8.2/common/Makefile.in
--- argus-3.0.8.2.orig/common/Makefile.in 2015-04-14 14:32:33.000000000 -0000
+++ argus-3.0.8.2/common/Makefile.in 2017-09-25 10:27:16.272856331 -0000
@@ -35,12 +35,12 @@
CC = @CC@
CCOPT = @V_CCOPT@
-INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include -I$(srcdir)/../argus
+INCLS = -I$(srcdir) @V_INCLS@ @RPC_CFLAGS@ -I$(srcdir)/../include -I$(srcdir)/../argus
DEFS = @DEFS@
# Standard CFLAGS
CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ @RPC_LIBS@
INSTALL = @INSTALL@
RANLIB = @V_RANLIB@
diff -ruN argus-3.0.8.2.orig/configure.ac argus-3.0.8.2/configure.ac
--- argus-3.0.8.2.orig/configure.ac 2017-09-25 10:20:04.155174606 -0000
+++ argus-3.0.8.2/configure.ac 2017-09-25 10:24:39.151904377 -0000
@@ -120,6 +120,25 @@
AC_CHECK_FUNCS(floorf remainderf)
AC_CHECK_FUNCS(timegm)
+AC_ARG_WITH([libtirpc],
+ AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
+ [], [ with_libtirpc=no ])
+
+AS_IF([test "x$with_libtirpc" != xno],
+ [PKG_CHECK_MODULES([TIRPC],
+ [libtirpc],
+ [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
+ [AC_MSG_ERROR([libtirpc requested, but library not found.])]
+ )],
+ [AC_CHECK_HEADER(rpc/rpc.h,
+ [RPC_CFLAGS=""; RPC_LIBS="";],
+ [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
+ )]
+)
+
+AC_SUBST(RPC_CFLAGS)
+AC_SUBST(RPC_LIBS)
+
AC_CHECK_FUNCS(xdrmem_create)
if test "$ac_cv_func_xdrmem_create" = yes ; then
AC_DEFINE([HAVE_XDR], [], [Using system XDR library])
|