Mon Nov 26 11:44:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>

	* configure.in, qemud/Makefile.am: Check for buggy glibc rpcgen
	  and only run Perl fix-up script for that.

diff --git a/ChangeLog b/ChangeLog
index 98342aae665a5ec60e443eb834b6806eaeb69a13..e0a3cae24bf328dc78520a6e8c92e57f9fe043d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 26 11:44:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
+
+       * configure.in, qemud/Makefile.am: Check for buggy glibc rpcgen
+         and only run Perl fix-up script for that.
+
 Mon Nov 26 11:42:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
 
        * configure.in: Check if -lrpc is needed to get XDR functions.

diff --git a/configure.in b/configure.in
index 925cf14ad47cded32f3b953f8db0b0dd1c5a2748..61d6779e052459975ef13a8ff6cea60152b224d7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -69,6 +69,15 @@ AC_CHECK_HEADERS([paths.h sys/syslimits.h])
 dnl Need -lrpc? (Cygwin needs this)
 AC_SEARCH_LIBS(xdrmem_create,rpc)
 
+dnl Do we have rpcgen?
+AC_PATH_PROG(RPCGEN, rpcgen, no)
+AM_CONDITIONAL(RPCGEN, [test "x$ac_cv_path_RPCGEN" != "xno"])
+if test "x$ac_cv_path_RPCGEN" != "xno"; then
+       dnl Is this GLIBC's buggy rpcgen?
+       AM_CONDITIONAL(GLIBC_RPCGEN,
+                      [$ac_cv_path_RPCGEN -t </dev/null >/dev/null 2>&1])
+fi
+
 dnl Specific dir for HTML output ?
 AC_ARG_WITH(html-dir, AC_HELP_STRING([--with-html-dir=path],
             [path to base html directory, default $datadir/doc/html]),

diff --git a/qemud/Makefile.am b/qemud/Makefile.am
index 7422e44ec205a74ff3335aa9f556e18508956683..1737176f4ddc0213b27eb0c7b98bf62c4ca6c384 100644 (file)
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -68,15 +68,19 @@ uninstall-local: uninstall-init
        rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
 
 
+if RPCGEN
 .x.c:
        rm -f $@
        rpcgen -c -o $@ $<
+if GLIBC_RPCGEN
        mv $@ $@.bak
        perl -w rpcgen_fix.pl < $@.bak > $@
+endif
 
 .x.h:
        rm -f $@
        rpcgen -h -o $@ $<
+endif
 
 remote_protocol.c: remote_protocol.h