From 547d611d537134f479e5e3ccfe3cc7cf86c595db Mon Sep 17 00:00:00 2001
From: Peter Anvin <hpa@tazenda.sc.orionmulti.com>
Date: Mon, 26 Sep 2005 10:47:27 -0700
Subject: [PATCH] Don't build empty libxtra; Solaris can't build an empty
 archive

---
 configure.in | 12 ++++++++----
 lib/Makefile |  4 ++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 117006c..5166ca4 100644
--- a/configure.in
+++ b/configure.in
@@ -129,10 +129,14 @@ dnl
 SRCROOT=`cd $srcdir && pwd`
 OBJROOT=`pwd`
 
-AC_SEARCH_LIBS(xmalloc, iberty, , [AC_LIBOBJ(xmalloc)])
-AC_SEARCH_LIBS(xstrdup, iberty, , [AC_LIBOBJ(xstrdup)])
-AC_SEARCH_LIBS(bsd_signal, bsd, , [AC_LIBOBJ(bsdsignal)])
-XTRALIBS="$OBJROOT/lib/libxtra.a $XTRALIBS"
+XTRA=false
+AC_SEARCH_LIBS(xmalloc, iberty, , [XTRA=true ; AC_LIBOBJ(xmalloc)])
+AC_SEARCH_LIBS(xstrdup, iberty, , [XTRA=true ; AC_LIBOBJ(xstrdup)])
+AC_SEARCH_LIBS(bsd_signal, bsd, , [XTRA=true ; AC_LIBOBJ(bsdsignal)])
+if $XTRA
+then
+  XTRALIBS="$OBJROOT/lib/libxtra.a $XTRALIBS"
+fi
 
 dnl
 dnl These libraries apply to the server only
diff --git a/lib/Makefile b/lib/Makefile
index 615a3fa..a43ce19 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -7,7 +7,11 @@ SRCROOT = ..
 -include ../MCONFIG
 include ../MRULES
 
+ifeq ($(LIBOBJS),)
+all:
+else
 all:	libxtra.a
+endif
 
 install: