From 8dab48ac0ad15696e3970575a80f53fa226175dd Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Mon, 5 Oct 1998 18:31:48 +0000
Subject: [PATCH] miscellaneous portability cruft (Eugene Kanter).

CVS patchset: 2395
CVS date: 1998/10/05 18:31:48
---
 configure.in      | 14 ++++++++++++--
 lib-rpmrc.in      |  5 +++--
 popt/configure.in |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index 47ee704..f24f245 100644
--- a/configure.in
+++ b/configure.in
@@ -356,10 +356,20 @@ AC_CHECK_HEADERS(machine/types.h string.h)
 AC_CHECK_HEADERS(sys/types.h sys/stdtypes.h unistd.h)
 AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/systemcfg.h)
 AC_CHECK_HEADERS(sys/mount.h sys/mntctl.h sys/vmount.h)
-AC_CHECK_HEADERS(glob.h,,MISCOBJS="$MISCOBJS glob.o")
-AC_CHECK_HEADERS(fnmatch.h,,MISCOBJS="$MISCOBJS fnmatch.o")
 AC_CHECK_HEADERS(fcntl.h grp.h malloc.h memory.h netdb.h pwd.h utime.h)
 AC_CHECK_HEADERS(sys/mman.h sys/param.h sys/resource.h sys/utsname.h sys/wait.h)
+
+# solaris2.4 and sinix 5.42 have broken fnmatch. get glob also to be safe.
+case $target in
+    *-*-solaris2.4|mips-sni-sysv4*) 
+	MISCOBJS="$MISCOBJS glob.o fnmatch.o"
+	;;
+    *)
+	AC_CHECK_HEADERS(glob.h,,MISCOBJS="$MISCOBJS glob.o")
+	AC_CHECK_HEADERS(fnmatch.h,,MISCOBJS="$MISCOBJS fnmatch.o")
+	;;
+esac
+
 AC_CHECK_HEADERS(db_185.h)
 
 if test "$PO" = po; then
diff --git a/lib-rpmrc.in b/lib-rpmrc.in
index e83ab6d..c166a59 100644
--- a/lib-rpmrc.in
+++ b/lib-rpmrc.in
@@ -86,7 +86,7 @@ os_canon:       SCO_SV: SCO_SV3.2v5.0.2  9
 os_canon:	IRIX64: Irix64  10
 os_canon:     NEXTSTEP: NextStep 11
 os_canon:       BSD/OS: BSD_OS 12
-os_canon:       machten: machten 13
+os_canon:      machten: machten 13
 os_canon:  CYGWIN32_NT: cygwin32 14
 os_canon:  CYGWIN32_95: cygwin32 15
 
@@ -141,7 +141,8 @@ arch_compat: powerppc: ppc
 arch_compat: usparc: sparc
 arch_compat: sparc: noarch
 
-arch_compat: ppc: noarch
+arch_compat: ppc: rs6000
+arch_compat: rs6000: noarch
 arch_compat: mipseb: noarch
 arch_compat: mipsel: noarch
 
diff --git a/popt/configure.in b/popt/configure.in
index e859fa5..d539415 100755
--- a/popt/configure.in
+++ b/popt/configure.in
@@ -49,7 +49,7 @@ else
 fi
 AC_CHECK_FUNCS(strerror)
 AC_CHECK_FUNC(setreuid, [], [
-    AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lucb" USEUCB=y;fi])
+    AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
 
 AC_OUTPUT(Makefile)
-- 
2.7.4