X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=aclocal.m4;h=2ab48ea088c54b7e3e49ffdb303f8a0d636cc63f;hp=12db959bb1dae0fcbea0239c25a965a700803b0a;hb=f09bc7d19f2f87bf6540afd3240f3c274b8a4af2;hpb=2ebe8addfaae2bc65e6b87ad369928b02053014f

diff --git a/aclocal.m4 b/aclocal.m4
index 12db959..2ab48ea 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -922,18 +922,18 @@ else
 fi])# FP_PROG_GHC_PKG
 
 
-# FP_GHC_HAS_READLINE
+# FP_GHC_HAS_EDITLINE
 # -------------------
-AC_DEFUN([FP_GHC_HAS_READLINE],
+AC_DEFUN([FP_GHC_HAS_EDITLINE],
 [AC_REQUIRE([FP_PROG_GHC_PKG])
-AC_CACHE_CHECK([whether ghc has readline package], [fp_cv_ghc_has_readline],
-[if "${GhcPkgCmd-ghc-pkg}" --show-package readline >/dev/null 2>&1; then
-  fp_cv_ghc_has_readline=yes
+AC_CACHE_CHECK([whether ghc has editline package], [fp_cv_ghc_has_editline],
+[if "${GhcPkgCmd-ghc-pkg}" --show-package editline >/dev/null 2>&1; then
+  fp_cv_ghc_has_editline=yes
 else
-  fp_cv_ghc_has_readline=no
+  fp_cv_ghc_has_editline=no
  fi])
-AC_SUBST([GhcHasReadline], [`echo $fp_cv_ghc_has_readline | sed 'y/yesno/YESNO/'`])
-])# FP_GHC_HAS_READLINE
+AC_SUBST([GhcHasEditline], [`echo $fp_cv_ghc_has_editline | sed 'y/yesno/YESNO/'`])
+])# FP_GHC_HAS_EDITLINE
 
 
 # FP_GCC_EXTRA_FLAGS
@@ -1091,6 +1091,35 @@ AC_DEFUN([CHECK_GMP],
 AC_REQUIRE([AC_PROG_CC])
 ])
 
+# FP_CHECK_MACOSX_DEPLOYMENT_TARGET
+# ---------------------------------
+AC_DEFUN([FP_CHECK_MACOSX_DEPLOYMENT_TARGET],
+[
+if test "x$TargetOS_CPP-$TargetVendor_CPP" = "xdarwin-apple"; then
+  AC_MSG_CHECKING([Mac OS X deployment target])
+  case $FP_MACOSX_DEPLOYMENT_TARGET in
+    none)  ;;
+    10.4)  MACOSX_DEPLOYMENT_VERSION=10.4
+    	   MACOSX_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX10.4u.sdk
+	   ;;
+    10.4u) MACOSX_DEPLOYMENT_VERSION=10.4
+    	   MACOSX_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX10.4u.sdk
+	   ;;
+    *)     MACOSX_DEPLOYMENT_VERSION=$FP_MACOSX_DEPLOYMENT_TARGET
+    	   MACOSX_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX${FP_MACOSX_DEPLOYMENT_TARGET}.sdk
+	   ;;
+  esac
+  if test "x$FP_MACOSX_DEPLOYMENT_TARGET" = "xnone"; then
+    AC_MSG_RESULT(none)
+  else
+    if test ! -d $MACOSX_DEPLOYMENT_SDK; then
+      AC_MSG_ERROR([Unknown deployment target $FP_MACOSX_DEPLOYMENT_TARGET])
+    fi
+    AC_MSG_RESULT([${MACOSX_DEPLOYMENT_VERSION} (${MACOSX_DEPLOYMENT_SDK})])
+  fi
+fi
+])
+
 # --------------------------------------------------------------
 # Calculate absolute path to build tree
 # --------------------------------------------------------------
@@ -1101,7 +1130,7 @@ AC_MSG_CHECKING(for path to top of build tree)
 dnl This would be
 dnl     make -C utils/pwd clean && make -C utils/pwd
 dnl except we don't want to have to know what make is called. Sigh.
-if test ! -e utils/pwd/pwd && ! -e utils/pwd/pwd.exe; then
+if test ! -f utils/pwd/pwd && test ! -f utils/pwd/pwd.exe; then
   cd utils/pwd
   rm -f *.o
   rm -f *.hi
@@ -1121,10 +1150,7 @@ dnl Remove common automounter nonsense
 dnl
 hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|'`
 
-hardtop_plat="$hardtop"
-
 AC_SUBST(hardtop)
-AC_SUBST(hardtop_plat)
 
 AC_MSG_RESULT(${hardtop})