From f5977dc59a39f1e2744ac0cf9a647436a54dcccc Mon Sep 17 00:00:00 2001
From: Daniel Jacobowitz <drow@false.org>
Date: Fri, 20 Dec 2002 20:23:08 +0000
Subject: [PATCH] 	Port to POSIX 1003.1-2001. 	* acinclude.m4
 (AM_INSTALL_LIBBFD): Do not rely on "test -o". 	* configure.in
 (build-warnings): Likewise. 	(Horrible hacks to build DLLs on Windows): Do
 not rely on "tail -1". 	* aclocal.m4: Regenerate. 	* configure:
 Regenerate.

---
 bfd/ChangeLog    | 9 +++++++++
 bfd/acinclude.m4 | 2 +-
 bfd/aclocal.m4   | 2 +-
 bfd/configure    | 6 +++---
 bfd/configure.in | 4 ++--
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 14a8d77d31e..5b57c5e8808 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-20  Paul Eggert  <eggert@twinsun.com>
+
+	Port to POSIX 1003.1-2001.
+	* acinclude.m4 (AM_INSTALL_LIBBFD): Do not rely on "test -o".
+	* configure.in (build-warnings): Likewise.
+	(Horrible hacks to build DLLs on Windows): Do not rely on "tail -1".
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
 2002-12-19  Alan Modra  <amodra@bigpond.net.au>
 
 	* coff-h8300.c: Include libiberty.h.
diff --git a/bfd/acinclude.m4 b/bfd/acinclude.m4
index b3c6ccffb6c..7c2902c1330 100644
--- a/bfd/acinclude.m4
+++ b/bfd/acinclude.m4
@@ -129,7 +129,7 @@ AC_DEFUN([AM_INSTALL_LIBBFD],
   AC_ARG_ENABLE(install-libbfd,
 [  --install-libbfd controls installation of libbfd and related headers],
       install_libbfd_p=$enableval,
-      if test "${host}" = "${target}" -o "$enable_shared" = "yes"; then
+      if test "${host}" = "${target}" || test "$enable_shared" = "yes"; then
         install_libbfd_p=yes
       else
         install_libbfd_p=no
diff --git a/bfd/aclocal.m4 b/bfd/aclocal.m4
index b6dfcbe31d0..fd54b1b0070 100644
--- a/bfd/aclocal.m4
+++ b/bfd/aclocal.m4
@@ -141,7 +141,7 @@ AC_DEFUN([AM_INSTALL_LIBBFD],
   AC_ARG_ENABLE(install-libbfd,
 [  --install-libbfd controls installation of libbfd and related headers],
       install_libbfd_p=$enableval,
-      if test "${host}" = "${target}" -o "$enable_shared" = "yes"; then
+      if test "${host}" = "${target}" || test "$enable_shared" = "yes"; then
         install_libbfd_p=yes
       else
         install_libbfd_p=no
diff --git a/bfd/configure b/bfd/configure
index 2eca955472a..c307f0f87bb 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -2327,7 +2327,7 @@ if test x"$silent" != x"yes" && test x"$build_warnings" != x""; then
 fi
 fi
 WARN_CFLAGS=""
-if test "x${build_warnings}" != x -a "x$GCC" = xyes ; then
+if test "x${build_warnings}" != x && test "x$GCC" = xyes ; then
     WARN_CFLAGS="${build_warnings}"
 fi
 
@@ -2370,7 +2370,7 @@ if test "${enable_install_libbfd+set}" = set; then
   enableval="$enable_install_libbfd"
   install_libbfd_p=$enableval
 else
-  if test "${host}" = "${target}" -o "$enable_shared" = "yes"; then
+  if test "${host}" = "${target}" || test "$enable_shared" = "yes"; then
         install_libbfd_p=yes
       else
         install_libbfd_p=no
@@ -5933,7 +5933,7 @@ case "${host}" in
     fi
     ;;
   *)
-    x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | tail -1`
+    x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`
     if test -n "$x"; then
       WIN32LIBADD="-L../libiberty/pic -liberty"
     fi
diff --git a/bfd/configure.in b/bfd/configure.in
index 4db2520995a..ccf8af18792 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -86,7 +86,7 @@ if test x"$silent" != x"yes" && test x"$build_warnings" != x""; then
   echo "Setting warning flags = $build_warnings" 6>&1
 fi])dnl
 WARN_CFLAGS=""
-if test "x${build_warnings}" != x -a "x$GCC" = xyes ; then
+if test "x${build_warnings}" != x && test "x$GCC" = xyes ; then
     WARN_CFLAGS="${build_warnings}"
 fi
 AC_SUBST(WARN_CFLAGS)
@@ -446,7 +446,7 @@ case "${host}" in
     ;;
   *)
 changequote(,)dnl
-    x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | tail -1`
+    x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`
 changequote([,])dnl
     if test -n "$x"; then
       WIN32LIBADD="-L../libiberty/pic -liberty"
-- 
2.47.3