X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=67261b6055841a4d3404a5fc27aa454bf537d8b3;hb=ea138284b7343bb1810cfbd0284a608dc57f7d46;hp=3b675b48e6d3532dad44f794c9152d876efe0842;hpb=e769e8950174222a25b41f54fc7dd7a095bb2a69;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index 3b675b4..67261b6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.79 2001/07/19 09:03:24 simonmar Exp $
+dnl $Id: aclocal.m4,v 1.82 2001/07/23 22:52:33 ken Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -280,7 +280,9 @@ AC_SUBST(YaccCmd)
 
 dnl *** Checking for ar and its arguments + whether we need ranlib.
 dnl
-dnl ArCmd and RANLIB are AC_SUBST'ed
+dnl ArCmd, ArSupportsInput and RANLIB are AC_SUBST'ed
+dnl On Digital UNIX, we test for the -Z (compress) and
+dnl -input (take list of files from external file) flags.
 dnl 
 AC_DEFUN(FPTOOLS_PROG_AR_AND_RANLIB,
 [AC_PATH_PROG(ArCmd,ar)
@@ -288,7 +290,10 @@ if test -z "$ArCmd"; 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 $ArCmd clqs conftest.a >/dev/null 2>/dev/null; then
+if $ArCmd clqsZ conftest.a >/dev/null 2>/dev/null; then
+    ArCmd="$ArCmd clqsZ"
+    NeedRanLib=''
+elif $ArCmd clqs conftest.a >/dev/null 2>/dev/null; then
     ArCmd="$ArCmd clqs"
     NeedRanLib=''
 elif $ArCmd cqs conftest.a >/dev/null 2>/dev/null; then
@@ -310,6 +315,14 @@ fi
 rm -rf conftest*
 test -n "$ArCmd" && test -n "$verbose" && echo "        setting ArCmd to $ArCmd"
 AC_SUBST(ArCmd)
+if $ArCmd conftest.a -input /dev/null >/dev/null 2>/dev/null; then
+    ArSupportsInput='-input'
+else
+    ArSupportsInput=''
+fi
+rm -rf conftest*
+test -n "$ArSupportsInput" && test -n "$verbose" && echo "        setting ArSupportsInput to $ArSupportsInput"
+AC_SUBST(ArSupportsInput)
 if test -z "$NeedRanLib"; then
     RANLIB=':'
     test -n "$verbose" && echo "        setting RANLIB to $RANLIB"
@@ -672,10 +685,10 @@ AC_DEFUN([FPTOOLS_END_TEXT_SECTION],
 		 if test "$not_done" = 1; then
 		   FPTOOLS_IN_SCOPE(etext asm("etext"),etext,fptools_end_of_text)
 		   if test "$fptools_end_of_text" = yes; then
-		     fptools_cv_end_of_text="etext asm("etext")"
+		     fptools_cv_end_of_text="etext"
 		   fi
 		 fi])
-		 if test -n $fptools_cv_end_of_text; then
+		 if test -n "$fptools_cv_end_of_text"; then
 		   AC_DEFINE_UNQUOTED([TEXT_SECTION_END_MARKER], $fptools_cv_end_of_text)
 		 else
 		   AC_DEFINE_UNQUOTED([TEXT_SECTION_END_MARKER], dunno_end_of_text)
@@ -695,10 +708,10 @@ AC_DEFUN([FPTOOLS_END_TEXT_SECTION],
 		 if test "$not_done" = 1; then
 		   FPTOOLS_IN_SCOPE(etext asm("etext"),etext,fptools_end_of_text_decl)
 		   if test "$fptools_end_of_text_decl" = yes; then
-		     fptools_cv_end_of_text_decl=etext
+		     fptools_cv_end_of_text_decl="etext asm(\"etext\")"
 		   fi
 		 fi])
-		 if test -n $fptools_cv_end_of_text_decl; then
+		 if test -n "$fptools_cv_end_of_text_decl"; then
 		   AC_DEFINE_UNQUOTED([TEXT_SECTION_END_MARKER_DECL], $fptools_cv_end_of_text_decl)
 		 else
 		   AC_DEFINE_UNQUOTED([TEXT_SECTION_END_MARKER_DECL], dunno_end_of_text_decl)
@@ -723,10 +736,10 @@ AC_DEFUN([FPTOOLS_END_DATA_SECTION],
 		 if test "$not_done" = 1; then
 		   FPTOOLS_IN_SCOPE(end asm("end"),end,fptools_end_of_data)
 		   if test "$fptools_end_of_data" = yes; then
-		     fptools_cv_end_of_data=end
+		     fptools_cv_end_of_data="end"
 		   fi
 		 fi])
-		 if test -n $fptools_cv_end_of_data; then
+		 if test -n "$fptools_cv_end_of_data"; then
 		   AC_DEFINE_UNQUOTED([DATA_SECTION_END_MARKER], $fptools_cv_end_of_data)
 		 else
 		   AC_DEFINE_UNQUOTED([DATA_SECTION_END_MARKER], dunno_end_of_data)
@@ -746,10 +759,10 @@ AC_DEFUN([FPTOOLS_END_DATA_SECTION],
 		 if test "$not_done" = 1; then
 		   FPTOOLS_IN_SCOPE(end asm("end"),end,fptools_end_of_data_decl)
 		   if test "$fptools_end_of_data_decl" = yes; then
-		     fptools_cv_end_of_data_decl=end
+		     fptools_cv_end_of_data_decl="end asm(\"end\")"
 		   fi
 		 fi])
-		 if test -n $fptools_cv_end_of_data_decl; then
+		 if test -n "$fptools_cv_end_of_data_decl"; then
 		   AC_DEFINE_UNQUOTED([DATA_SECTION_END_MARKER_DECL], $fptools_cv_end_of_data_decl)
 		 else
 		   AC_DEFINE_UNQUOTED([DATA_SECTION_END_MARKER_DECL], dunno_end_of_data_decl)