X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=5d759ed13d8d9f20389d363614b7f4ee33c645be;hb=0dde1004ad932a87f303b7f67807ea0ad11dc5a3;hp=3019deeffcd4b653ed63744d0cbc6639f2ce8979;hpb=773d8c857a0d5b37ed57ece82cb630ba34d6fe65;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index 3019dee..5d759ed 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.113 2003/01/27 16:41:18 simonmar Exp $
+dnl $Id: aclocal.m4,v 1.115 2003/03/26 12:33:11 simonmar Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -337,7 +337,13 @@ if test -z "$ArCmdRaw"; then
     echo "You don't seem to have ar in your PATH...I have no idea how to make a library"
     exit 1;
 fi
-if $ArCmdRaw clqsZ conftest.a >/dev/null 2>/dev/null; then
+dnl GNU ar needs special treatment: it appears to have problems with
+dnl object files with the same name if you use the 's' modifier, but
+dnl simple 'ar q' works fine, and doesn't need a separate ranlib.
+if $ArCmdRaw --version | grep 'GNU' >/dev/null 2>/dev/null; then
+    ArCmdArgs='q'
+    NeedRanLib=''
+elif $ArCmdRaw clqsZ conftest.a >/dev/null 2>/dev/null; then
     ArCmdArgs="clqsZ"
     NeedRanLib=''
 elif $ArCmdRaw clqs conftest.a >/dev/null 2>/dev/null; then
@@ -663,6 +669,10 @@ AC_CACHE_VAL(AC_CV_NAME,
 # include <GL/gl.h>
 #endif
 
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
+
 typedef $1 testing;
 
 main() {