[shibboleth-sp2] 48/100: Switch back to original RPC test, most Unix variants should be safe now.

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi-guest pushed a commit to annotated tag 1.2.1
in repository shibboleth-sp2.

commit 1f0d0fd80baa40b39a941a9c5b76492ad6ab371a
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Tue Oct 19 01:39:16 2004 +0000

    Switch back to original RPC test, most Unix variants should be safe now.
---
 configure.ac | 37 +++++++++----------------------------
 1 file changed, 9 insertions(+), 28 deletions(-)

diff --git a/configure.ac b/configure.ac
index 72e7ab1..2934cad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,32 +66,11 @@ else
     CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
 fi
 
-# what SunRPC library should we use?
-AC_MSG_NOTICE([checking for which SunRPC library to use])
-AC_ARG_ENABLE(native-rpc,
-			AC_HELP_STRING([--enable-native-rpc], [Use the OS-supplied Sun RPC library]),
-			[if test "x$enableval" = "x" ; then
-            	enable_native_rpc=yes
-            else
-				enable_native_rpc="$enableval"
-			fi],
-			[enable_native_rpc=unknown])
-case "${host}" in
-        *-*-linux*)     if test $enable_native_rpc = "no" ; then
-        					AC_MSG_WARN([appears to be Linux, but you said not to use native RPC library])
-        				elif test $enable_native_rpc = "unknown" ; then
-        					enable_native_rpc=yes
-        				fi
-        ;;
-        
-        *)				if test $enable_native_rpc = "yes" ; then
-        					AC_MSG_ERROR([Native RPC library not known to be safe on any non-Linux platform])
-        				elif test $enable_native_rpc = "unknown" ; then
-        					enable_native_rpc=no
-        				fi
-        ;;
-esac
-AC_MSG_NOTICE([using native SunRPC library: $enable_native_rpc])
+# Test RPC now -- finish dealing with it later
+ACX_RPCTEST([rpctest="yes"],[rpctest="no"])
+if test $rpctest = "yes" ; then
+	AC_CHECK_DECLS([svcfd_create],,,[rpc/rpc.h])
+fi
 
 AC_ARG_WITH(dmalloc,
             AC_HELP_STRING([--with-dmalloc=PATH], [where dmalloc is installed]),
@@ -220,11 +199,13 @@ AC_CONFIG_FILES([Makefile doc/Makefile shib/Makefile schemas/Makefile \
 		 shib-target/Makefile shar/Makefile siterefresh/Makefile \
 		 test/Makefile xmlproviders/Makefile])
 
-if test $enable_native_rpc = "no"; then
+
+# now deal with the rpc library, to see if we need to build our own
+if test $rpctest = "no"; then
     WANT_SUBDIRS="oncrpc $WANT_SUBDIRS"
 	AC_DEFINE(USE_OUR_ONCRPC,1,[Define if using embedded version of ONC RPC.])
 fi
-AM_CONDITIONAL(USE_OUR_ONCRPC,test "$enable_native_rpc" = "no")
+AM_CONDITIONAL(USE_OUR_ONCRPC,test "$rpctest" = "no")
 
 
 # Apache 1.3 (mod_shib_13)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git