Message ID | 20191122232406.202016-1-petr.vorel@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | [nfs-utils,1/1] Let the configure script find getrpcbynumber in libtirpc | expand |
On 11/22/19 6:24 PM, Petr Vorel wrote: > From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > > The getrpcbynumber() function may not be available in the C library, > but only in the libtirpc library. Take this into account when checking > for the existence of getrpcbynumber() and getrpcbynumber_r(). > > Reviewed-by: Petr Vorel <petr.vorel@gmail.com> > [ pvorel: patch taken from Buildroot distribution ] > Signed-off-by: Petr Vorel <petr.vorel@gmail.com> > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Committed... (tag: nfs-utils-2-4-3-rc3) steved. > --- > configure.ac | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/configure.ac b/configure.ac > index 949ff9fc..e9699752 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -534,11 +534,23 @@ AC_FUNC_STAT > AC_FUNC_VPRINTF > AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \ > gethostbyaddr gethostbyname gethostname getmntent \ > - getnameinfo getrpcbyname getrpcbynumber getrpcbynumber_r getifaddrs \ > + getnameinfo getrpcbyname getifaddrs \ > gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \ > ppoll realpath rmdir select socket strcasecmp strchr strdup \ > strerror strrchr strtol strtoul sigprocmask name_to_handle_at]) > > +save_CFLAGS=$CFLAGS > +save_LIBS=$LIBS > +CFLAGS="$CFLAGS $AM_CPPFLAGS" > +LIBS="$LIBS $LIBTIRPC" > +AC_CHECK_FUNCS([getrpcbynumber getrpcbynumber_r]) > +CFLAGS=$save_CFLAGS > +LIBS=$save_LIBS > + > +if test "$ac_cv_func_getrpcbynumber_r" != "yes" -a "$ac_cv_func_getrpcbynumber" != "yes"; then > + AC_MSG_ERROR([Neither getrpcbynumber_r nor getrpcbynumber are available]) > +fi > + > dnl ************************************************************* > dnl Check for data sizes > dnl ************************************************************* >
diff --git a/configure.ac b/configure.ac index 949ff9fc..e9699752 100644 --- a/configure.ac +++ b/configure.ac @@ -534,11 +534,23 @@ AC_FUNC_STAT AC_FUNC_VPRINTF AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \ gethostbyaddr gethostbyname gethostname getmntent \ - getnameinfo getrpcbyname getrpcbynumber getrpcbynumber_r getifaddrs \ + getnameinfo getrpcbyname getifaddrs \ gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \ ppoll realpath rmdir select socket strcasecmp strchr strdup \ strerror strrchr strtol strtoul sigprocmask name_to_handle_at]) +save_CFLAGS=$CFLAGS +save_LIBS=$LIBS +CFLAGS="$CFLAGS $AM_CPPFLAGS" +LIBS="$LIBS $LIBTIRPC" +AC_CHECK_FUNCS([getrpcbynumber getrpcbynumber_r]) +CFLAGS=$save_CFLAGS +LIBS=$save_LIBS + +if test "$ac_cv_func_getrpcbynumber_r" != "yes" -a "$ac_cv_func_getrpcbynumber" != "yes"; then + AC_MSG_ERROR([Neither getrpcbynumber_r nor getrpcbynumber are available]) +fi + dnl ************************************************************* dnl Check for data sizes dnl *************************************************************