From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Sat, 25 Jun 2005 18:08:10 +0000 (+0000)
Subject: merge in local changes:
X-Git-Tag: SUDO_1_7_0~635
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8b3770beea3c1137fb2de7c4861e3b1d8f5e344;p=sudo

merge in local changes:
config.guess:
 o better openbsd support
config.sub:
 o hiuxmpp support
ltmain.sh
 o remove requirement that libs must begin with "lib"
 o don't print a bunch of crap about library installs
 o don't run ldconfig
---

diff --git a/config.guess b/config.guess
index 7d0185e01..f8b96487a 100644
--- a/config.guess
+++ b/config.guess
@@ -2,6 +2,8 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#
+# $Sudo$
 
 timestamp='2004-09-07'
 
@@ -197,44 +199,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
diff --git a/config.sub b/config.sub
index edb6b663c..109c98d0d 100755
--- a/config.sub
+++ b/config.sub
@@ -2,6 +2,8 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#
+# $Sudo$
 
 timestamp='2004-08-29'
 
@@ -145,7 +147,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -sr2201*)
 		os=
 		basic_machine=$1
 		;;
@@ -542,6 +544,10 @@ case $basic_machine in
 		basic_machine=h8500-hitachi
 		os=-hms
 		;;
+	sr2201*)
+		basic_machine=harp1e-hitachi
+		os=-hiuxmpp
+		;;
 	harris)
 		basic_machine=m88k-harris
 		os=-sysv3
diff --git a/ltmain.sh b/ltmain.sh
index 59eceb356..40e520c19 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -2000,7 +2000,8 @@ func_mode_finish ()
     fi
 
     # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
+    exit 0
+    #test "$show" = : && exit $EXIT_SUCCESS
 
     $ECHO "X----------------------------------------------------------------------" | $Xsed
     $ECHO "Libraries have been installed in:"
@@ -2490,16 +2491,7 @@ func_mode_install ()
       IFS="$save_ifs"
     done
 
-    test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
+    exit $EXIT_SUCCESS
 }
 
 
@@ -4517,9 +4509,6 @@ func_mode_link ()
 	eval libname=\"$libname_spec\"
 	;;
       *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
-
 	if test "$need_lib_prefix" != no; then
 	  # Add the "lib" prefix for modules if required
 	  name=`$ECHO "X$outputname" | $Xsed -e 's/\.la$//'`