ncurses 6.2 - patch 20210313

[ncurses.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index d498939330c13d7c807f1c8baff383db83554fc1..c9f547ef0f5e73563729bfa5fd647a397a80460d 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl

-dnl $Id: aclocal.m4,v 1.950 2021/01/26 23:45:12 tom Exp $
+dnl $Id: aclocal.m4,v 1.951 2021/03/06 00:13:35 tom Exp $

 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on


@@ -4090,7 +4090,7 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_LD_SEARCHPATH version: 2 updated: 2019/09/26 20:34:14
+dnl CF_LD_SEARCHPATH version: 3 updated: 2021/03/05 19:13:35

 dnl ----------------
 dnl Try to obtain the linker's search-path, for use in scripts.
 dnl
 dnl ----------------
 dnl Try to obtain the linker's search-path, for use in scripts.
 dnl


@@ -4106,14 +4106,14 @@ cf_pathlist=`ld --verbose 2>/dev/null | grep SEARCH_DIR | sed -e 's,SEARCH_DIR[[
 # The -NX options tell newer versions of Linux ldconfig to not attempt to
 # update the cache, which makes it run faster.
 test -z "$cf_pathlist" && \
 # The -NX options tell newer versions of Linux ldconfig to not attempt to
 # update the cache, which makes it run faster.
 test -z "$cf_pathlist" && \

-       cf_pathlist=`ldconfig -NX -v 2>/dev/null | sed -e '/^[[         ]]/d' -e 's/:$//' | sort -u`
+       cf_pathlist=`(ldconfig -NX -v) 2>/dev/null | sed -e '/^[[       ]]/d' -e 's/:$//' | sort -u`

 
 test -z "$cf_pathlist" &&
 
 test -z "$cf_pathlist" &&

-       cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e '/^[[  ]]/d' -e 's/:$//p' | sort -u`
+       cf_pathlist=`(ldconfig -v) 2>/dev/null | sed -n -e '/^[[        ]]/d' -e 's/:$//p' | sort -u`

 
 # This works with OpenBSD 6.5, which lists only filenames
 test -z "$cf_pathlist" &&
 
 # This works with OpenBSD 6.5, which lists only filenames
 test -z "$cf_pathlist" &&

-       cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e 's,^Adding \(.*\)/.*[$],\1,p' | sort -u`
+       cf_pathlist=`(ldconfig -v) 2>/dev/null | sed -n -e 's,^Adding \(.*\)/.*[$],\1,p' | sort -u`

 
 if test -z "$cf_pathlist"
 then
 
 if test -z "$cf_pathlist"
 then


@@ -4128,13 +4128,37 @@ fi
 
 if test -z "$cf_pathlist"
 then
 
 if test -z "$cf_pathlist"
 then

-       # Solaris is hardcoded
-       if test -d /opt/SUNWspro/lib
+       # Solaris is "SunOS"
+       if test -f /usr/bin/isainfo && test "x`uname -s`" = xSunOS

        then
        then

-               cf_pathlist="/opt/SUNWspro/lib /usr/ccs/lib /usr/lib"
-       elif test -d /usr/ccs/lib
+               case x`(isainfo -b)` in
+               (x64)
+                       cf_pathlist="$cf_pathlist /lib/64 /usr/lib/64"
+                       ;;
+               (x32)
+                       test -d /usr/ccs/lib && cf_pathlist="$cf_pathlist /usr/ccs/lib"
+                       cf_pathlist="$cf_pathlist /lib /usr/lib"
+                       ;;
+               (*)
+                       AC_MSG_WARN(problem with Solaris architecture)
+                       ;;
+               esac
+       fi
+fi
+
+if test -z "$cf_pathlist"
+then
+       # HP-UX
+       if test x"`uname -s`" = xHP-UX

        then
        then

-               cf_pathlist="/usr/ccs/lib /usr/lib"
+               case x`getconf LONG_BIT` in
+               (x64)
+                       cf_pathlist="/usr/lib/hpux64"
+                       ;;
+               (x*)
+                       cf_pathlist="/usr/lib/hpux32"
+                       ;;
+               esac

        fi
 fi
 
        fi
 fi