X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=8892ba00738dad894038e6be73afcf46d8c1c7c1;hp=cab4f1902a83c47cd2601b8ac56256abd16aa3a0;hb=dcf739bd7fb7de140be3bafb4ce211e2e5c7bba9;hpb=15575cf8f17fee0fdd3151c5dbb0a0f89b01c708 diff --git a/configure.ac b/configure.ac index cab4f19..8892ba0 100644 --- a/configure.ac +++ b/configure.ac @@ -660,8 +660,8 @@ if test "$WithGhc" != ""; then AC_SUBST(ghc_ge_607)dnl fi -# Check whether this GHC has readline installed -FP_GHC_HAS_READLINE +# Check whether this GHC has editline installed +FP_GHC_HAS_EDITLINE AC_PATH_PROGS(NHC,nhc nhc98) AC_PATH_PROG(HBC,hbc) @@ -821,20 +821,20 @@ AC_SUBST(DotnetSupport) dnl ** Mac OS X: explicit deployment target dnl -------------------------------------------------------------- -AC_ARG_WITH([macos-deployment-target], -[AC_HELP_STRING([--macos-deployment-target=VERSION], - [Build for Mac OS VERSION and higher [default= version of build host]])], -[MACOS_DEPLOYMENT_TARGET="$withval" +AC_ARG_WITH([macosx-deployment-target], +[AC_HELP_STRING([--with-macosx-deployment-target=VERSION], + [Build for Mac OS VERSION and higher (default= version of build host)])], +[FP_MACOSX_DEPLOYMENT_TARGET="$withval" if test "x$TargetOS_CPP-$TargetVendor_CPP" != "xdarwin-apple"; then # ignore everywhere, but on Mac OS - AC_MSG_WARN([--macos-deployment-target is only available on Mac OS X]) - MACOS_DEPLOYMENT_TARGET=none + AC_MSG_WARN([--macosx-deployment-target is only available on Mac OS X]) + FP_MACOSX_DEPLOYMENT_TARGET=none fi], -[MACOS_DEPLOYMENT_TARGET=none] +[FP_MACOSX_DEPLOYMENT_TARGET=none] ) -FP_MACOS_DEPLOYMENT_TARGET -AC_SUBST(MACOS_DEPLOYMENT_VERSION) -AC_SUBST(MACOS_DEPLOYMENT_SDK) +FP_CHECK_MACOSX_DEPLOYMENT_TARGET +AC_SUBST(MACOSX_DEPLOYMENT_VERSION) +AC_SUBST(MACOSX_DEPLOYMENT_SDK) dnl -------------------------------------------------------------- dnl End of configure script option section @@ -1004,18 +1004,6 @@ AC_SYS_LARGEFILE dnl ** check for specific header (.h) files that we are interested in AC_CHECK_HEADERS([bfd.h ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/mman.h sys/resource.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h time.h utime.h windows.h winsock.h]) -AC_CHECK_HEADER([readline/readline.h], [HaveReadlineReadlineH=YES], [HaveReadlineReadlineH=NO]) -AC_CHECK_HEADER([readline/history.h], [HaveReadlineHistoryH=YES], [HaveReadlineHistoryH=NO]) - -if test $HaveReadlineReadlineH = YES && test $HaveReadlineHistoryH = YES ; then - GhcLibsWithReadline=YES - AC_DEFINE([HAVE_READLINE_HEADERS], [1], [Define to 1 if readline/readline.h and readline/history.h exist.]) -else - GhcLibsWithReadline=NO - AC_DEFINE([HAVE_READLINE_HEADERS], [0], [Define to 1 if readline/readline.h and readline/history.h exist.]) -fi -AC_SUBST(GhcLibsWithReadline) - dnl ** check if it is safe to include both and AC_HEADER_TIME