X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=0a419666226640f98674cd14e07bc4c661a58940;hb=bcacf0b79872953f5512c0ebd98d551a30306b49;hp=1b7dbdae4d0611aea8745204af148b5ccda7667b;hpb=560f42c83a4aa48d00afec1c2d53d1de6f501bc9;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 1b7dbda..0a41966 100644
--- a/configure.ac
+++ b/configure.ac
@@ -833,6 +833,9 @@ FP_PROG_CONTEXT_DIFF
 dnl ** Find find command (for Win32's benefit)
 FP_PROG_FIND
 
+dnl ** Find sort command (for the benefit of Win32 environs)
+FP_PROG_SORT
+
 dnl ** figure out how to do a BSD-ish install
 AC_PROG_INSTALL
 
@@ -860,7 +863,7 @@ AC_PATH_PROGS(TarCmd,gtar tar,tar)
 
 dnl ** check for DocBook toolchain
 FP_CHECK_DOCBOOK_DTD
-FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook])
+FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl])
 FP_PROG_FO_PROCESSOR
 
 dnl ** check for ghc-pkg command
@@ -1118,7 +1121,10 @@ else
 fi
 
 dnl ** check for math library
-AC_CHECK_LIB([m], [atan], [LIBS="-lm $LIBS"; LIBM="-lm"], [LIBM=])
+AC_CHECK_FUNC(atan,[fp_libm_not_needed=yes;LIBM=],[fp_libm_not_needed=dunno])
+if test x"$fp_libm_not_needed" = xdunno; then
+   AC_CHECK_LIB([m], [atan], [LIBS="-lm $LIBS"; LIBM="-lm"],[LIBM=])
+fi
 AC_SUBST([LIBM])
 
 dnl ################################################################
@@ -1260,6 +1266,7 @@ AC_TRY_COMPILE(,[__asm__ (".subsections_via_symbols");],
             [Define to 1 if Apple-style dead-stripping is supported.])
     ],
     [
+        AC_MSG_RESULT(no)
         AC_DEFINE([HAVE_SUBSECTIONS_VIA_SYMBOLS],[0],
             [Define to 1 if Apple-style dead-stripping is supported.])
     ])