From 5746b68ba9dda87586b3ac88fe84031cbc0015f7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 11 May 2018 12:20:03 -0700
Subject: [PATCH] Link with libtirpc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending

 configure                 | 2 +-
 rpc.rusersd/rusers_proc.c | 7 +------
 rpc.rusersd/rusersd.c     | 6 +-----
 rup/rup.c                 | 2 +-
 4 files changed, 4 insertions(+), 13 deletions(-)

--- a/configure
+++ b/configure
@@ -92,7 +92,6 @@ else
     echo -n 'Checking if C compiler works... '
     if (
           $CC __conftest.c -o __conftest || exit 1
-          ./__conftest || exit 1
        ) >/dev/null 2>&1; then
          echo 'yes'
      else
@@ -146,8 +145,7 @@ else
 
 fi
 
-LDFLAGS=
-LIBS=
+LIBS="$LIBS -ltirpc"
 
 rm -f __conftest*
 
@@ -172,13 +170,11 @@ int main() {
 EOF
 if (
       $CC $CFLAGS  __conftest.c  -o __conftest || exit 1
-      ./__conftest || exit 1
    ) >/dev/null 2>&1; then
     echo 'yes'
 else
     if (
           $CC $CFLAGS -D__USE_BSD_SIGNAL __conftest.c  -o __conftest || exit 1
-          ./__conftest || exit 1
        ) >/dev/null 2>&1; then
         echo '-D__USE_BSD_SIGNAL'
         CFLAGS="$CFLAGS -D__USE_BSD_SIGNAL"
@@ -231,7 +227,6 @@ if (
 else
     if (
           $CC $CFLAGS -D_GNU_SOURCE __conftest.c  -o __conftest || exit 1
-          ./__conftest || exit 1
        ) >/dev/null 2>&1; then
         echo '-D_GNU_SOURCE'
         CFLAGS="$CFLAGS -D_GNU_SOURCE"
@@ -262,20 +257,17 @@ int main() {
 EOF
 if (
       $CC $CFLAGS  __conftest.c $LIBBSD -o __conftest || exit 1
-      ./__conftest || exit 1
    ) >/dev/null 2>&1; then
     echo 'ok'
 else
     if (
           $CC $CFLAGS  __conftest.c -lsnprintf $LIBBSD -o __conftest || exit 1
-          ./__conftest || exit 1
        ) >/dev/null 2>&1; then
         echo '-lsnprintf'
         LIBS="$LIBS -lsnprintf"
     else
         if (
               $CC $CFLAGS  __conftest.c -ldb $LIBBSD -o __conftest || exit 1
-              ./__conftest || exit 1
            ) >/dev/null 2>&1; then
             echo '-ldb'
             LIBS="$LIBS -ldb"
--- a/rpc.rusersd/rusers_proc.c
+++ b/rpc.rusersd/rusers_proc.c
@@ -57,12 +57,7 @@ char rp_rcsid[] =
 	#define RUT_TIME ut_time
 #endif
 
-/* Glibc strikes again */
-#ifdef __GLIBC__
-	#include <rpcsvc/rusers.h>
-#else
-	#include "rusers.h"
-#endif 
+#include "rusers.h"
 
 void rusers_service(struct svc_req *rqstp, SVCXPRT *transp);
 
--- a/rpc.rusersd/rusersd.c
+++ b/rpc.rusersd/rusersd.c
@@ -38,11 +38,7 @@ char rusersd_rcsid[] =
 #include <rpc/pmap_clnt.h>
 #include <unistd.h>
 #include <grp.h>
-#ifdef __GLIBC__
-	#include <rpcsvc/rusers.h>
-#else
-	#include "rusers.h"
-#endif
+#include "rusers.h"
 
 #include "../version.h"
 
--- a/rup/rup.c
+++ b/rup/rup.c
@@ -48,7 +48,7 @@ char rcsid[] = "$Id: rup.c,v 1.8 2000/07
 
 #undef FSHIFT			/* Use protocol's shift and scale values */
 #undef FSCALE
-#include <rpcsvc/rstat.h>
+#include "rstat.h"
 
 #include "../version.h"
 
