From 6fa964914d8be709b1145399108ef1535a0b3f39 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Tue, 3 Jul 2007 16:55:30 +0000
Subject: unposted: force latest aclocal.m4 from vendor to the main branch

---
 aclocal.m4 | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'aclocal.m4')

diff --git a/aclocal.m4 b/aclocal.m4
index 672341b58..e91be3c0d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -27,9 +27,12 @@ ac_save_CFLAGS="$CFLAGS"
 # breaks some systems' header files.
 # AIX			-qlanglvl=ansi
 # Ultrix and OSF/1	-std1
-# HP-UX			-Aa -D_HPUX_SOURCE
+# HP-UX			-Ae  or  -Aa -D_HPUX_SOURCE
 # SVR4			-Xc
-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" -Xc
+#  For HP-UX, we try -Ae first; this turns on ANSI but also extensions,
+#  as well as defining _HPUX_SOURCE, and we can then use long long.
+#  We keep the old version for backward compatibility.
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" -Xc
 do
   CFLAGS="$ac_save_CFLAGS $ac_arg"
   AC_TRY_COMPILE(
@@ -49,4 +52,26 @@ case "x$fp_cv_prog_cc_stdc" in
 esac
 ])
 
+AC_DEFUN(AC_PROG_LN,
+[AC_MSG_CHECKING(whether ln works)
+AC_CACHE_VAL(ac_cv_prog_LN,
+[rm -f conftestdata conftestlink
+echo > conftestdata
+if ln conftestdata conftestlink 2>/dev/null
+then
+  rm -f conftestdata conftestlink
+  ac_cv_prog_LN="ln"
+else
+  rm -f conftestdata
+  ac_cv_prog_LN="cp"
+fi])dnl
+LN="$ac_cv_prog_LN"
+if test "$ac_cv_prog_LN" = "ln"; then
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST(LN)dnl
+])
+
 builtin(include, aczsh.m4)
-- 
cgit 1.4.1