X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=aclocal.m4;h=2ab48ea088c54b7e3e49ffdb303f8a0d636cc63f;hp=c72d15d9ac357c96510871d18c4ed069934c3836;hb=87c93cf56c83abf0148c91d5972dbe65dc72c38a;hpb=15575cf8f17fee0fdd3151c5dbb0a0f89b01c708

diff --git a/aclocal.m4 b/aclocal.m4
index c72d15d..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,31 +1091,31 @@ AC_DEFUN([CHECK_GMP],
 AC_REQUIRE([AC_PROG_CC])
 ])
 
-# FP_MACOS_DEPLOYMENT_TARGET
-# --------------------------
-AC_DEFUN([FP_MACOS_DEPLOYMENT_TARGET],
+# 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 $MACOS_DEPLOYMENT_TARGET in
+  case $FP_MACOSX_DEPLOYMENT_TARGET in
     none)  ;;
-    10.4)  MACOS_DEPLOYMENT_VERSION=10.4
-    	   MACOS_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX10.4u.sdk
+    10.4)  MACOSX_DEPLOYMENT_VERSION=10.4
+    	   MACOSX_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX10.4u.sdk
 	   ;;
-    10.4u) MACOS_DEPLOYMENT_VERSION=10.4
-    	   MACOS_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX10.4u.sdk
+    10.4u) MACOSX_DEPLOYMENT_VERSION=10.4
+    	   MACOSX_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX10.4u.sdk
 	   ;;
-    *)     MACOS_DEPLOYMENT_VERSION=$MACOS_DEPLOYMENT_TARGET
-    	   MACOS_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX${MACOS_DEPLOYMENT_TARGET}.sdk
+    *)     MACOSX_DEPLOYMENT_VERSION=$FP_MACOSX_DEPLOYMENT_TARGET
+    	   MACOSX_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX${FP_MACOSX_DEPLOYMENT_TARGET}.sdk
 	   ;;
   esac
-  if test "x$MACOS_DEPLOYMENT_TARGET" = "xnone"; then
+  if test "x$FP_MACOSX_DEPLOYMENT_TARGET" = "xnone"; then
     AC_MSG_RESULT(none)
   else
-    if test ! -d $MACOS_DEPLOYMENT_SDK; then
-      AC_MSG_ERROR([Unknown deployment target $MACOS_DEPLOYMENT_TARGET])
+    if test ! -d $MACOSX_DEPLOYMENT_SDK; then
+      AC_MSG_ERROR([Unknown deployment target $FP_MACOSX_DEPLOYMENT_TARGET])
     fi
-    AC_MSG_RESULT([${MACOS_DEPLOYMENT_VERSION} (${MACOS_DEPLOYMENT_SDK})])
+    AC_MSG_RESULT([${MACOSX_DEPLOYMENT_VERSION} (${MACOSX_DEPLOYMENT_SDK})])
   fi
 fi
 ])